vmassol 2004/06/27 09:41:26
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
Cactus now guess automatically what Java source files are Cactus tests when
packaging tests in an EAR (it was already supported when running tests packaged in a
WAR).
Revision Changes Path
1.39 +5 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- changes.xml 20 Jun 2004 14:04:12 -0000 1.38
+++ changes.xml 27 Jun 2004 16:41:26 -0000 1.39
@@ -8,6 +8,11 @@
<body>
<release version="1.7dev" date="in CVS">
+ <action dev="vmassol" type="fix">
+ Cactus now guess automatically what Java source files are Cactus tests
+ when packaging tests in an EAR (it was already supported when running
+ tests packaged in a WAR).
+ </action>
<action dev="vmassol" type="add" issue="CACTUS-119">
Added new <code>cactus.jboss3x.config.dir</code> property which allows
users to specify the location of a custom JBoss server configuration
1.30 +10 -5 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 27 Jun 2004 15:30:06 -0000 1.29
+++ plugin.jelly 27 Jun 2004 16:41:26 -0000 1.30
@@ -914,6 +914,13 @@
prereqs="cactus:init,cactus:init-report,cactus:cactifyear"
description="Run all Cactus tests (packaged in an EAR)">
+ <cactus:scanner var="cactusScanner" classpathref="cactus.scanner.classpath">
+ <fileset dir="${cactus.target.classes.dir}">
+ <include name="${cactus.test.includes}"/>
+ <exclude name="${cactus.test.excludes}"/>
+ </fileset>
+ </cactus:scanner>
+
<cactus earfile="${cactus.ear}" fork="yes"
errorproperty="cactustests.error" failureproperty="cactustests.failure"
printsummary="${maven.cactus.printsummary}">
@@ -1055,11 +1062,9 @@
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
<ant:formatter type="xml"/>
- <ant:batchtest>
- <ant:fileset dir="${cactus.src.dir}"
- includes="${cactus.test.includes}"
- excludes="${cactus.test.excludes}"/>
- </ant:batchtest>
+ <j:forEach var="test" items="${cactusScanner.iterator()}">
+ <test name="${test}"/>
+ </j:forEach>
</cactus>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
