werken 2002/09/25 08:45:04
Modified: src/plugins-build/test plugin.jelly
Log:
Setting the has.test.resources property once is enough.
When set multiple times, some with <property> and other with <j:set>
it caused problems with clover.
Revision Changes Path
1.15 +3 -12 jakarta-turbine-maven/src/plugins-build/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/test/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 24 Sep 2002 07:29:02 -0000 1.14
+++ plugin.jelly 25 Sep 2002 15:45:03 -0000 1.15
@@ -4,13 +4,13 @@
<j:choose>
<j:when test="${pom.build.testResources == null}">
- <property name="maven.has.test.resource.patterns" value="false"/>
+ <j:set var="maven.has.test.resource.patterns" value="false"/>
</j:when>
<j:when test="${pom.build.testResources.isEmpty()}">
- <property name="maven.has.test.resource.patterns" value="false"/>
+ <j:set var="maven.has.test.resource.patterns" value="false"/>
</j:when>
<j:otherwise>
- <property name="maven.has.test.resource.patterns" value="true"/>
+ <j:set var="maven.has.test.resource.patterns" value="true"/>
</j:otherwise>
</j:choose>
@@ -48,15 +48,6 @@
<!--
Copies the resources needed by the tests
-->
- <j:choose>
- <j:when test="${!pom.build.unitTest.resources.includes.isEmpty()}">
- <j:set var="maven.has.test.resource.patterns" value="true"/>
- </j:when>
- <j:when test="${!pom.build.unitTest.resources.excludes.isEmpty()}">
- <j:set var="maven.has.test.resource.patterns" value="true"/>
- </j:when>
- </j:choose>
-
<j:if test="${maven.has.test.resource.patterns}">
<copy todir="${maven.test.dest}">
<fileset dir="${pom.build.unitTestSourceDirectory}">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
