You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/02 21:22:53 UTC
svn commit: r790716 - in
/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing:
AbstractMojoTestCase.java stubs/StubArtifactCollector.java
Author: bentmann
Date: Thu Jul 2 19:22:52 2009
New Revision: 790716
URL: http://svn.apache.org/viewvc?rev=790716&view=rev
Log:
[MPLUGINTESTING-11] plugin-testing-mvn-3.x branch does not compile/work with latest maven 3.0-SNAPSHOT
Submitted by: Igor Fedorenko
Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=790716&r1=790715&r2=790716&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java Thu Jul 2 19:22:52 2009
@@ -20,6 +20,7 @@
*/
import java.io.File;
+import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@@ -27,11 +28,15 @@
import java.util.Map;
import org.apache.maven.monitor.logging.DefaultLog;
+import org.apache.maven.plugin.DefaultPluginManager;
import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.PluginManager;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
+import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.LoggerManager;
@@ -57,6 +62,7 @@
extends PlexusTestCase
{
private ComponentConfigurator configurator;
+ private DefaultPluginManager pluginManager;
/*
* for the harness I think we have decided against going the route of using the maven project builder.
@@ -69,9 +75,16 @@
{
super.setUp();
- configurator = (ComponentConfigurator) getContainer().lookup( ComponentConfigurator.ROLE, "basic" );
+ configurator = getContainer().lookup( ComponentConfigurator.class, "basic" );
+ pluginManager = (DefaultPluginManager) getContainer().lookup( PluginManager.class );
- //projectBuilder = (MavenProjectBuilder) getContainer().lookup( MavenProjectBuilder.ROLE );
+ InputStream is = getClass().getResourceAsStream( "/" + pluginManager.getComponentDescriptorLocation() );
+ PluginDescriptor pluginDescriptor = pluginManager.parsebuildPluginDescriptor( is ); // closes the stream
+
+ for ( ComponentDescriptor<?> desc : pluginDescriptor.getComponents() )
+ {
+ getContainer().addComponentDescriptor( desc );
+ }
}
/**
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java?rev=790716&r1=790715&r2=790716&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java Thu Jul 2 19:22:52 2009
@@ -28,7 +28,9 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -45,10 +47,22 @@
super();
}
- public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions,
- ArtifactRepository localRepository, List remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter, List listeners,
- List conflictResolvers )
+ public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners,
+ List<ConflictResolver> conflictResolvers )
+ {
+ // TODO check if we have to do more here
+ return new ArtifactResolutionResult();
+ }
+
+ public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
{
// TODO check if we have to do more here
return new ArtifactResolutionResult();