Author: joakime
Date: Tue Feb 13 15:14:14 2007
New Revision: 507294
URL: http://svn.apache.org/viewvc?view=rev&rev=507294
Log:
Adding back the extension manager support for injected containers into the
WagonManager.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/pom.xml
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?view=diff&rev=507294&r1=507293&r2=507294
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Tue Feb 13 15:14:14 2007
@@ -94,6 +94,8 @@
}
getLogger().debug( "Finished pre-scanning: " + pom + " for build
extensions." );
+
+ extensionManager.registerWagons();
}
catch ( ModelInterpolationException e )
{
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=507294&r1=507293&r2=507294
==============================================================================
---
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
Tue Feb 13 15:14:14 2007
@@ -31,9 +31,11 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.wagon.manager.WagonManager;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -64,6 +66,8 @@
private PlexusContainer container;
private ArtifactFilterManager artifactFilterManager;
+
+ private WagonManager wagonManager;
public void addExtension( Extension extension,
Model originatingModel,
@@ -144,6 +148,18 @@
artifactFilterManager.excludeArtifact( a.getArtifactId() );
}
+ }
+ }
+
+ public void registerWagons()
+ {
+ try
+ {
+ wagonManager.registerExtensionContainer( container );
+ }
+ catch ( ComponentLookupException e )
+ {
+ // no wagons found in the extension
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java?view=diff&rev=507294&r1=507293&r2=507294
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
Tue Feb 13 15:14:14 2007
@@ -36,6 +36,8 @@
{
void addExtension( Extension extension, MavenProject project,
ArtifactRepository localRepository )
throws ArtifactResolutionException, PlexusContainerException,
ArtifactNotFoundException;
+
+ void registerWagons();
void addExtension( Extension extension, Model originatingModel, List
remoteRepositories,
ArtifactRepository localRepository )
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=507294&r1=507293&r2=507294
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Tue Feb 13 15:14:14 2007
@@ -82,6 +82,10 @@
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+ <role-hint>default</role-hint>
+ </requirement>
</requirements>
</component>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=507294&r1=507293&r2=507294
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Feb 13 15:14:14 2007
@@ -40,6 +40,12 @@
<pluginRepository>
<id>apache.snapshots</id>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
@@ -47,7 +53,13 @@
<repositories>
<repository>
<id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
</repositories>
