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

[doogie-3]

Author: doogie
Date: Tue Jun 24 16:01:13 2014
New Revision: 1605119

URL: http://svn.apache.org/r1605119
Log:
Move ant out of the primary classpath; the shell script and batch file
now load it from this out-of-band location.

Added:
    ofbiz/trunk/lib/ant/
    ofbiz/trunk/lib/ant/ant-1.9.0-ant-apache-bsf.jar
      - copied, changed from r1605056, ofbiz/trunk/framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar
    ofbiz/trunk/lib/ant/ant-1.9.0-ant-junit.jar
      - copied, changed from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-junit.jar
    ofbiz/trunk/lib/ant/ant-1.9.0-ant-launcher.jar
      - copied, changed from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-launcher.jar
    ofbiz/trunk/lib/ant/ant-1.9.0-ant.jar
      - copied, changed from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant.jar
    ofbiz/trunk/lib/ant/ant-contrib-1.0b3.jar
      - copied, changed from r1605056, ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
Removed:
    ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-junit.jar
    ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-launcher.jar
    ofbiz/trunk/framework/base/lib/ant-1.9.0-ant.jar
    ofbiz/trunk/framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar
    ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/ant
    ofbiz/trunk/ant.bat

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1605119&r1=1605118&r2=1605119&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Tue Jun 24 16:01:13 2014
@@ -10,10 +10,10 @@ OFBiz and the full text of the license u
 For additional details, see the NOTICE file.
 =========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
-framework/base/lib/ant-1.9.0-ant-launcher.jar
-framework/base/lib/ant-1.9.0-ant.jar
-framework/base/lib/ant-1.9.0-ant-junit.jar
-framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar
+lib/ant/ant-1.9.0-ant-launcher.jar
+lib/ant/ant-1.9.0-ant.jar
+lib/ant/ant-1.9.0-ant-junit.jar
+lib/ant/ant-1.9.0-ant-apache-bsf.jar
 framework/base/lib/ant/ant-nodeps-1.8.1.jar
 framework/base/lib/avalon-framework-4.2.0.jar
 framework/base/lib/avalon-util-exception-1.0.0.jar
@@ -328,7 +328,7 @@ framework/images/webapp/images/date/time
 The following libraries distributed with Apache OFBiz are licensed under the
 Apache Software License:
 framework/webapp/lib/DataVision-1.0.0.jar
-framework/base/lib/ant/ant-contrib-1.0b3.jar
+lib/ant/ant-contrib-1.0b3.jar
 =========================================================================
 Apache Software License
 

Modified: ofbiz/trunk/ant
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=1605119&r1=1605118&r2=1605119&view=diff
==============================================================================
--- ofbiz/trunk/ant (original)
+++ ofbiz/trunk/ant Tue Jun 24 16:01:13 2014
@@ -27,7 +27,7 @@ fi
 
 top="$(cd "$(dirname "$0")"; echo "$PWD")"
 find_jar() {
-    set -- "$top"/framework/base/lib/*ant-launcher.jar
+    set -- "$top"/lib/ant/*ant-launcher.jar
     if [ $# = 1 ] && [ -e "$1" ]; then
         echo "$1"
     else
@@ -35,5 +35,5 @@ find_jar() {
         exit 1
     fi
 }
-"$JAVA" -jar "$(find_jar)" -lib "$top/framework/base/lib/ant" "$@"
+"$JAVA" -jar "$(find_jar)" -lib "$top/lib/ant" "$@"
 

Modified: ofbiz/trunk/ant.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant.bat?rev=1605119&r1=1605118&r2=1605119&view=diff
==============================================================================
--- ofbiz/trunk/ant.bat (original)
+++ ofbiz/trunk/ant.bat Tue Jun 24 16:01:13 2014
@@ -19,5 +19,5 @@ REM # under the License.
 REM #####################################################################
 ECHO ON
 
-"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-1.9.0-ant-launcher.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6
+"%JAVA_HOME%\bin\java" -jar lib/ant/ant-1.9.0-ant-launcher.jar -lib lib/ant %1 %2 %3 %4 %5 %6
 

Copied: ofbiz/trunk/lib/ant/ant-1.9.0-ant-apache-bsf.jar (from r1605056, ofbiz/trunk/framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/ant/ant-1.9.0-ant-apache-bsf.jar?p2=ofbiz/trunk/lib/ant/ant-1.9.0-ant-apache-bsf.jar&p1=ofbiz/trunk/framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar&r1=1605056&r2=1605119&rev=1605119&view=diff
==============================================================================
Binary files - no diff available.

Copied: ofbiz/trunk/lib/ant/ant-1.9.0-ant-junit.jar (from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-junit.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/ant/ant-1.9.0-ant-junit.jar?p2=ofbiz/trunk/lib/ant/ant-1.9.0-ant-junit.jar&p1=ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-junit.jar&r1=1605056&r2=1605119&rev=1605119&view=diff
==============================================================================
Binary files - no diff available.

Copied: ofbiz/trunk/lib/ant/ant-1.9.0-ant-launcher.jar (from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-launcher.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/ant/ant-1.9.0-ant-launcher.jar?p2=ofbiz/trunk/lib/ant/ant-1.9.0-ant-launcher.jar&p1=ofbiz/trunk/framework/base/lib/ant-1.9.0-ant-launcher.jar&r1=1605056&r2=1605119&rev=1605119&view=diff
==============================================================================
Binary files - no diff available.

Copied: ofbiz/trunk/lib/ant/ant-1.9.0-ant.jar (from r1605056, ofbiz/trunk/framework/base/lib/ant-1.9.0-ant.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/ant/ant-1.9.0-ant.jar?p2=ofbiz/trunk/lib/ant/ant-1.9.0-ant.jar&p1=ofbiz/trunk/framework/base/lib/ant-1.9.0-ant.jar&r1=1605056&r2=1605119&rev=1605119&view=diff
==============================================================================
Binary files - no diff available.

Copied: ofbiz/trunk/lib/ant/ant-contrib-1.0b3.jar (from r1605056, ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/ant/ant-contrib-1.0b3.jar?p2=ofbiz/trunk/lib/ant/ant-contrib-1.0b3.jar&p1=ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar&r1=1605056&r2=1605119&rev=1605119&view=diff
==============================================================================
Binary files - no diff available.