svn commit: r708993 - in /ofbiz/trunk: ./ framework/base/lib/ framework/base/lib/ant/ framework/base/lib/scripting/

[doogie-3]

Author: doogie
Date: Wed Oct 29 12:47:20 2008
New Revision: 708993

URL: http://svn.apache.org/viewvc?rev=708993&view=rev
Log:
Make it work with clean global ant.  Now both ./ant and a system
installed ant will work; tested in a brand new clean chroot.

Added:
    ofbiz/trunk/framework/base/lib/ant/
    ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.0.jar
      - copied unchanged from r708924, ofbiz/trunk/framework/base/lib/ant-apache-bsf-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.0.jar
      - copied unchanged from r708924, ofbiz/trunk/framework/base/lib/ant-nodeps-1.7.0.jar
    ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
      - copied, changed from r708924, ofbiz/trunk/framework/base/lib/bsf-2.4.0.jar
Removed:
    ofbiz/trunk/framework/base/lib/ant-apache-bsf-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant-nodeps-1.7.0.jar
    ofbiz/trunk/framework/base/lib/bsf-2.4.0.jar
Modified:
    ofbiz/trunk/macros.xml

Copied: ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar (from r708924, ofbiz/trunk/framework/base/lib/bsf-2.4.0.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar?p2=ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar&p1=ofbiz/trunk/framework/base/lib/bsf-2.4.0.jar&r1=708924&r2=708993&rev=708993&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=708993&r1=708992&r2=708993&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Wed Oct 29 12:47:20 2008
@@ -33,9 +33,11 @@
  <path id="src-path"/>
 
  <path id="groovy.class.path">
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-1.5.6.jar"/>
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-2.2.jar"/>
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/>
+  <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.0.jar"/>
+ </path>
+ <path id="ant.lib.class.path">
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.0.jar"/>
  </path>
  <path id="local.class.path"/>
 
@@ -55,16 +57,19 @@
   </default-javac>
  </presetdef>
 
- <scriptdef name="if" language="groovy" src="${ofbiz.home.dir}/framework/base/ant-scripts/if-script.groovy" classpathref="groovy.class.path">
+ <taskdef name="ofbizscriptdef" classname="org.apache.tools.ant.taskdefs.optional.script.ScriptDef">
+  <classpath refid="ant.lib.class.path"/>
+ </taskdef>
+ <ofbizscriptdef name="if" language="groovy" src="${ofbiz.home.dir}/framework/base/ant-scripts/if-script.groovy" classpathref="groovy.class.path">
   <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>
+ </ofbizscriptdef>
 
- <scriptdef name="ofbiz-jjtree" language="groovy" src="${ofbiz.home.dir}/framework/base/ant-scripts/ofbiz-jjtree.groovy" classpathref="groovy.class.path">
+ <ofbizscriptdef name="ofbiz-jjtree" language="groovy" src="${ofbiz.home.dir}/framework/base/ant-scripts/ofbiz-jjtree.groovy" classpathref="groovy.class.path">
   <attribute name="src"/>
   <attribute name="dir"/>
   <attribute name="file"/>
   <attribute name="gendir"/>
- </scriptdef>
+ </ofbizscriptdef>
 </project>