svn commit: r997445 - in /ofbiz/branches/release10.04: ./ ant ant.bat

[doogie-3]

Author: doogie
Date: Wed Sep 15 18:32:34 2010
New Revision: 997445

URL: http://svn.apache.org/viewvc?rev=997445&view=rev
Log:
Applied fix from trunk for revision: 997424
===


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/ant
    ofbiz/branches/release10.04/ant.bat

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 18:32:34 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423,997440
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997424,997440

Modified: ofbiz/branches/release10.04/ant
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/ant?rev=997445&r1=997444&r2=997445&view=diff
==============================================================================
--- ofbiz/branches/release10.04/ant (original)
+++ ofbiz/branches/release10.04/ant Wed Sep 15 18:32:34 2010
@@ -25,8 +25,8 @@ else
   JAVA=java
 fi
 
+top="$(cd "$(dirname "$0")"; echo "$PWD")"
 find_jar() {
-    top="$(cd "$(dirname "$0")"; echo "$PWD")"
     set -- "$top"/framework/base/lib/ant-launcher-*.jar
     if [ $# = 1 ] && [ -e "$1" ]; then
         echo "$1"
@@ -35,5 +35,5 @@ find_jar() {
         exit 1
     fi
 }
-"$JAVA" -jar "$(find_jar)" "$@"
+"$JAVA" -jar "$(find_jar)" -lib "$top/framework/base/lib/ant" "$@"
 

Modified: ofbiz/branches/release10.04/ant.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/ant.bat?rev=997445&r1=997444&r2=997445&view=diff
==============================================================================
--- ofbiz/branches/release10.04/ant.bat (original)
+++ ofbiz/branches/release10.04/ant.bat Wed Sep 15 18:32:34 2010
@@ -19,5 +19,5 @@ REM # under the License.
 REM #####################################################################
 ECHO ON
 
-"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar %1 %2 %3 %4 %5 %6
+"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6