cvs commit: maven-plugins/ant/src/plugin-resources/templates build.jelly

[aheritier]

aheritier    2004/07/19 11:12:04

  Modified:    ant/src/plugin-resources/templates build.jelly
  Log:
  Remove old duplicated code to copy resources for tests
  
  Revision  Changes    Path
  1.20      +3 -35     maven-plugins/ant/src/plugin-resources/templates/build.jelly
  
  Index: build.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/src/plugin-resources/templates/build.jelly,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.jelly       19 Jul 2004 18:08:34 -0000      1.19
  +++ build.jelly       19 Jul 2004 18:12:04 -0000      1.20
  @@ -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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]