svn commit: r1100903 - in /ofbiz/trunk: common.xml macros.xml

Author: jleroux
Date: Mon May  9 07:19:32 2011
New Revision: 1100903

URL: http://svn.apache.org/viewvc?rev=1100903&view=rev
Log:
In r1100795 I missed some old <if> OOTB use cases.
Replaces old <if> syntax by ant-contrib's

Modified:
    ofbiz/trunk/common.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=1100903&r1=1100902&r2=1100903&view=diff
==============================================================================
--- ofbiz/trunk/common.xml (original)
+++ ofbiz/trunk/common.xml Mon May  9 07:19:32 2011
@@ -57,10 +57,8 @@ under the License.
     <target name="init"/>
 
     <if>
-        <condition>
-            <available file="${src.dir}"/>
-        </condition>
-        <commands>
+        <available file="${src.dir}"/>
+        <then>
             <selector id="src-extra-set">
                 <or>
                     <filename name="**/*.properties"/>
@@ -76,7 +74,7 @@ under the License.
                 </or>
             </selector>
             <property name="src.extra.dir" value="${src.dir}"/>
-        </commands>
+        </then>            
         <else>
             <selector id="src-extra-set">
                 <filename name="**" negate="true"/>

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1100903&r1=1100902&r2=1100903&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Mon May  9 07:19:32 2011
@@ -172,25 +172,23 @@ under the License.
   <attribute name="prefix" default=""/>
   <sequential>
    <if>
-    <condition>
      <not>
       <uptodate
        srcfile="@{prefix}src/@{dir}/@{file}.jj"
        targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/>
      </not>
-    </condition>
-    <commands>
-     <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
-     <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
-     <javacc target="@{prefix}src/@{dir}/@{file}.jj"
-      javacchome="${ofbiz.home.dir}/lib/build/javacc"
-      outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
-     <replace token="public class"
-       value='@SuppressWarnings("all") public class'
-       dir="@{prefix}build/gen-src/javacc/@{dir}"
-       includes="*.java" />
-     <delete dir="@{prefix}build/classes/@{dir}"/>
-    </commands>
+     <then>
+       <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
+       <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
+       <javacc target="@{prefix}src/@{dir}/@{file}.jj"
+          javacchome="${ofbiz.home.dir}/lib/build/javacc"
+          outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
+       <replace token="public class"
+           value='@SuppressWarnings("all") public class'
+           dir="@{prefix}build/gen-src/javacc/@{dir}"
+           includes="*.java" />
+       <delete dir="@{prefix}build/classes/@{dir}"/>
+     </then>
    </if>
   </sequential>
  </macrodef>