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/07/23 10:34:05 UTC
svn commit: r679024 - in /maven/components/branches/MNG-3652:
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven-embedder/src/main/resources/META-INF/plexus/components.xml pom.xml
Author: brett
Date: Wed Jul 23 01:34:04 2008
New Revision: 679024
URL: http://svn.apache.org/viewvc?rev=679024&view=rev
Log:
apply changes from maven-2.0.10-RC branch for later inclusion in trunk
Modified:
maven/components/branches/MNG-3652/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-3652/maven-embedder/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/MNG-3652/pom.xml
Modified: maven/components/branches/MNG-3652/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3652/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=679024&r1=679023&r2=679024&view=diff
==============================================================================
--- maven/components/branches/MNG-3652/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/MNG-3652/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Jul 23 01:34:04 2008
@@ -24,6 +24,8 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.manager.DefaultWagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -39,6 +41,7 @@
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ReactorManager;
+import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.extension.BuildExtensionScanner;
import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleException;
@@ -86,6 +89,7 @@
import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.logging.LoggerManager;
@@ -696,6 +700,26 @@
// Artifact related components
// ----------------------------------------------------------------------
+ // TODO: remove when components.xml can be used to configure this instead
+ WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
+ try
+ {
+ DefaultWagonManager defaultWagonManger = (DefaultWagonManager) wagonManager;
+
+ RuntimeInformation runtimeInformation = (RuntimeInformation) container.lookup( RuntimeInformation.class.getName() );
+ defaultWagonManger.setHttpUserAgent( "Apache-Maven/" +
+ runtimeInformation.getApplicationVersion() + " " + defaultWagonManger.getHttpUserAgent() );
+ container.release( runtimeInformation );
+ }
+ catch ( ClassCastException e )
+ {
+ // ignore
+ }
+ finally
+ {
+ container.release( wagonManager );
+ }
+
artifactRepositoryFactory = (ArtifactRepositoryFactory) container.lookup( ArtifactRepositoryFactory.ROLE );
artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
@@ -726,6 +750,10 @@
{
throw new MavenEmbedderException( "Cannot lookup required component.", e );
}
+ catch ( ComponentLifecycleException e )
+ {
+ throw new MavenEmbedderException( "Cannot release temporary component.", e );
+ }
}
// ----------------------------------------------------------------------
Modified: maven/components/branches/MNG-3652/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3652/maven-embedder/src/main/resources/META-INF/plexus/components.xml?rev=679024&r1=679023&r2=679024&view=diff
==============================================================================
--- maven/components/branches/MNG-3652/maven-embedder/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/MNG-3652/maven-embedder/src/main/resources/META-INF/plexus/components.xml Wed Jul 23 01:34:04 2008
@@ -43,38 +43,16 @@
</requirements>
</component>
+ <!-- TODO: waiting until we can filter versions without filtering system properties, and also when Plexus uses an expression evaluator
+ that can evaluate the system properties at runtime
<component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>http</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LightweightHttpWagon</description>
- <isolated-realm>false</isolated-realm>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
<configuration>
- <httpHeaders>
- <property>
- <name>User-Agent</name>
- <value>Apache Maven/${project.version}</value>
- </property>
- </httpHeaders>
+ <httpUserAgent>Apache-Maven/${project.version} maven-artifact/${project.version} (Java @java.version@; @os.name@ @os.version@)</httpUserAgent>
</configuration>
</component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>https</role-hint>
- <implementation>org.apache.maven.wagon.providers.http.LightweightHttpsWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LIghtweightHttpsWagon</description>
- <isolated-realm>false</isolated-realm>
- <configuration>
- <httpHeaders>
- <property>
- <name>User-Agent</name>
- <value>Apache Maven/${project.version}</value>
- </property>
- </httpHeaders>
- </configuration>
- </component>
-
+ -->
</components>
</component-set>
Modified: maven/components/branches/MNG-3652/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3652/pom.xml?rev=679024&r1=679023&r2=679024&view=diff
==============================================================================
--- maven/components/branches/MNG-3652/pom.xml (original)
+++ maven/components/branches/MNG-3652/pom.xml Wed Jul 23 01:34:04 2008
@@ -238,7 +238,7 @@
<module>maven-toolchain</module>
</modules>
<properties>
- <artifactVersion>3.0-SNAPSHOT</artifactVersion>
+ <artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
<aspectjVersion>1.5.3</aspectjVersion>
<classWorldsVersion>1.2-alpha-13</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>