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

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

Author: whitingjr
Date: 2010-08-19 12:50:41 -0400 (Thu, 19 Aug 2010)
New Revision: 34798

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Reverted wait to allow the 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-19 16:11:03 UTC (rev 34797)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-08-19 16:50:41 UTC (rev 34798)
@@ -37,6 +37,8 @@
       <delete failonerror="false" file="${spec.install.dir}/config/jstat-hornetq.txt"/>
       <delete failonerror="false" file="${spec.install.dir}/config/verbose-gc.txt"/>
       <delete failonerror="false" file="${spec.install.dir}/config/verbose-gc-stats.txt"/>
+      <delete failonerror="false" file="${spec.install.dir}/execution-result-data.xml"/>
+         <delete failonerror="false" file="${spec.install.dir}/execution-result-data.xml"/>
    </target>
    
    <target name="prepare-eap-server">
@@ -46,12 +48,13 @@
          password="${eap.server.password}"
          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>
-      <parallel>
+      <echo>Waiting ${server.startup.sleep.inMinutes} minutes to allow the server to startup.</echo>
+      <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}"/>
@@ -444,29 +447,30 @@
          <param name="wait.period.inMilliSeconds" value="${completion.wait.period.inMilliSeconds}"/>
       </antcall>
    </target>
-<!--   
+
    <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/data.xsl" in="build.xml" out="${temporary.directory}/execution-result-data.xml"/>
       
       <property file="${framework.file}" prefix="AFTER_EXECUTION"/>
       <if>
          <equals arg1="${org.spec.internal.runId}" arg2="${AFTER_EXECUTION.org.spec.internal.runId}"/>
-         <then>
-            
+         <then> 
+            <echo message="Something went wrong."/>
          </then>
          <else>
+            <copy file="${temporary.directory}/execution-result-report.xml" todir="${spec.install.dir}/output/${org.spec.internal.runId}"/>
+            <copy file="${temporary.directory}/execution-result-data.xml" todir="${spec.install.dir}/output/${org.spec.internal.runId}"/>
          </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>
+      <echo>Sending the result files.</echo>
       
    </target>
-   -->
+
    <target name="usage">
       <echo>usage: Do not call this directly, instead use build-commands</echo>
    </target>