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

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

Author: whitingjr
Date: 2010-08-19 12:09:56 -0400 (Thu, 19 Aug 2010)
New Revision: 34796

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
Log:
Changed the technique to wait for server to startup.

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-08-19 15:34:00 UTC (rev 34795)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2010-08-19 16:09:56 UTC (rev 34796)
@@ -9,7 +9,8 @@
 
 start.eap.command=nohup /jboss-5.1.0.Branch/bin/run.sh -c production -b hornetq &
 
-sever.startup.sleep.inMinutes=3
+server.startup.sleep.inMinutes=3
+server.startup.check.inMilliseconds=500
 
 jps.output.file=/tmp/jpsProgram.pid
 
@@ -22,4 +23,6 @@
 
 completion.wait.period.inMilliSeconds=60000
 
-wait.benchmark.startup.period.inSeconds=25
\ No newline at end of file
+wait.benchmark.startup.period.inSeconds=25
+
+waitfor.eap.url=http://hornetq:8080/index.html
\ No newline at end of file

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-08-19 15:34:00 UTC (rev 34795)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-08-19 16:09:56 UTC (rev 34796)
@@ -47,7 +47,11 @@
          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 ${sever.startup.sleep.inMinutes} minutes to allow the server to startup.</echo>
-      <sleep minutes="${sever.startup.sleep.inMinutes}"/>
+      <parallel>
+         <waitfor maxwait="${server.startup.sleep.inMinutes}" maxwaitunit="minute" checkevery="${server.startup.check.inMilliseconds}">
+           <http url="${waitfor.eap.url}"/>
+         </waitfor>
+      </parallel>
       
       <delete file="${jps.output.file}" failonerror="false"/>
       <scp remotefile="${eap.server.username}@${eap.server.host}:${jps.output.file}" localTodir="${jps.output.file}" failonerror="false" password="${eap.server.password}"/>
@@ -440,7 +444,29 @@
          <param name="wait.period.inMilliSeconds" value="${completion.wait.period.inMilliSeconds}"/>
       </antcall>
    </target>
+<!--   
+   <target name="prepare-execution-report">
+      <echo>Preparing benchmark run results.</echo>
+      
+      <property file="${framework.file}" prefix="AFTER_EXECUTION"/>
+      <if>
+         <equals arg1="${org.spec.internal.runId}" arg2="${AFTER_EXECUTION.org.spec.internal.runId}"/>
+         <then>
+            
+         </then>
+         <else>
+         </else>
+      </if>
+         
+      <xslt style="src/main/resources/xsl/result.xsl" in="build.xml" out="${spec.install.dir}/output/${org.spec.internal.runId}/execution-result-data.xml">
+      </xslt>
+   </target>
    
+   <target name="send-execution-report">
+      <echo></echo>
+      
+   </target>
+   -->
    <target name="usage">
       <echo>usage: Do not call this directly, instead use build-commands</echo>
    </target>