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

[doogie-3]

Author: doogie
Date: Mon Dec 21 05:30:14 2009
New Revision: 892693

URL: http://svn.apache.org/viewvc?rev=892693&view=rev
Log:
Upgrade ant to 1.7.1.

Added:
    ofbiz/trunk/framework/base/lib/ant-1.7.1.jar
    ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar
    ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar
    ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar
    ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar
Removed:
    ofbiz/trunk/framework/base/lib/ant-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant-junit-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant-launcher-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.0.jar
    ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.0.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/ant.bat
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=892693&r1=892692&r2=892693&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Dec 21 05:30:14 2009
@@ -4,11 +4,11 @@
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="lib" path="applications/content/lib/lucene-core-2.4.1.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/poi-3.2-FINAL-20081019.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-1.7.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=892693&r1=892692&r2=892693&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Dec 21 05:30:14 2009
@@ -11,11 +11,11 @@
 http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz
 ==========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
-ofbiz/trunk/framework/base/lib/ant-launcher-1.7.0.jar
-ofbiz/trunk/framework/base/lib/ant-1.7.0.jar
-ofbiz/trunk/framework/base/lib/ant-junit-1.7.0.jar
-ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.0.jar
-ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.0.jar
+ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar
+ofbiz/trunk/framework/base/lib/ant-1.7.1.jar
+ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar
+ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar
+ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar
 ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar
 ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar
 ofbiz/trunk/framework/base/lib/batik-all-1.7.jar

Modified: ofbiz/trunk/ant.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant.bat?rev=892693&r1=892692&r2=892693&view=diff
==============================================================================
--- ofbiz/trunk/ant.bat (original)
+++ ofbiz/trunk/ant.bat Mon Dec 21 05:30:14 2009
@@ -19,5 +19,5 @@
 REM #####################################################################
 ECHO ON
 
-"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.0.jar %1 %2 %3 %4 %5 %6
+"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar %1 %2 %3 %4 %5 %6
 

Added: ofbiz/trunk/framework/base/lib/ant-1.7.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant-1.7.1.jar?rev=892693&view=auto
==============================================================================
Files ofbiz/trunk/framework/base/lib/ant-1.7.1.jar (added) and ofbiz/trunk/framework/base/lib/ant-1.7.1.jar Mon Dec 21 05:30:14 2009 differ

Added: ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar?rev=892693&view=auto
==============================================================================
Files ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar (added) and ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar Mon Dec 21 05:30:14 2009 differ

Added: ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar?rev=892693&view=auto
==============================================================================
Files ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar (added) and ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar Mon Dec 21 05:30:14 2009 differ

Added: ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar?rev=892693&view=auto
==============================================================================
Files ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar (added) and ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar Mon Dec 21 05:30:14 2009 differ

Added: ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar?rev=892693&view=auto
==============================================================================
Files ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar (added) and ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar Mon Dec 21 05:30:14 2009 differ

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=892693&r1=892692&r2=892693&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Mon Dec 21 05:30:14 2009
@@ -43,14 +43,14 @@
 
  <path id="groovy.class.path">
   <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"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
  </path>
  <path id="ant.lib.class.path">
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.0.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  </path>
  <path id="junit.class.path">
   <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"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
  </path>
  <path id="local.class.path"/>
 
@@ -73,8 +73,8 @@
   </default-javac>
  </presetdef>
 
- <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.0.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.0.jar"/>
+ <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">
   <attribute name="dir"/>
   <attribute name="file"/>