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

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

Author: whitingjr
Date: 2010-07-08 05:50:56 -0400 (Thu, 08 Jul 2010)
New Revision: 33767

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
Log:
Fixed errors to scripts and properties. Replaced waitfor.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2010-07-08 09:44:22 UTC (rev 33766)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2010-07-08 09:50:56 UTC (rev 33767)
@@ -1,10 +1,10 @@
 #Thu Jul 01 13:05:21 BST 2010
-spec.install.dir=/jboss-5.1.0.Branch
+spec.install.dir=/specjms2007
 
 # the commands need placing in this properties file
-start.controller.command=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
-start.satellite.one=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
-start.satellite.two=nohup /specjms2007/ant -buildfile /specjms2007/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
+start.controller.command=nohup ${spec.install.dir}/ant -buildfile ${spec.install.dir}/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
+start.satellite.one=nohup ${spec.install.dir}/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
+start.satellite.two=nohup ${spec.install.dir}/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
 
 start.eap.command=nohup /jboss-5.1.0.Branch/bin/run.sh -c production -b hornetq &
 

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 09:44:22 UTC (rev 33766)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 09:50:56 UTC (rev 33767)
@@ -54,16 +54,16 @@
       <sshexec host="hornetq"
          username="root"
          password="${r_p}"
-         command="nohup /root/java/batch-execution-SPEC-jms2007/scripts/build-commands.xml > /tmp/hornetq-node.txt"/>
-
-      <waitfor checkeveryunit="second" maxwait="120"/>
+         command="/root/apache-ant-1.7.1/bin/ant -buildfile /root/java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml start"/>
+      <echo>Waiting some time to allow the server to startup.</echo>
+      <sleep seconds="180"/>
    </target>
 
    <target name="gather-configuration" depends="clean">
       <echo>Gathering configuration located on EAP server.</echo>
 
       <!--input message="Enter root password for hornetq server:" addproperty="r_p" /-->
-      <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/bin/run.conf" todir="${spec.install.dir}/config" failonerror="true" password="${r_p}">
+      <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/bin/run.conf" localTodir="${spec.install.dir}/config" failonerror="true" password="${r_p}">
 
       </scp>
 
@@ -80,7 +80,6 @@
                      password="${r_p}"
                      command="${start.controller.command}"/>
          <echo>start satellite1</echo>
-         <echo>start satellite2</echo>
          <sshexec host="jmsclient1"
             username="root"
             password="${r_p}"
@@ -98,8 +97,8 @@
    <target name="gather-logs">
       <message echo="Gathering log files" />
       <parallel failonany="false">
-         <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/jstat-hornetq-01.txt" todir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
-         <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/verbose-gc.txt" todir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
+         <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
+         <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/verbose-gc.txt" localTodir="${spec.install.dir}/config" failonerror="false" password="${r_p}"/>
       </parallel>
       
    </target>

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 09:44:22 UTC (rev 33766)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 09:50:56 UTC (rev 33767)
@@ -22,8 +22,8 @@
 		<ant antfile="build-api.xml" target="prepare-eap-server"/>
 		<ant antfile="build-api.xml" target="gather-configuration"/>
 		<ant antfile="build-api.xml" target="start-benchmark"/>
-	   <!--waitfor checkeveryunit="second" maxwait="55"/>
-	   <ant antfile="build-api.xml" target="gather-logs"/-->
+	   <sleep seconds="55"/>
+	   <ant antfile="build-api.xml" target="gather-logs"/>
 		
 	</target>