svn commit: r1304982 - /ofbiz/trunk/build.xml

[jacopoc]

Author: jacopoc
Date: Sun Mar 25 06:30:57 2012
New Revision: 1304982

URL: http://svn.apache.org/viewvc?rev=1304982&view=rev
Log:
* added new ant task, named "stop", to stop OFBiz (same purpose of stopofbiz.sh/bat)
* OFBiz admin port and key are now passed as system properties to the "run", "run-debug" and "stop" tasks: the three tasks are now more consistent with the platform dependent startofbiz.sh/bat and stopofbiz.sh/bat scripts
* start/stop tasks are now grouped under the same section of the build.xml file; added a new section for data setup scripts (no functional changes)


Modified:
    ofbiz/trunk/build.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1304982&r1=1304981&r2=1304982&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sun Mar 25 06:30:57 2012
@@ -24,6 +24,8 @@ under the License.
 
     <import file="macros.xml"/>
     <property name="site.dir" value="../site"/>
+    <property name="ofbiz.admin.port" value="10523"/>
+    <property name="ofbiz.admin.key" value="so3du5kasd5dn"/>
     <property name="memory.initial.param" value="-Xms128M"/>
     <property name="memory.max.param" value="-Xmx512M"/>
     <property name="pos.memory.max.param" value="-Xmx512M"/>
@@ -360,7 +362,7 @@ under the License.
     </target>
 
     <!-- ================================================================== -->
-    <!-- Start OFBiz                                                        -->
+    <!-- Start and Stop OFBiz                                                        -->
     <!-- ================================================================== -->
 
     <target name="run"
@@ -369,6 +371,30 @@ under the License.
             <jvmarg value="${memory.initial.param}"/>
             <jvmarg value="${pos.memory.max.param}"/>
             <jvmarg value="${memory.maxpermsize.param}"/>
+            <sysproperty key="ofbiz.admin.port" value="${ofbiz.admin.port}"/>
+            <sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
+        </java>
+    </target>
+    <target name="stop"
+            description="This will stop OFBiz">
+        <java jar="ofbiz.jar" fork="true">
+            <sysproperty key="ofbiz.admin.port" value="${ofbiz.admin.port}"/>
+            <sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
+            <arg value="-shutdown"/>
+        </java>
+    </target>
+    <target name="run-debug" depends="build"
+            description="Starts OFBiz in debugging mode">
+        <java jar="ofbiz.jar"  fork="true">
+            <jvmarg value="${memory.initial.param}"/>
+            <jvmarg value="${memory.max.param}"/>
+            <jvmarg value="${memory.maxpermsize.param}"/>
+            <jvmarg value="-Xnoagent"/>
+            <jvmarg value="-Djava.compiler=NONE"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8091"/>
+            <sysproperty key="ofbiz.admin.port" value="${ofbiz.admin.port}"/>
+            <sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
         </java>
     </target>
     <target name="run-pos"
@@ -380,6 +406,11 @@ under the License.
             <arg value="pos"/>
         </java>
     </target>
+
+    <!-- ================================================================== -->
+    <!-- Setup OFBiz Data                                                   -->
+    <!-- ================================================================== -->
+
     <target name="run-install" depends="build"
             description="This loads all configured data; meant for generic OFBiz development, testing, demonstration, etc purposes">
         <java jar="ofbiz.jar" fork="true">
@@ -837,18 +868,6 @@ under the License.
         <antcall target="load-admin-user-login"/>
     </target>
 
-    <target name="run-debug" depends="build"
-            description="Starts OFBiz in debugging mode">
-        <java jar="ofbiz.jar"  fork="true">
-            <jvmarg value="${memory.initial.param}"/>
-            <jvmarg value="${memory.max.param}"/>
-            <jvmarg value="${memory.maxpermsize.param}"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=NONE"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8091"/>
-        </java>
-    </target>
     <target name="run-tests" depends="build"
           description="Run OFBiz default tests, execute ant run-install before and see results in runtime/logs/test-results/html/all-tests.html.">
         <java jar="ofbiz.jar" fork="true" resultproperty="test.result">