Author: sisbell Date: Mon May 14 18:17:39 2007 New Revision: 538033 URL: http://svn.apache.org/viewvc?view=rev&rev=538033 Log: Fix for JIRA NMAVEN-56.
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=538033&r1=538032&r2=538033 ============================================================================== --- incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Mon May 14 18:17:39 2007 @@ -22,6 +22,10 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.project.MavenProject; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.codehaus.plexus.util.FileUtils; import java.util.ArrayList; @@ -33,6 +37,8 @@ import org.apache.maven.dotnet.executable.ExecutionException; import org.apache.maven.dotnet.vendor.Vendor; import org.apache.maven.dotnet.executable.CommandExecutor; +import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout; +import org.apache.maven.dotnet.artifact.AssemblyResolver; /** @@ -91,6 +97,17 @@ */ private String testAssemblyPath; + /** + * @component + */ + private AssemblyResolver assemblyResolver; + + /** + * @parameter expression="${settings.localRepository}" + * @readonly + */ + private String localRepository; + public String getExecutableFor( Vendor vendor, String home ) { @@ -135,8 +152,26 @@ return; } + ArtifactRepository localArtifactRepository = + new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() ); + try + { + assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(), + project.getRemoteArtifactRepositories(), localArtifactRepository, + true ); + } + catch ( ArtifactResolutionException e ) + { + throw new MojoExecutionException( "NMAVEN-901-000: Unable to resolve assemblies", e ); + } + catch ( ArtifactNotFoundException e ) + { + throw new MojoExecutionException( "NMAVEN-901-001: Unable to resolve assemblies", e ); + } + List<Artifact> nunitLibs = new ArrayList<Artifact>(); Set<Artifact> artifacts = project.getDependencyArtifacts(); + for ( Artifact artifact : artifacts ) { if ( artifact.getGroupId().equals( "NUnit" ) )