From b23c94e67a4749a08b85838915967b0c19843ecf Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 19 Jul 2004 18:12:04 +0000
Subject: [PATCH] Remove old duplicated code to copy resources for tests

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115860 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin-resources/templates/build.jelly    | 38 ++-----------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index e9542293..19203bdd 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -142,40 +142,6 @@
     
     </j:forEach>
 
-    <!-- Copy any resources required for unit testing -->
-    <j:forEach var="resource" items="${pom.build.unitTest.resources}">
- 
-    <j:choose trim="true">
-      <j:when test="${(resource.targetPath != null) and (!resource.targetPath.equals(''))}">
-        <j:set var="outputDir" value="$${testclassesdir}/${resource.targetPath}"/>
-        <mkdir dir="$${testclassesdir}/${resource.targetPath}"/>
-      </j:when>
-      <j:otherwise>
-        <j:set var="outputDir" value="$${testclassesdir}"/>
-      </j:otherwise>
-    </j:choose>   
-
-    <copy todir="${outputDir}">
-      
-      <maven:makeRelativePath var="dir" basedir="${basedir}" path="${resource.directory}" separator="/"/>
-
-      <j:if test="${empty dir}">
-        <j:set var="dir" value="."/>
-      </j:if>
-      
-      <fileset dir="${dir}">
-      
-      <j:forEach var="pattern" items="${resource.includes}">
-        <include name="${pattern}"/>
-      </j:forEach>
-      <j:forEach var="pattern" items="${resource.excludes}">
-        <exclude name="${pattern}"/>
-      </j:forEach>
-      </fileset>
-    </copy>
- 
-    </j:forEach>
-
   </target>
     
   <target
@@ -286,6 +252,8 @@
         </classpath>
       </javac>
 
+    <!-- Copy any resources required for unit testing -->
+
       <j:if test="${!pom.build.unitTest.resources.isEmpty()}">
         <j:forEach var="resource" items="${pom.build.unitTest.resources}">
           <j:choose trim="true">
@@ -302,7 +270,7 @@
       <j:if test="${maven.has.test.resource.patterns}">
         <j:forEach var="resource" items="${pom.build.unitTest.resources}">     
           <j:choose trim="true">
-            <j:when test="${(resource.targetPath != null) &amp;&amp; (!resource.targetPath.equals(''))}">
+            <j:when test="${(resource.targetPath != null) and (!resource.targetPath.equals(''))}">
               <j:set var="outputDir" value="$${testclassesdir}/${resource.targetPath}"/>
               <mkdir dir="$${testclassesdir}/${resource.targetPath}"/>
             </j:when>