You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2004/02/12 17:24:32 UTC
cvs commit: jakarta-cactus default-project.xml
vmassol 2004/02/12 08:24:32
Modified: integration/maven plugin.properties plugin.jelly
integration/maven/xdocs changes.xml properties.xml
. default-project.xml
Log:
<action dev="vmassol" type="fix" issue="26811" due-to="Archimedes Trajano" due-to-email="trajano@yahoo.com">
Added support for running tests packaged as an EAR when the Cactus
plgin is triggered by defining the Cactus report in
<code>project.xml</code>.
</action>
Revision Changes Path
1.15 +4 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.properties 25 Jan 2004 17:30:00 -0000 1.14
+++ plugin.properties 12 Feb 2004 16:24:32 -0000 1.15
@@ -69,6 +69,10 @@
# EJBs with Cactus)
cactus.j2ee.version = 1.3
+# Decides whether to use ear deployment when executing the cactus:test target
+# or not. Defaults to false.
+cactus.is.ear = false
+
# (optional) Temporary directory where the containers are setup/executed
#cactus.tmp.dir =
1.20 +21 -7 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 28 Jan 2004 11:11:53 -0000 1.19
+++ plugin.jelly 12 Feb 2004 16:24:32 -0000 1.20
@@ -9,7 +9,7 @@
<!--
Note: There is significant refactoring required for the goals cactus:test,
- cactus:single, and cactus:match. The <cactus> tasks in each of those goals
+ cactus:single, and cactus:match. The <cactus> tasks in each of those goals
are mostly similar.
-->
<project
@@ -27,7 +27,7 @@
Default goal.
========================================================================
-->
- <goal name="cactus" description="Run all Cactus Test Cases"
+ <goal name="cactus" description="Run all Cactus tests"
prereqs="cactus:test"/>
<!--
@@ -129,7 +129,7 @@
========================================================================
-->
<goal name="cactus:compile" prereqs="cactus:init,java:compile"
- description="Compiles the cactus tests">
+ description="Compiles the Cactus tests">
<ant:mkdir dir="${cactus.target.classes.dir}"/>
@@ -287,9 +287,23 @@
defined.
========================================================================
-->
- <goal name="cactus:test"
+ <goal name="cactus:test" description="Run all Cactus tests">
+ <j:if test="${context.getVariable('cactus.test.ear') == 'true'}">
+ <attainGoal name="cactus:test-ear"/>
+ </j:if>
+ <j:if test="${context.getVariable('cactus.test.ear') != 'true'}">
+ <attainGoal name="cactus:test-war"/>
+ </j:if>
+ </goal>
+
+ <!--
+ ========================================================================
+ Execute the Cactus tests, packaging them in a WAR.
+ ========================================================================
+ -->
+ <goal name="cactus:test-war"
prereqs="cactus:init,cactus:init-report,cactus:cactifywar"
- description="Run all Cactus Test Cases (packaged in a WAR)">
+ description="Run all Cactus tests (packaged in a WAR)">
<cactus:scanner var="cactusScanner" classpathref="cactus.scanner.classpath">
<fileset dir="${cactus.target.classes.dir}">
@@ -519,7 +533,7 @@
========================================================================
-->
<goal name="cactus:single" prereqs="cactus:init,cactus:cactifywar"
- description="Run a single Cactus Test Case">
+ description="Run a single Cactus test">
<j:choose>
<j:when test="${empty(testcase)}">
@@ -928,7 +942,7 @@
-->
<goal name="cactus:test-ear"
prereqs="cactus:init,cactus:init-report,cactus:cactifyear"
- description="Run all Cactus Test Cases (packaged in an EAR)">
+ description="Run all Cactus tests (packaged in an EAR)">
<cactus earfile="${cactus.ear}" fork="yes"
errorproperty="cactustests.error" failureproperty="cactustests.failure"
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 28 Jan 2004 11:11:50 -0000 1.21
+++ changes.xml 12 Feb 2004 16:24:32 -0000 1.22
@@ -8,6 +8,11 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="fix" issue="26811" due-to="Archimedes Trajano" due-to-email="trajano@yahoo.com">
+ Added support for running tests packaged as an EAR when the Cactus
+ plgin is triggered by defining the Cactus report in
+ <code>project.xml</code>.
+ </action>
<action dev="vmassol" type="fix">
When running Cactus tests on an EJB project, through
<code>cactus:test-ear</code>, do not include the EJB sources in
1.18 +11 -0 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- properties.xml 25 Jan 2004 17:39:37 -0000 1.17
+++ properties.xml 12 Feb 2004 16:24:32 -0000 1.18
@@ -242,6 +242,17 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.is.ear</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ If this is true then the <code>cactus:test</code> target will
+ execute <code>cactus:test-ear</code>. Default value is
+ <code>false</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
1.9 +5 -0 jakarta-cactus/default-project.xml
Index: default-project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/default-project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default-project.xml 20 Dec 2003 22:12:48 -0000 1.8
+++ default-project.xml 12 Feb 2004 16:24:32 -0000 1.9
@@ -116,6 +116,11 @@
<name>Michael Gaffney</name>
<email>michael.gaffney@panacya.com</email>
</contributor>
+ <contributor>
+ <name>Archimedes Trajano</name>
+ <email>trajano@yahoo.com</email>
+ <url>http://www.trajano.net/</url>
+ </contributor>
</contributors>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org