MPANT-13

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115077 13f79535-47bb-0310-9956-ffa450edef68

ant/src/plugin-resources/templates/build.jelly

@@ -246,25 +246,28 @@
       </javac>
 
       <j:if test="${!pom.build.unitTest.resources.isEmpty()}">
-      <j:choose trim="true">
-        <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:forEach var="resource" items="${pom.build.unitTest.resources}">
+          <j:choose trim="true">
+            <j:when test="${!resource.includes.isEmpty()}">
+               <j:set var="maven.has.test.resource.patterns" value="true"/>
+             </j:when>
+             <j:when test="${!resource.excludes.isEmpty()}">
+               <j:set var="maven.has.test.resource.patterns" value="true"/>
+             </j:when>
+          </j:choose>      
+        </j:forEach>
       </j:if>
    
       <j:if test="${maven.has.test.resource.patterns}">
- 
       <copy todir="$${testclassesdir}">
         <fileset dir="${pom.build.unitTestSourceDirectory}">
-          <j:forEach var="res" items="${pom.build.unitTest.resources.includes}">
-            <include name="${res}"/>
-          </j:forEach>
-          <j:forEach var="res" items="${pom.build.unitTest.resources.excludes}">
-            <exclude name="${res}"/>
+          <j:forEach var="resource" items="${pom.build.unitTest.resources}">     
+            <j:forEach var="res" items="${resource.includes}">
+              <include name="${res}"/>
+            </j:forEach>
+            <j:forEach var="res" items="${resource.excludes}">
+              <exclude name="${res}"/>
+            </j:forEach>
           </j:forEach>
         </fileset>
       </copy>

ant/xdocs/changes.xml

@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.7" date="in CVS">
+      <action dev="aheritier" type="fix" issue="MPANT-13">Corrects also NumberFormatException. <code>pom.build.unitTest.resources</code> is made up of several <code>resource</code> elements.</action>
       <action dev="aheritier" type="fix" issue="MPANT-12">Remove NumberFormatException if <code>pom.build.unitTest.resources</code> doesn't exist.</action>
       <action dev="dion" type="fix" issue="MPANT-11">Change plugin tests to use 'assert' tags</action>
       <action dev="brett" type="fix">Replace use of 'target' directory with appropriate variables</action>