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

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

Author: whitingjr
Date: 2010-08-20 06:19:12 -0400 (Fri, 20 Aug 2010)
New Revision: 34807

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Added change to wait for server to start.

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-20 10:14:25 UTC (rev 34806)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-08-20 10:19:12 UTC (rev 34807)
@@ -49,12 +49,12 @@
          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 ${server.startup.sleep.inMinutes} minutes to allow the server to startup.</echo>
-      <sleep minutes="${server.startup.sleep.inMinutes}"/>
-      <!--parallel>
+      <!--sleep minutes="${server.startup.sleep.inMinutes}"/-->
+      <parallel>
          <waitfor maxwait="${server.startup.sleep.inMinutes}" maxwaitunit="minute" checkevery="${server.startup.check.inMilliseconds}">
            <http url="${waitfor.eap.url}"/>
          </waitfor>
-      </parallel-->
+      </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}"/>
@@ -450,7 +450,17 @@
 
    <target name="prepare-execution-report">
       <echo>Preparing benchmark run results.</echo>
-      <xslt style="src/main/resources/xsl/result.xsl" in="build.xml" out="${temporary.directory}/execution-result-report.xml"/>
+      <xslt style="src/main/resources/xsl/result.xsl" in="build.xml" out="${temporary.directory}/execution-result-report.xml">
+         <param name="controller-id" value="null"/>
+         <param name="worker-id" value=""/>
+         <param name="type" value=""/>
+         <param name="start-datetime" value=""/>
+         <param name="start-jdatetime" value=""/>
+         <param name="completion-datetime" value=""/>
+         <param name="completion-jdatetime" value=""/>
+         <param name="duration" value=""/>
+         <param name="application-name" value="SPECjms2007"/>
+      </xslt>
       <xslt style="src/main/resources/xsl/data.xsl" in="build.xml" out="${temporary.directory}/execution-result-data.xml"/>
       
       <property file="${framework.file}" prefix="AFTER_EXECUTION"/>