You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/05/31 17:01:43 UTC
svn commit: r662033 - in
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven:
MavenArtifactFilterManager.java extension/DefaultExtensionManager.java
Author: brett
Date: Sat May 31 08:01:43 2008
New Revision: 662033
URL: http://svn.apache.org/viewvc?rev=662033&view=rev
Log:
[MNG-3581] continue to filter the wagons used from plugins, but not from extensions
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=662033&r1=662032&r2=662033&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java Sat May 31 08:01:43 2008
@@ -34,6 +34,29 @@
{
public static ArtifactFilter createStandardFilter()
{
+ Set artifacts = createBaseArtifactSet();
+
+ artifacts.add( "wagon-file" );
+ artifacts.add( "wagon-http-lightweight" );
+ artifacts.add( "wagon-webdav" );
+ artifacts.add( "wagon-ssh" );
+ artifacts.add( "wagon-ssh-external" );
+
+ return new ExclusionSetFilter( artifacts );
+ }
+
+ public static ArtifactFilter createExtensionFilter()
+ {
+ Set artifacts = createBaseArtifactSet();
+
+ // It should be safe to include wagon implementations, and since this is used by the extension manager they would
+ // get filtered out otherwise
+
+ return new ExclusionSetFilter( artifacts );
+ }
+
+ private static Set createBaseArtifactSet()
+ {
// TODO: configure this from bootstrap or scan lib
Set artifacts = new HashSet();
@@ -63,15 +86,6 @@
artifacts.add( "maven-toolchain" );
//artifacts.add( "plexus-utils" );
artifacts.add( "wagon-provider-api" );
-
- // It should be safe to include implementations, and since this is used by the extension manager they would
- // get filtered out otherwise
- //artifacts.add( "wagon-file" );
- //artifacts.add( "wagon-http-lightweight" );
- //artifacts.add( "wagon-webdav" );
- //artifacts.add( "wagon-ssh" );
- //artifacts.add( "wagon-ssh-external" );
-
- return new ExclusionSetFilter( artifacts );
+ return artifacts;
}
}
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=662033&r1=662032&r2=662033&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Sat May 31 08:01:43 2008
@@ -82,7 +82,7 @@
private DefaultPlexusContainer container;
- private ArtifactFilter artifactFilter = MavenArtifactFilterManager.createStandardFilter();
+ private ArtifactFilter artifactFilter = MavenArtifactFilterManager.createExtensionFilter();
private WagonManager wagonManager;
@@ -270,7 +270,7 @@
}
catch ( ComponentLookupException e )
{
- // now wagons found in the extension
+ // no wagons found in the extension
}
}
}
@@ -332,7 +332,7 @@
}
catch( Exception e )
{
- // do nothingls
+ // do nothing
}
return false;