You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/07/25 22:46:43 UTC
svn commit: r797832 - in
/maven/plugin-testing/branches/plugin-testing-mvn-3.x: ./
maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/
maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/
Author: olamy
Date: Sat Jul 25 20:46:43 2009
New Revision: 797832
URL: http://svn.apache.org/viewvc?rev=797832&view=rev
Log:
make it working with 3.x (at least testing with 2 test cases from site plugin 3.x branch)
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/ArtifactStub.java
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java
maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
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=797832&r1=797831&r2=797832&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 Sat Jul 25 20:46:43 2009
@@ -20,6 +20,7 @@
*/
import java.io.File;
+import java.io.FileInputStream;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.AccessibleObject;
@@ -33,7 +34,13 @@
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.DefaultContainerConfiguration;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
@@ -64,6 +71,8 @@
private ComponentConfigurator configurator;
private DefaultPluginManager pluginManager;
+ private PlexusContainer container;
+
/*
* for the harness I think we have decided against going the route of using the maven project builder.
* instead I think we are going to try and make an instance of the localrespository and assign that
@@ -73,7 +82,6 @@
protected void setUp()
throws Exception
{
- super.setUp();
configurator = getContainer().lookup( ComponentConfigurator.class, "basic" );
pluginManager = (DefaultPluginManager) getContainer().lookup( PluginManager.class );
@@ -87,6 +95,41 @@
}
}
+ protected InputStream getPublicDescriptorStream()
+ throws Exception
+ {
+ String path = getBasedir() + "/target/classes/META-INF/maven/plugin.xml";
+ return new FileInputStream( new File( path ) );
+ }
+
+
+ protected void setupContainer()
+ {
+ ClassWorld classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
+
+ ContainerConfiguration cc =
+ new DefaultContainerConfiguration().setClassWorld( classWorld ).setName( "embedder" );
+ try
+ {
+ container = new DefaultPlexusContainer( cc );
+ }
+ catch ( PlexusContainerException e )
+ {
+ e.printStackTrace();
+ fail( "Failed to create plexus container." );
+ }
+ }
+
+ protected PlexusContainer getContainer()
+ {
+ if ( container == null )
+ {
+ setupContainer();
+ }
+
+ return container;
+ }
+
/**
* Lookup the mojo leveraging the subproject pom
*
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.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/ArtifactStub.java?rev=797832&r1=797831&r2=797832&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java Sat Jul 25 20:46:43 2009
@@ -19,19 +19,19 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-
import java.io.File;
import java.util.Collection;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.apache.maven.artifact.versioning.VersionRange;
+
/**
* Stub class for {@link Artifact} testing.
*
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.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/StubArtifactRepository.java?rev=797832&r1=797831&r2=797832&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java Sat Jul 25 20:46:43 2009
@@ -23,7 +23,9 @@
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.Proxy;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -177,33 +179,49 @@
return null;
}
+ public Authentication getAuthentication()
+ {
+ return null;
+ }
+
+ public Proxy getProxy()
+ {
+ return null;
+ }
+
+ public void setAuthentication( Authentication authentication )
+ {
+
+ }
+
public void setId( String id )
{
- // TODO Auto-generated method stub
}
public void setLayout( ArtifactRepositoryLayout layout )
{
- // TODO Auto-generated method stub
+
+ }
+
+ public void setProxy( Proxy proxy )
+ {
}
public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy )
{
- // TODO Auto-generated method stub
}
public void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy policy )
{
- // TODO Auto-generated method stub
}
public void setUrl( String url )
{
- // TODO Auto-generated method stub
}
+
}
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=797832&r1=797831&r2=797832&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Sat Jul 25 20:46:43 2009
@@ -167,13 +167,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-beta-3.0.8-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.5.15</version>
</dependency>
<dependency>
@@ -215,7 +215,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0</version>
+ <version>2.0.1</version>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-testing/${artifactId}-${version}</stagingSiteURL>
</configuration>
@@ -229,4 +229,38 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <properties>
+ <m2buildDirectory>build</m2buildDirectory>
+ </properties>
+ <build>
+ <directory>${m2buildDirectory}</directory>
+ <plugins>
+ <plugin>
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id='org.maven.ide.eclipse.jdt.javaConfigurator' />
+ <configurator id='org.maven.ide.eclipse.modello.modelloConfigurator' />
+ <configurator id='org.maven.ide.eclipse.plexus.annotations.plexusConfigurator' />
+ </configurators>
+ <mojoExecutions>
+ <mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
+ </mojoExecutions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>