jvanzyl 2004/05/07 19:09:56
Modified: maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
SurefirePlugin.java
maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven
plugin.xml
Log:
o make the surefire plugin an integrated plugins as this still has no
binding to maven.
Revision Changes Path
1.3 +28 -6
maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Index: SurefirePlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SurefirePlugin.java 19 Mar 2004 04:11:11 -0000 1.2
+++ SurefirePlugin.java 8 May 2004 02:09:56 -0000 1.3
@@ -1,25 +1,47 @@
package org.apache.maven.test;
import org.codehaus.surefire.SurefireBooter;
+import org.apache.maven.plugin.AbstractPlugin;
+import org.apache.maven.plugin.PluginExecutionRequest;
+import org.apache.maven.plugin.PluginExecutionResponse;
import java.io.File;
import java.util.List;
/**
- *
- *
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- *
* @version $Id$
- *
* @todo make version of junit and surefire configurable
* @todo make report to be produced configurable
*/
public class SurefirePlugin
+ extends AbstractPlugin
{
- public void execute( String mavenRepoLocal, String basedir, List includes, List
excludes, String[] classpathElements )
+
+ public void execute( PluginExecutionRequest request, PluginExecutionResponse
response )
throws Exception
+
+ //public void execute( String mavenRepoLocal, String basedir, List
includes, List excludes, String[] classpathElements )
+ // throws Exception
{
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ String mavenRepoLocal = (String) request.getParameter( "mavenRepoLocal" );
+
+ String basedir = (String) request.getParameter( "basedir" );
+
+ List includes = (List) request.getParameter( "includes" );
+
+ List excludes = (List) request.getParameter( "excludes" );
+
+ String[] classpathElements = (String[]) request.getParameter(
"classpathElements" );
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
System.setProperty( "basedir", basedir );
SurefireBooter surefireBooter = new SurefireBooter();
1.6 +23 -26
maven-components/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.xml 22 Mar 2004 18:13:59 -0000 1.5
+++ plugin.xml 8 May 2004 02:09:56 -0000 1.6
@@ -2,7 +2,7 @@
<id>surefire</id>
<implementation>org.apache.maven.test.SurefirePlugin</implementation>
<instantiation-strategy>singleton</instantiation-strategy>
- <mode>singleton</mode>
+ <mode>integrated</mode>
<goals>
<goal>
<name>test</name>
@@ -11,31 +11,28 @@
<prereq>resources</prereq>
<prereq>test:resources</prereq>
</prereqs>
- <method>
- <name>execute</name>
- <parameters>
- <parameter>
- <name>mavenRepoLocal</name>
- <expression>#maven.repo.local</expression>
- </parameter>
- <parameter>
- <name>basedir</name>
- <expression>#basedir</expression>
- </parameter>
- <parameter>
- <name>includes</name>
- <expression>#project.build.unitTest.includes</expression>
- </parameter>
- <parameter>
- <name>excludes</name>
- <expression>#project.build.unitTest.excludes</expression>
- </parameter>
- <parameter>
- <name>classpathElements</name>
- <expression>#project.classpathElements</expression>
- </parameter>
- </parameters>
- </method>
+ <parameters>
+ <parameter>
+ <name>mavenRepoLocal</name>
+ <expression>#maven.repo.local</expression>
+ </parameter>
+ <parameter>
+ <name>basedir</name>
+ <expression>#basedir</expression>
+ </parameter>
+ <parameter>
+ <name>includes</name>
+ <expression>#project.build.unitTest.includes</expression>
+ </parameter>
+ <parameter>
+ <name>excludes</name>
+ <expression>#project.build.unitTest.excludes</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
+ </parameters>
</goal>
</goals>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
