You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/01/20 04:31:29 UTC
svn commit: r498057 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
DefaultArtifactFilterManager.java extension/DefaultExtensionManager.java
Author: jvanzyl
Date: Fri Jan 19 19:31:28 2007
New Revision: 498057
URL: http://svn.apache.org/viewvc?view=rev&rev=498057
Log: (empty)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?view=diff&rev=498057&r1=498056&r2=498057
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Fri Jan 19 19:31:28 2007
@@ -23,7 +23,7 @@
import java.util.Set;
/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
* @version $Id$
* @todo this should probably be a component with some dynamic control of filtering
*/
@@ -36,7 +36,7 @@
{
Set artifacts = new HashSet();
- artifacts.add( "classworlds" );
+ artifacts.add( "plexus-classworlds" );
artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" );
artifacts.add( "jsch" );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?view=diff&rev=498057&r1=498056&r2=498057
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Fri Jan 19 19:31:28 2007
@@ -58,9 +58,9 @@
extends AbstractLogEnabled
implements ExtensionManager, Contextualizable
{
-
+
private ArtifactFactory artifactFactory;
-
+
private ArtifactResolver artifactResolver;
private ArtifactMetadataSource artifactMetadataSource;
@@ -71,34 +71,40 @@
private WagonManager wagonManager;
- public void addExtension( Extension extension, Model originatingModel, List remoteRepositories,
+ public void addExtension( Extension extension,
+ Model originatingModel,
+ List remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException
{
- Artifact extensionArtifact = artifactFactory.createBuildArtifact( extension.getGroupId(), extension.getArtifactId(), extension.getVersion(), "jar" );
-
+ Artifact extensionArtifact = artifactFactory.createBuildArtifact( extension.getGroupId(),
+ extension.getArtifactId(),
+ extension.getVersion(), "jar" );
+
Parent originatingParent = originatingModel.getParent();
-
+
String groupId = originatingModel.getGroupId();
if ( groupId == null && originatingParent != null )
{
groupId = originatingParent.getGroupId();
}
-
+
String artifactId = originatingModel.getArtifactId();
-
+
String version = originatingModel.getVersion();
if ( version == null && originatingParent != null )
{
version = originatingParent.getVersion();
}
-
+
Artifact projectArtifact = artifactFactory.createProjectArtifact( groupId, artifactId, version );
addExtension( extensionArtifact, projectArtifact, remoteRepositories, localRepository, null );
}
-
- public void addExtension( Extension extension, MavenProject project, ArtifactRepository localRepository )
+
+ public void addExtension( Extension extension,
+ MavenProject project,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException
{
String extensionId = ArtifactUtils.versionlessKey( extension.getGroupId(), extension.getArtifactId() );
@@ -106,24 +112,26 @@
getLogger().debug( "Initialising extension: " + extensionId );
Artifact artifact = (Artifact) project.getExtensionArtifactMap().get( extensionId );
-
+
addExtension( artifact, project.getArtifact(), project.getRemoteArtifactRepositories(), localRepository,
new ActiveArtifactResolver( project ) );
}
-
- private void addExtension( Artifact extensionArtifact, Artifact projectArtifact, List remoteRepositories,
- ArtifactRepository localRepository, ActiveArtifactResolver activeArtifactResolver )
+
+ private void addExtension( Artifact extensionArtifact,
+ Artifact projectArtifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository,
+ ActiveArtifactResolver activeArtifactResolver )
throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException
{
if ( extensionArtifact != null )
{
- ArtifactFilter filter = new ProjectArtifactExceptionFilter( artifactFilterManager.getArtifactFilter(), projectArtifact );
+ ArtifactFilter filter =
+ new ProjectArtifactExceptionFilter( artifactFilterManager.getArtifactFilter(), projectArtifact );
- ArtifactResolutionResult result = artifactResolver.resolveTransitively( Collections.singleton( extensionArtifact ),
- projectArtifact,
- localRepository,
- remoteRepositories,
- artifactMetadataSource, filter );
+ ArtifactResolutionResult result = artifactResolver.resolveTransitively(
+ Collections.singleton( extensionArtifact ), projectArtifact, localRepository, remoteRepositories,
+ artifactMetadataSource, filter );
for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
@@ -137,6 +145,7 @@
getLogger().debug( "Adding to extension classpath: " + a.getFile() );
container.addJarResource( a.getFile() );
+
artifactFilterManager.excludeArtifact( a.getArtifactId() );
}
}
@@ -160,16 +169,16 @@
{
this.container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
-
+
private static final class ActiveArtifactResolver
{
private MavenProject project;
-
+
ActiveArtifactResolver( MavenProject project )
{
this.project = project;
}
-
+
Artifact replaceWithActiveArtifact( Artifact artifact )
{
return project.replaceWithActiveArtifact( artifact );
@@ -183,7 +192,8 @@
private String projectDependencyConflictId;
- ProjectArtifactExceptionFilter( ArtifactFilter passThroughFilter, Artifact projectArtifact )
+ ProjectArtifactExceptionFilter( ArtifactFilter passThroughFilter,
+ Artifact projectArtifact )
{
this.passThroughFilter = passThroughFilter;
this.projectDependencyConflictId = projectArtifact.getDependencyConflictId();