vmassol 2004/03/21 09:45:36
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
Fix problem for running EAR when using cactus:test (using the cactus.is.ear property)
Revision Changes Path
1.30 +7 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 2 Mar 2004 20:34:34 -0000 1.29
+++ changes.xml 21 Mar 2004 17:45:36 -0000 1.30
@@ -8,6 +8,12 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="add">
+ The <code>cactus:test</code> can now also be used to run tests packaged
+ in an EAR. However the <code>cactus.is.ear</code> property needs
+ to be set to <code>true</code> (it is <code>false</code> by default
+ thus packaging tests in a WAR).
+ </action>
<action dev="vmassol" type="fix" issue="27351">
Aligning the EAR-ing behavior in the Cactus plugin for
Maven with the behavior from the EAR Maven plugin. More specifically,
@@ -16,7 +22,7 @@
descriptor.
</action>
<action dev="vmassol" type="fix" due-to="Nicolas Chalumeau"
due-to-email="[EMAIL PROTECTED]">
- The <code>cactus:test-ear</code> goal was not properly using the
+ The <code>cactus:test-ear</code> goal was not using properly the
<code>cactus.test.includes</code>/<code>cactus.test.excludes</code> thus
leading to tests not being included/excluded.
</action>
1.24 +8 -6 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 2 Mar 2004 20:31:55 -0000 1.23
+++ plugin.jelly 21 Mar 2004 17:45:36 -0000 1.24
@@ -288,12 +288,14 @@
========================================================================
-->
<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>
+ <j:choose>
+ <j:when test="${context.getVariable('cactus.is.ear') == 'true'}">
+ <attainGoal name="cactus:test-ear"/>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="cactus:test-war"/>
+ </j:otherwise>
+ </j:choose>
</goal>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
