jvanzyl 2004/05/20 10:06:34
Modified: maven-plugins/maven-surefire-plugin project.xml
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:
turn into a maven plugin and add @tags for descriptor generation.
Revision Changes Path
1.4 +1 -37 maven-components/maven-plugins/maven-surefire-plugin/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 12 Apr 2004 20:14:19 -0000 1.3
+++ project.xml 20 May 2004 17:06:34 -0000 1.4
@@ -9,49 +9,13 @@
<groupId>maven</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<name>Maven</name>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
- <inceptionYear>2001</inceptionYear>
+ <version>1.0-SNAPSHOT</version>
<package>org.apache.maven</package>
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-components/maven-plugins/maven-surefire-plugin</connection>
- <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:maven-components/maven-plugins/maven-surefire-plugin</developerConnection>
- <url>http://cvs.apache.org/viewcvs.cgi/maven/</url>
- </repository>
<dependencies>
<dependency>
<groupId>surefire</groupId>
<artifactId>surefire-booter</artifactId>
<version>1.0</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus</artifactId>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-i18n</artifactId>
- <version>1.0-beta-2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
1.4 +24 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SurefirePlugin.java 8 May 2004 02:09:56 -0000 1.3
+++ SurefirePlugin.java 20 May 2004 17:06:34 -0000 1.4
@@ -9,20 +9,39 @@
import java.util.List;
/**
+ * @maven.plugin.id surefire
+ * @maven.plugin.description A maven2 plugin which uses surefire as a test runner
+ *
+ * @parameter mavenRepoLocal String required validator
+ * @parameter basedir String required validator
+ * @parameter includes String required validator
+ * @parameter excludes String required validator
+ * @parameter classpathElements String[] required validator
+ *
+ * @goal.name test
+ * @goal.test.description Run tests using surefire
+ *
+ * @goal.test.prereq test:compile
+ * @goal.test.prereq resources
+ * @goal.test.prereq test:resources
+ *
+ * @goal.test.parameter mavenRepoLocal #maven.repo.local
+ * @goal.test.parameter basedir #basedir
+ * @goal.test.parameter includes #project.build.unitTest.includes
+ * @goal.test.parameter excludes #project.build.unitTest.excludes
+ * @goal.test.parameter classpathElements #project.classpathElements
+
* @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( PluginExecutionRequest request, PluginExecutionResponse
response )
throws Exception
-
- //public void execute( String mavenRepoLocal, String basedir, List
includes, List excludes, String[] classpathElements )
- // throws Exception
{
// ----------------------------------------------------------------------
//
1.7 +45 -7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.xml 8 May 2004 02:09:56 -0000 1.6
+++ plugin.xml 20 May 2004 17:06:34 -0000 1.7
@@ -1,16 +1,49 @@
<plugin>
<id>surefire</id>
<implementation>org.apache.maven.test.SurefirePlugin</implementation>
- <instantiation-strategy>singleton</instantiation-strategy>
+ <instantiationStrategy>singleton</instantiationStrategy>
<mode>integrated</mode>
+ <parameters>
+ <parameter>
+ <name>mavenRepoLocal</name>
+ <type>String</type>
+ <required>false</required>
+ <validator>validator</validator>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>basedir</name>
+ <type>String</type>
+ <required>false</required>
+ <validator>validator</validator>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>includes</name>
+ <type>String</type>
+ <required>false</required>
+ <validator>validator</validator>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>excludes</name>
+ <type>String</type>
+ <required>false</required>
+ <validator>validator</validator>
+ <description></description>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <type>String[]</type>
+ <required>false</required>
+ <validator>validator</validator>
+ <description></description>
+ </parameter>
+ </parameters>
<goals>
<goal>
<name>test</name>
- <prereqs>
- <prereq>test:compile</prereq>
- <prereq>resources</prereq>
- <prereq>test:resources</prereq>
- </prereqs>
+ <description>Run tests using surefire</description>
<parameters>
<parameter>
<name>mavenRepoLocal</name>
@@ -33,6 +66,11 @@
<expression>#project.classpathElements</expression>
</parameter>
</parameters>
+ <prereqs>
+ <prereq>test:compile</prereq>
+ <prereq>resources</prereq>
+ <prereq>test:resources</prereq>
+ </prereqs>
</goal>
</goals>
-</plugin>
+</plugin>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
