svn commit: r1100795 - in /ofbiz/trunk: LICENSE framework/base/lib/ant/ant-contrib-1.0b3.jar macros.xml

Author: jleroux
Date: Sun May  8 19:18:27 2011
New Revision: 1100795

URL: http://svn.apache.org/viewvc?rev=1100795&view=rev
Log:
Adds ant-contrib-1.0b3.jar
Replaces the <if> task (used javascript in a file with .py suffix :/ ). I kept it commented out for now, in case someone is using it (not used OOTB)

Added:
    ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar   (with props)
Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1100795&r1=1100794&r2=1100795&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun May  8 19:18:27 2011
@@ -382,6 +382,7 @@ ofbiz/trunk/specialpurpose/googlecheckou
 The following libraries distributed with Apache OFBiz are licensed under the
 Apache Software License:
 ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar
+ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
 =========================================================================
 Apache Software License
 

Added: ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar?rev=1100795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1100795&r1=1100794&r2=1100795&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sun May  8 19:18:27 2011
@@ -153,12 +153,17 @@ under the License.
   </groovyc>
  </presetdef>
 
- <scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py">
+ <!-- replaced by ant contrib version -->    
+ <!--scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py">
   <element name="condition" classname="org.apache.tools.ant.taskdefs.condition.And"/>
   <element name="commands" classname="org.apache.tools.ant.taskdefs.Sequential"/>
   <element name="else" classname="org.apache.tools.ant.taskdefs.Sequential"/>
- </scriptdef>
-
+  </scriptdef-->
+  <taskdef resource="net/sf/antcontrib/antlib.xml">
+    <classpath>
+        <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/>
+    </classpath>
+  </taskdef>
  <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <macrodef name="ofbiz-javacc">
@@ -181,9 +186,9 @@ under the License.
       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" />
+       value='@SuppressWarnings("all") public class'
+       dir="@{prefix}build/gen-src/javacc/@{dir}"
+       includes="*.java" />
      <delete dir="@{prefix}build/classes/@{dir}"/>
     </commands>
    </if>