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 2006/05/14 03:40:10 UTC
svn commit: r406180 -
/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Author: brett
Date: Sat May 13 18:40:09 2006
New Revision: 406180
URL: http://svn.apache.org/viewcvs?rev=406180&view=rev
Log:
[MSUREFIRE-104] fix classloading in forked mode
Modified:
maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified: maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=406180&r1=406179&r2=406180&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java (original)
+++ maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java Sat May 13 18:40:09 2006
@@ -633,10 +633,19 @@
Artifact providerArtifact = artifactFactory.createDependencyArtifact( "org.apache.maven.surefire", provider,
VersionRange.createFromVersion( version ),
"jar", null, Artifact.SCOPE_TEST );
- resolveArtifact( providerArtifact, surefireBooter, filteredArtifact );
+ ArtifactResolutionResult result = resolveArtifact( filteredArtifact, providerArtifact );
+
+ for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ {
+ Artifact artifact = (Artifact) i.next();
+
+ getLog().debug( "Adding to surefire test classpath: " + artifact.getFile().getAbsolutePath() );
+
+ surefireBooter.addSurefireClassPathUrl( artifact.getFile().getAbsolutePath() );
+ }
}
- private void resolveArtifact( Artifact providerArtifact, SurefireBooter surefireBooter, Artifact filteredArtifact )
+ private ArtifactResolutionResult resolveArtifact( Artifact filteredArtifact, Artifact providerArtifact )
throws ArtifactResolutionException, ArtifactNotFoundException
{
ArtifactFilter filter = null;
@@ -648,24 +657,23 @@
Artifact originatingArtifact = artifactFactory.createBuildArtifact( "dummy", "dummy", "1.0", "jar" );
- ArtifactResolutionResult result = artifactResolver.resolveTransitively(
- Collections.singleton( providerArtifact ), originatingArtifact, localRepository, remoteRepositories,
- metadataSource, filter );
+ return artifactResolver.resolveTransitively( Collections.singleton( providerArtifact ), originatingArtifact,
+ localRepository, remoteRepositories, metadataSource, filter );
+ }
+
+ private void addArtifact( SurefireBooter surefireBooter, Artifact surefireArtifact )
+ throws ArtifactNotFoundException, ArtifactResolutionException
+ {
+ ArtifactResolutionResult result = resolveArtifact( null, surefireArtifact );
for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
- getLog().debug( "Adding to surefire test classpath: " + artifact.getFile().getAbsolutePath() );
+ getLog().debug( "Adding to surefire booter test classpath: " + artifact.getFile().getAbsolutePath() );
- surefireBooter.addSurefireClassPathUrl( artifact.getFile().getAbsolutePath() );
+ surefireBooter.addSurefireBootClassPathUrl( artifact.getFile().getAbsolutePath() );
}
- }
-
- private void addArtifact( SurefireBooter surefireBooter, Artifact artifact )
- throws ArtifactNotFoundException, ArtifactResolutionException
- {
- resolveArtifact( artifact, surefireBooter, null );
}
protected void processSystemProperties( boolean setInSystem )