svn commit: r1304369 - in /ofbiz/trunk: ./ framework/ tools/ tools/api-java16/ tools/src/

[jacopoc]

Author: jacopoc
Date: Fri Mar 23 14:26:32 2012
New Revision: 1304369

URL: http://svn.apache.org/viewvc?rev=1304369&view=rev
Log:
Moved all platform dependent scripts to the "tool" folder, with the only exception of the "ant" scripts for unix and windows that are still in the home folder.
Removed a series of unused files (ant extensions).
Removed special handling for hsql db from ant tasks (hsql is no more bundled with OFBiz).
Please help testing the scripts as I was only able to run some limited tests on my Mac.

Added:
    ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh   (contents, props changed)
      - copied, changed from r1302529, ofbiz/trunk/applyOfbizPatchesAndHotDeploy.sh
    ofbiz/trunk/tools/ij.ofbiz   (contents, props changed)
      - copied, changed from r1304209, ofbiz/trunk/ij.ofbiz
    ofbiz/trunk/tools/rc.ofbiz   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/rc.ofbiz
    ofbiz/trunk/tools/rc.ofbiz.for.debian
      - copied unchanged from r1303676, ofbiz/trunk/rc.ofbiz.for.debian
    ofbiz/trunk/tools/rc.ofbiz.for.ubuntu
      - copied unchanged from r1303676, ofbiz/trunk/rc.ofbiz.for.ubuntu
    ofbiz/trunk/tools/revert.bat
      - copied unchanged from r1303676, ofbiz/trunk/revert.bat
    ofbiz/trunk/tools/startofbiz.bat   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/startofbiz.bat
    ofbiz/trunk/tools/startofbiz.sh   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/startofbiz.sh
    ofbiz/trunk/tools/startofbizBoth.bat
      - copied, changed from r1303676, ofbiz/trunk/startofbizBoth.bat
    ofbiz/trunk/tools/startofbizPos.bat
      - copied, changed from r1303676, ofbiz/trunk/startofbizPos.bat
    ofbiz/trunk/tools/stopofbiz.sh   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/stopofbiz.sh
    ofbiz/trunk/tools/svnUpHotdeploy.bat   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/svnUpHotdeploy.bat
    ofbiz/trunk/tools/svnUpHotdeploy.sh   (contents, props changed)
      - copied, changed from r1303676, ofbiz/trunk/svnUpHotdeploy.sh
Removed:
    ofbiz/trunk/applyOfbizPatchesAndHotDeploy.sh
    ofbiz/trunk/ij.ofbiz
    ofbiz/trunk/rc.ofbiz
    ofbiz/trunk/rc.ofbiz.for.debian
    ofbiz/trunk/rc.ofbiz.for.ubuntu
    ofbiz/trunk/revert.bat
    ofbiz/trunk/startofbiz.bat
    ofbiz/trunk/startofbiz.sh
    ofbiz/trunk/startofbizBoth.bat
    ofbiz/trunk/startofbizPos.bat
    ofbiz/trunk/stopofbiz.sh
    ofbiz/trunk/svnUpHotdeploy.bat
    ofbiz/trunk/svnUpHotdeploy.sh
    ofbiz/trunk/tools/If-ant.py
    ofbiz/trunk/tools/api-java16/
    ofbiz/trunk/tools/src/
Modified:
    ofbiz/trunk/README
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/build.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/README?rev=1304369&r1=1304368&r2=1304369&view=diff
==============================================================================
--- ofbiz/trunk/README (original)
+++ ofbiz/trunk/README Fri Mar 23 14:26:32 2012
@@ -1,16 +1,18 @@
 
 Welcome to Apache OFBiz!
 
-If you have a release build all you need to run OFBiz is a
+All you need to run OFBiz is a
 1.6 (version 6) JDK (not just the JRE, the full JDK).
 http://java.sun.com/javase/downloads/index.jsp
 
-However if you have downloaded ofbiz from SVN then you should
-load the demo data (strongly advised) with the following command
-on the command line: (being in the OFbiz directory)
+You can load the demo data (strongly advised) with the following command
+on the command line: (being in the OFBiz directory)
 
-linux: ./ant run-install
-windows: ant run-install
+linux/unix/osx:
+./ant run-install
+
+windows:
+ant run-install
 
 Once that is properly setup just run the executable jar file
 that comes with OFBiz, which is ofbiz.jar. To do this on the
@@ -18,8 +20,17 @@ command line you would run:
 
 java -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar
 
-Even better use the startup scripts for Windows and Unix-based
-operating systems, namely startofbiz.bat and startofbiz.sh.
+or
+
+linux/unix/osx:
+./ant run
+
+windows:
+ant run
+
+You will also find several platform dependent startup scripts in the "tools" folder
+(for Windows and Unix-based operating systems, the startup scripts are startofbiz.bat
+and startofbiz.sh).
 
 Once OFBiz starts, you can look at the demo storefront at:
 http://localhost:8080/ecommerce

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1304369&r1=1304368&r2=1304369&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Fri Mar 23 14:26:32 2012
@@ -91,7 +91,7 @@ under the License.
         </delete>
     </target>
     <target name="clean-data"
-          description="Clean all DB data (Derby and HSQL) under runtime/data">
+          description="Clean all DB data (Derby) under runtime/data">
         <subant target="clean-data">
             <filelist dir="." files="framework/build.xml"/>
         </subant>

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1304369&r1=1304368&r2=1304369&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Fri Mar 23 14:26:32 2012
@@ -51,7 +51,6 @@ under the License.
         <mkdir dir="../runtime/logs/test-results"/>
         <mkdir dir="../runtime/data"/>
         <mkdir dir="../runtime/data/derby"/>
-        <mkdir dir="../runtime/data/hsql"/>
 
         <condition property="isMac">
             <os family="mac"/>

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1304369&r1=1304368&r2=1304369&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Fri Mar 23 14:26:32 2012
@@ -194,12 +194,6 @@ under the License.
   </groovyc>
  </presetdef>
 
- <!-- replaced by ant contrib version -->    
- <!--scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py">
-  <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-->
   <taskdef resource="net/sf/antcontrib/antlib.xml">
     <classpath>
         <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/>

Copied: ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh (from r1302529, ofbiz/trunk/applyOfbizPatchesAndHotDeploy.sh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh?p2=ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh&p1=ofbiz/trunk/applyOfbizPatchesAndHotDeploy.sh&r1=1302529&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/applyOfbizPatchesAndHotDeploy.sh (original)
+++ ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh Fri Mar 23 14:26:32 2012
@@ -21,19 +21,19 @@
 # This shell script will will run ./ant apply patches on all components
 #              present in the hot-deploy directory
 
-    if [ -f "../ofbiz.patch" ]; then
-    patch -p0 <../ofbiz.patch
+OFBIZ_HOME="$( cd -P "$( dirname "$0" )" && pwd )"/..
+
+    if [ -f "$OFBIZ_HOME/../ofbiz.patch" ]; then
+    patch -p0 < $OFBIZ_HOME/../ofbiz.patch
     fi
 
-    for f in hot-deploy/*
+    for f in $OFBIZ_HOME/hot-deploy/*
     do
-        if [ "$f" != "hot-deploy/README.txt" ]; then
+        if [ "$f" != "$OFBIZ_HOME/hot-deploy/README.txt" ]; then
         if [ -f "$f/patches/applications.patch" ]; then
                 echo apply patches for component $f
-                cd $f
-            ../../ant apply-ofbiz-patches
+            (cd $f && ant apply-ofbiz-patches)
             echo return code $?
-        cd ../../
         fi
         fi
     done

Propchange: ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: ofbiz/trunk/tools/applyOfbizPatchesAndHotDeploy.sh
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Copied: ofbiz/trunk/tools/ij.ofbiz (from r1304209, ofbiz/trunk/ij.ofbiz)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/ij.ofbiz?p2=ofbiz/trunk/tools/ij.ofbiz&p1=ofbiz/trunk/ij.ofbiz&r1=1304209&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/ij.ofbiz (original)
+++ ofbiz/trunk/tools/ij.ofbiz Fri Mar 23 14:26:32 2012
@@ -18,11 +18,14 @@
 # under the License.
 #####################################################################
 
+# set the parent directory as OFBiz Home
+OFBIZ_HOME="$( cd -P "$( dirname "$0" )" && pwd )"/..
+
 # Properties (derby may need editing if the version has not been updated)
 HM='-Dderby.system.home=runtime/data/derby'
 PR='-Dij.protocol=jdbc:derby:'
 DB='-Dij.database=ofbiz;create=true'
-EE='framework/entity/lib/jdbc'
+EE='$OFBIZ_HOME/framework/entity/lib/jdbc'
 CP="-cp $EE/derby-10.8.1.2.jar:$EE/derbytools-10.8.1.2.jar"
 
 # Command

Propchange: ofbiz/trunk/tools/ij.ofbiz
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/ij.ofbiz
------------------------------------------------------------------------------
    svn:executable =

Copied: ofbiz/trunk/tools/rc.ofbiz (from r1303676, ofbiz/trunk/rc.ofbiz)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/rc.ofbiz?p2=ofbiz/trunk/tools/rc.ofbiz&p1=ofbiz/trunk/rc.ofbiz&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
    (empty)

Propchange: ofbiz/trunk/tools/rc.ofbiz
------------------------------------------------------------------------------
    svn:eol-style = LF

Copied: ofbiz/trunk/tools/startofbiz.bat (from r1303676, ofbiz/trunk/startofbiz.bat)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/startofbiz.bat?p2=ofbiz/trunk/tools/startofbiz.bat&p1=ofbiz/trunk/startofbiz.bat&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/startofbiz.bat (original)
+++ ofbiz/trunk/tools/startofbiz.bat Fri Mar 23 14:26:32 2012
@@ -18,6 +18,9 @@ rem specific language governing permissi
 rem under the License.
 rem #####################################################################
 
+%~d0
+set OFBIZ_HOME=%~p0..\
+
 rem ### Console log file
 rem set OFBIZ_LOG=runtime\logs\console.log
 
@@ -50,6 +53,7 @@ rem ### This one is for more of a debugg
 rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -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 -XX:MaxPermSize=512m -jar ofbiz.jar
 echo off

Propchange: ofbiz/trunk/tools/startofbiz.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Copied: ofbiz/trunk/tools/startofbiz.sh (from r1303676, ofbiz/trunk/startofbiz.sh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/startofbiz.sh?p2=ofbiz/trunk/tools/startofbiz.sh&p1=ofbiz/trunk/startofbiz.sh&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/startofbiz.sh (original)
+++ ofbiz/trunk/tools/startofbiz.sh Fri Mar 23 14:26:32 2012
@@ -22,6 +22,9 @@
 ADMIN_PORT=10523
 ADMIN_KEY=so3du5kasd5dn
 
+# set the parent directory as OFBiz Home
+OFBIZ_HOME="$( cd -P "$( dirname "$0" )" && pwd )"/..
+
 # console log file
 OFBIZ_LOG=runtime/logs/console.log
 
@@ -55,4 +58,4 @@ fi
 
 # start ofbiz
 #$JAVA $VMARGS -jar ofbiz.jar $* >>$OFBIZ_LOG 2>>$OFBIZ_LOG&
-exec "$JAVA" $VMARGS -jar ofbiz.jar "$@"
+(cd "$OFBIZ_HOME" && exec "$JAVA" $VMARGS -jar ofbiz.jar "$@")

Propchange: ofbiz/trunk/tools/startofbiz.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/startofbiz.sh
------------------------------------------------------------------------------
    svn:executable =

Propchange: ofbiz/trunk/tools/startofbiz.sh
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Copied: ofbiz/trunk/tools/startofbizBoth.bat (from r1303676, ofbiz/trunk/startofbizBoth.bat)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/startofbizBoth.bat?p2=ofbiz/trunk/tools/startofbizBoth.bat&p1=ofbiz/trunk/startofbizBoth.bat&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/startofbizBoth.bat (original)
+++ ofbiz/trunk/tools/startofbizBoth.bat Fri Mar 23 14:26:32 2012
@@ -18,6 +18,9 @@ rem specific language governing permissi
 rem under the License.
 rem #####################################################################
 
+%~d0
+set OFBIZ_HOME=%~p0..\
+
 rem ### Console log file
 rem set OFBIZ_LOG=runtime\logs\console.log
 
@@ -50,6 +53,7 @@ rem ### This one is for more of a debugg
 rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -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 -XX:MaxPermSize=512m -jar ofbiz.jar -both
 echo off

Copied: ofbiz/trunk/tools/startofbizPos.bat (from r1303676, ofbiz/trunk/startofbizPos.bat)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/startofbizPos.bat?p2=ofbiz/trunk/tools/startofbizPos.bat&p1=ofbiz/trunk/startofbizPos.bat&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/startofbizPos.bat (original)
+++ ofbiz/trunk/tools/startofbizPos.bat Fri Mar 23 14:26:32 2012
@@ -18,6 +18,9 @@ rem specific language governing permissi
 rem under the License.
 rem #####################################################################
 
+%~d0
+set OFBIZ_HOME=%~p0..\
+
 rem ### Console log file
 rem set OFBIZ_LOG=runtime\logs\console.log
 
@@ -50,6 +53,7 @@ rem ### This one is for more of a debugg
 rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -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 -XX:MaxPermSize=512m -jar ofbiz.jar -pos
 echo off

Copied: ofbiz/trunk/tools/stopofbiz.sh (from r1303676, ofbiz/trunk/stopofbiz.sh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/stopofbiz.sh?p2=ofbiz/trunk/tools/stopofbiz.sh&p1=ofbiz/trunk/stopofbiz.sh&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/stopofbiz.sh (original)
+++ ofbiz/trunk/tools/stopofbiz.sh Fri Mar 23 14:26:32 2012
@@ -21,6 +21,8 @@
 # ofbiz.admin.key and ofbiz.admin.port must match that which OFBIZ was started with
 ####
 
+OFBIZ_HOME="$( cd -P "$( dirname "$0" )" && pwd )"/..
+
 # location of java executable
 if [ -f "$JAVA_HOME/bin/java" ]; then
   JAVA=$JAVA_HOME/bin/java
@@ -32,5 +34,5 @@ fi
 ADMIN_PORT=10523
 ADMIN_KEY=so3du5kasd5dn
 
-$JAVA -Dofbiz.admin.port=$ADMIN_PORT -Dofbiz.admin.key=$ADMIN_KEY -jar ofbiz.jar -shutdown
+(cd "$OFBIZ_HOME" && $JAVA -Dofbiz.admin.port=$ADMIN_PORT -Dofbiz.admin.key=$ADMIN_KEY -jar ofbiz.jar -shutdown)
 

Propchange: ofbiz/trunk/tools/stopofbiz.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/stopofbiz.sh
------------------------------------------------------------------------------
    svn:executable =

Propchange: ofbiz/trunk/tools/stopofbiz.sh
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Copied: ofbiz/trunk/tools/svnUpHotdeploy.bat (from r1303676, ofbiz/trunk/svnUpHotdeploy.bat)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/svnUpHotdeploy.bat?p2=ofbiz/trunk/tools/svnUpHotdeploy.bat&p1=ofbiz/trunk/svnUpHotdeploy.bat&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/svnUpHotdeploy.bat (original)
+++ ofbiz/trunk/tools/svnUpHotdeploy.bat Fri Mar 23 14:26:32 2012
@@ -27,7 +27,7 @@ rem SVN path of the hot-deploy folder, h
 set SVN_PATH=.../implementation/trunk/ofbiz/hot-deploy/
 
 rem Go to (local) working copy of the hot-deploy folder
-pushd hot-deploy
+pushd ../hot-deploy
 
 rem Get all files and directories of hot-deploy folder via SVN
 for /f "tokens=*" %%i in ('svn list !SVN_PATH!') do (

Propchange: ofbiz/trunk/tools/svnUpHotdeploy.bat
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/svnUpHotdeploy.bat
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Copied: ofbiz/trunk/tools/svnUpHotdeploy.sh (from r1303676, ofbiz/trunk/svnUpHotdeploy.sh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/tools/svnUpHotdeploy.sh?p2=ofbiz/trunk/tools/svnUpHotdeploy.sh&p1=ofbiz/trunk/svnUpHotdeploy.sh&r1=1303676&r2=1304369&rev=1304369&view=diff
==============================================================================
--- ofbiz/trunk/svnUpHotdeploy.sh (original)
+++ ofbiz/trunk/tools/svnUpHotdeploy.sh Fri Mar 23 14:26:32 2012
@@ -21,9 +21,11 @@
 # This shell script will do a 'svn up' on all directories
 #              present in the hot-deploy directory
 
-    for f in hot-deploy/*
+OFBIZ_HOME="$( cd -P "$( dirname "$0" )" && pwd )"/..
+
+    for f in $OFBIZ_HOME/hot-deploy/*
     do
-        if [ "$f" != "hot-deploy/README.txt" ]; then
+        if [ "$f" != "$OFBIZ_HOME/hot-deploy/README.txt" ]; then
             echo svn update directory $f
             svn up $f
         fi

Propchange: ofbiz/trunk/tools/svnUpHotdeploy.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: ofbiz/trunk/tools/svnUpHotdeploy.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: ofbiz/trunk/tools/svnUpHotdeploy.sh
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"