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

[aheritier]

aheritier    2004/07/19 11:08:34

  Modified:    ant/src/plugin-resources/templates build.jelly
  Log:
  Replace some && by and in jelly tests
  
  Revision  Changes    Path
  1.19      +3 -3      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.jelly       19 Jul 2004 17:59:03 -0000      1.18
  +++ build.jelly       19 Jul 2004 18:08:34 -0000      1.19
  @@ -80,7 +80,7 @@
       <condition property="noget">
         <equals arg1="$${build.sysclasspath}" arg2="only"/>
       </condition>
  -    <!-- Test if JUNIT is present in ANT classpath -->
  +    <x:comment> Test if JUNIT is present in ANT classpath </x:comment>
       <available classname="junit.framework.Test" property="Junit.present"/>
     </target>
   
  @@ -112,7 +112,7 @@
       <j:forEach var="resource" items="${pom.build.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="$${classesdir}/${resource.targetPath}"/>
             <mkdir dir="$${classesdir}/${resource.targetPath}"/>
           </j:when>
  @@ -146,7 +146,7 @@
       <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]