vmassol 2004/04/22 13:50:12
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
When calling <code>cactus:test</code>, only run the tests if there are Cactus tests
present in the filesystem (i.e. if the Cactus source directory exists).
Revision Changes Path
1.34 +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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- changes.xml 17 Apr 2004 14:40:41 -0000 1.33
+++ changes.xml 22 Apr 2004 20:50:12 -0000 1.34
@@ -8,6 +8,11 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="add" issue="CACTUS-102" due-to="Nicolas De Loof">
+ When calling <code>cactus:test</code>, only run the tests if there are
+ Cactus tests present in the filesystem (i.e. if the Cactus source
+ directory exists).
+ </action>
<action dev="vmassol" type="fix">
Added dependency on <code>commons-jelly-tags-xml</code>. It seems
this is required for some configurations of Maven.
1.25 +14 -9 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 21 Mar 2004 17:45:36 -0000 1.24
+++ plugin.jelly 22 Apr 2004 20:50:12 -0000 1.25
@@ -287,15 +287,20 @@
defined.
========================================================================
-->
- <goal name="cactus:test" description="Run all Cactus tests">
- <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 name="cactus:test" description="Run all Cactus tests"
+ prereqs="cactus:init">
+
+ <j:if test="${cactusSourcePresent}">
+ <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>
+ </j:if>
+
</goal>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
