[jboss-svn-commits] JBL Code SVN: r33766 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-07-08 05:44:22 -0400 (Thu, 08 Jul 2010)
New Revision: 33766

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.properties
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.xml
Log:
Fixed scripts, added added sleep.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.properties	2010-07-08 09:00:33 UTC (rev 33765)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.properties	2010-07-08 09:44:22 UTC (rev 33766)
@@ -1,8 +1,13 @@
 sever.home=/jboss-5.1.0.Branch
 
-shutdown.command=${sever.home}/bin/shutdown.sh --server=hornetq:1100
+shutdown.command=${sever.home}/bin/shutdown.sh
 
-startup.command=nohup ${sever.home}/bin/run.sh -c production -b hornetq &
+startup.command=${sever.home}/bin/run.sh
+startup.command.arguments.1=-c
+startup.command.arguments.2=production
+startup.command.arguments.3=-b
+startup.command.arguments.4=hornetq
+startup.command.arguments.5=&
 
 hornetq.configuration.xml=${sever.home}/server/production/deploy/hornetq/hornetq-configuration.xml
 

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.xml	2010-07-08 09:00:33 UTC (rev 33765)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/server-controller/server-api.xml	2010-07-08 09:44:22 UTC (rev 33766)
@@ -25,19 +25,28 @@
    <!--artifact:pom id="perfpom" file="../../pom.xml"/-->
    
    <target name="startup" >
-      <exec executable="${startup.command}"/>
+      <echo>[${startup.command.arguments.1} ${startup.command.arguments.2} ${startup.command.arguments.3} ${startup.command.arguments.4} ${startup.command.arguments.5}]</echo>
+      <exec executable="${startup.command}" spawn="true">
+         <arg value="${startup.command.arguments.1}"/>
+         <arg value="${startup.command.arguments.2}"/>
+         <arg value="${startup.command.arguments.3}"/>
+         <arg value="${startup.command.arguments.4}"/>
+         <arg value="${startup.command.arguments.5}"/>
+      </exec>
    </target>
    
    <target name="shutdown" >
-      <exec executable="${shutdown.command}"/>
-      <waitfor maxwait="20" checkeveryunit="second"/>
       
+      <exec executable="${shutdown.command}" output="/dev/null">
+         <arg value="--server=hornetq:1100"/>
+      </exec>
+      <sleep seconds="10"/>
+   
       <xmltask source="${sever.home}/server/production/deploy/hornetq/hornetq-configuration.xml">
-         <copy path="/configuration/journal-directory" buffer="hornetq.journal.dir"/>
+         <copy path="/configuration/journal-directory" property="hornetq.journal.dir"/>
       </xmltask>
       <echo>journal directory[${hornetq.journal.dir}] is deleted</echo>
-      <delete dir="${hornetq.journal.dir}">
-      </delete>
+      <delete dir="${hornetq.journal.dir}"/>
       
    </target>