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

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

Author: whitingjr
Date: 2010-07-08 06:57:50 -0400 (Thu, 08 Jul 2010)
New Revision: 33770

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-commands.xml
Log:
Removed comments.
Corrected the sleep argument.

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:57:45 UTC (rev 33769)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 10:57:50 UTC (rev 33770)
@@ -30,30 +30,9 @@
    
    <target name="prepare-eap-server">
       <echo>Preparing EAP server.</echo>
-      <!--sshexec host="hornetq"
-         username="root"
-         password="${r_p}"
-         command="/jboss-5.1.0.Branch/bin/shutdown.sh - -server=hornetq:1100"/>
-      <waitfor checkeveryunit="second" maxwait="20"/>
       <sshexec host="hornetq"
          username="root"
          password="${r_p}"
-         command="rm  -f /perf1/journal/*.hq"/>
-      <sshexec host="hornetq"
-         username="root"
-         password="${r_p}"
-         command="${start.eap.command}"/>
-      <sshexec host="hornetq"
-         username="root"
-         password="${r_p}"
-         command="jps"
-         outputproperty="jps.output"/>
-      <condition property="eap.isRunning">
-         <contains text="Main"/>
-      </condition-->
-      <sshexec host="hornetq"
-         username="root"
-         password="${r_p}"
          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"/>
@@ -62,19 +41,14 @@
    <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" localTodir="${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>
-
    </target>
 
    <target name="start-benchmark">
-      <!--input message="Enter root password for jmsclientn server:" addproperty="r_p" /-->
       <parallel failonany="true">
          <echo>starting Controller</echo>
 
-         <!--ant antfile="${spec.install.dir}/build.xml" target="startController"/-->
          <sshexec host="jmsclient1"
                      username="root"
                      password="${r_p}"
@@ -104,7 +78,7 @@
    </target>
    
    <target name="process-gc-stats">
-      <message echo="Post processing gc stats" />
+      <message echo="Processing gc stats" />
       <sshexec host="jmsclient1"
          username="root"
          password="${r_p}"
@@ -113,7 +87,6 @@
 
    <target name="generate-submission">
       <message echo="Generating submission" />
-      
    </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:57:45 UTC (rev 33769)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 10:57:50 UTC (rev 33770)
@@ -22,9 +22,10 @@
 		<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"/>
-	   <sleep seconds="55"/>
+	   <sleep minutes="55"/>
 	   <ant antfile="build-api.xml" target="gather-logs"/>
-		
+	   <ant antfile="build-api.xml" target="process-gc-stats"/>
+	   <ant antfile="build-api.xml" target=""/>
 	</target>
 	
 	<target name="usage">