Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o use the new api in maven-artifact 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2004-10-06 14:30:35 +00:00
parent fa9735291f
commit d8c9056f67
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -17,6 +17,8 @@ import org.apache.maven.artifact.MavenMetadataSource;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
@ -31,8 +33,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.dag.CycleDetectedException; import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -63,6 +63,8 @@ public class DefaultPluginManager
protected ArtifactRepository localRepository; protected ArtifactRepository localRepository;
protected ArtifactFilter artifactFilter;
public DefaultPluginManager() public DefaultPluginManager()
{ {
mojoDescriptors = new HashMap(); mojoDescriptors = new HashMap();
@ -108,7 +110,7 @@ public class DefaultPluginManager
MavenMojoDescriptor mavenMojoDescriptor = (MavenMojoDescriptor) it.next(); MavenMojoDescriptor mavenMojoDescriptor = (MavenMojoDescriptor) it.next();
MojoDescriptor mojoDescriptor = mavenMojoDescriptor.getMojoDescriptor(); MojoDescriptor mojoDescriptor = mavenMojoDescriptor.getMojoDescriptor();
mojoDescriptors.put( mojoDescriptor.getId(), mojoDescriptor ); mojoDescriptors.put( mojoDescriptor.getId(), mojoDescriptor );
pluginDescriptors.put( pluginDescriptor.getId(), pluginDescriptor ); pluginDescriptors.put( pluginDescriptor.getId(), pluginDescriptor );
@ -123,7 +125,7 @@ public class DefaultPluginManager
{ {
ComponentSetDescriptor componentSetDescriptor = event.getComponentSetDescriptor(); ComponentSetDescriptor componentSetDescriptor = event.getComponentSetDescriptor();
if ( !(componentSetDescriptor instanceof MavenPluginDescriptor) ) if ( !( componentSetDescriptor instanceof MavenPluginDescriptor ) )
{ {
return; return;
} }
@ -201,12 +203,7 @@ public class DefaultPluginManager
MavenMetadataSource sr = new MavenMetadataSource( remotePluginRepositories, localRepository, artifactResolver ); MavenMetadataSource sr = new MavenMetadataSource( remotePluginRepositories, localRepository, artifactResolver );
// TODO: needs to be configurable container.addComponent( pluginArtifact, artifactResolver, remotePluginRepositories, localRepository, sr, artifactFilter );
String[] excludes = new String[] { "maven-core", "maven-artifact", "maven-model", "maven-plugin", "plexus",
"xstream", "xpp3", "classworlds", "ognl" };
container.addComponent( pluginArtifact, artifactResolver, remotePluginRepositories, localRepository, sr,
excludes );
} }
public void contextualize( Context context ) public void contextualize( Context context )
@ -218,6 +215,19 @@ public class DefaultPluginManager
public void initialize() public void initialize()
throws Exception throws Exception
{ {
artifactFilter = new ExclusionSetFilter( new String[]
{
"maven-core",
"maven-artifact",
"maven-model",
"maven-plugin",
"plexus",
"xstream",
"xpp3",
"classworlds",
"ognl"
} );
// TODO: move this to be configurable from the Maven component // TODO: move this to be configurable from the Maven component
remotePluginRepositories = new HashSet(); remotePluginRepositories = new HashSet();