svn commit: r1752771 - in /ofbiz/trunk/tools: cleanBuild.bat mergefromtrunk.bat ofbiz.aptana.js.format.xml startofbiz.bat stopofbiz.sh test.bat

[jl...@apache.org]

Author: jleroux
Date: Fri Jul 15 05:11:09 2016
New Revision: 1752771

URL: http://svn.apache.org/viewvc?rev=1752771&view=rev
Log:
Fixes and remove few scripts, removes useless ofbiz.aptana.js.format.xml file, more to come...

Removed:
    ofbiz/trunk/tools/ofbiz.aptana.js.format.xml
Modified:
    ofbiz/trunk/tools/cleanBuild.bat
    ofbiz/trunk/tools/mergefromtrunk.bat
    ofbiz/trunk/tools/startofbiz.bat
    ofbiz/trunk/tools/stopofbiz.sh
    ofbiz/trunk/tools/test.bat

Modified: ofbiz/trunk/tools/cleanBuild.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/cleanBuild.bat?rev=1752771&r1=1752770&r2=1752771&view=diff
==============================================================================
--- ofbiz/trunk/tools/cleanBuild.bat (original)
+++ ofbiz/trunk/tools/cleanBuild.bat Fri Jul 15 05:11:09 2016
@@ -20,4 +20,4 @@ rem ####################################
 
 rem to revert back a revision in local copy.
 echo on
-svn up && ant clean build
+svn up && gradlew clean build

Modified: ofbiz/trunk/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/mergefromtrunk.bat?rev=1752771&r1=1752770&r2=1752771&view=diff
==============================================================================
--- ofbiz/trunk/tools/mergefromtrunk.bat (original)
+++ ofbiz/trunk/tools/mergefromtrunk.bat Fri Jul 15 05:11:09 2016
@@ -56,9 +56,7 @@ goto exit
 
 :tests
 echo on
-ant clean-all
-ant load-demo
-ant run-tests
+gradlew cleanAll loadDefault test
 echo off
 
 echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root

Modified: ofbiz/trunk/tools/startofbiz.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/startofbiz.bat?rev=1752771&r1=1752770&r2=1752771&view=diff
==============================================================================
--- ofbiz/trunk/tools/startofbiz.bat (original)
+++ ofbiz/trunk/tools/startofbiz.bat Fri Jul 15 05:11:09 2016
@@ -21,42 +21,7 @@ rem ####################################
 %~d0
 set OFBIZ_HOME=%~p0..\
 
-rem ### Console log file
-rem set OFBIZ_LOG=runtime\logs\console.log
-
-rem ### Delete the last log
-rem del %OFBIZ_LOG%
-
-rem ###VM args block ####################################################
-rem set MEMIF=-Xms128M -Xmx512M
-rem # RMI settings
-rem set DEBUG=-Dsun.rmi.server.exceptionTrace=true
-rem # Automatic IP address for Windows
-rem ipconfig | find "IP." | find /v "::" | find /v "0.0.0.0" > tmp.tmp
-rem for /f "tokens=2* delims=:" %%a in (tmp.tmp)  do for %%b IN (%%a) do set IPADDR=%%b
-rem del tmp.tmp
-rem set RMIIF=-Djava.rmi.server.hostname=%IPADDR%
-rem # Not needed anymore, for history
-rem set MISC=-Duser.language=en
-rem set VMARGS=%MEMIF% %MISC% %DEBUG% %RMIIF%
-rem ####################################################################
-
-rem ### Worldpay Config
-rem set VMARGS=-Xbootclasspath/p:applications\accounting\lib\cryptix.jar %VMARGS%
-
-
-rem ### Different ways of launching OFBiz ##############################
-rem ### start ofbiz with previous set VMARGS
-rem "%JAVA_HOME%\bin\java" %VMARGS% -jar ofbiz.jar > %OFBIZ_LOG%
-
-rem ### This one is for more of a debugging mode
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar ofbiz.jar > runtime\logs\console.log
-
-rem ### Simple easy to read line
 cd %OFBIZ_HOME%
 echo on
-"%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -server -jar ofbiz.jar
+gradlew ofbiz
 echo off
-rem ### If you would prefer the console output to be logged rather than displayed switch out the above line for this one
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -server -jar ofbiz.jar > runtime\logs\console.log
-

Modified: ofbiz/trunk/tools/stopofbiz.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/stopofbiz.sh?rev=1752771&r1=1752770&r2=1752771&view=diff
==============================================================================
--- ofbiz/trunk/tools/stopofbiz.sh (original)
+++ ofbiz/trunk/tools/stopofbiz.sh Fri Jul 15 05:11:09 2016
@@ -27,5 +27,5 @@ else
 fi
 
 
-(cd "$OFBIZ_HOME" && $JAVA -jar ofbiz.jar -shutdown)
+(cd "$OFBIZ_HOME" && gradlew "ofbiz --shutdown")
 

Modified: ofbiz/trunk/tools/test.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/test.bat?rev=1752771&r1=1752770&r2=1752771&view=diff
==============================================================================
--- ofbiz/trunk/tools/test.bat (original)
+++ ofbiz/trunk/tools/test.bat Fri Jul 15 05:11:09 2016
@@ -24,4 +24,4 @@ set OFBIZ_HOME=%~p0..\
 rem ### Simple easy to read line
 cd %OFBIZ_HOME%
 echo on
-svn up && ant clean-all load-demo run-tests
\ No newline at end of file
+svn up && gradlew cleanAll loadDefault test
\ No newline at end of file