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

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

Author: whitingjr
Date: 2010-09-07 05:42:12 -0400 (Tue, 07 Sep 2010)
New Revision: 35042

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 to avoid loading the hornetq configuration.

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-09-07 09:27:24 UTC (rev 35041)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2010-09-07 09:42:12 UTC (rev 35042)
@@ -1,12 +1,11 @@
 #Thu Jul 01 13:05:21 BST 2010
 spec.install.dir=/specjms2007
-ant.home=/usr/share/apache-ant/v1.7.1
 
 # the commands need placing in this properties file
-start.controller.command=nohup /usr/share/ant/v1.7.1/bin/ant -buildfile ${spec.install.dir}/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
-start.satellite.one=nohup /usr/share/ant/v1.7.1/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
-start.satellite.two=nohup /usr/share/ant/v1.7.1/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
-start.satellite.three=nohup /usr/share/ant/v1.7.1/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient3.txt &
+start.controller.command=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startController -Dcontroller.host=jmsclient1 > /tmp/controller.txt &
+start.satellite.one=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient1.txt &
+start.satellite.two=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient2.txt &
+start.satellite.three=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient3.txt &
 
 start.eap.command=nohup ${env.EAP_HOME}/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-09-07 09:27:24 UTC (rev 35041)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-09-07 09:42:12 UTC (rev 35042)
@@ -180,8 +180,6 @@
    
    <target name="submission-preparation">
       <echo message="Preparing the submission files with values used during the benchmark run."/>
-      <loadfile property="hornetq.configuration.xml" srcfile="${spec.install.dir}/output/${org.spec.internal.runId}/config/hornetq-configuration.xml" />
-      <loadfile property="horizontal.properties.configuration" srcfile="${spec.install.dir}/output/${org.spec.internal.runId}/config/horizontal.properties"/>
       <loadproperties srcFile="${spec.install.dir}/output/${org.spec.internal.runId}/config/run.conf">
          <filterchain>
             <striplinecomments>
@@ -204,7 +202,6 @@
             </striplinecomments>
             <prefixlines prefix="AGENT_OPTIONS."/>
          </filterchain>
-
       </loadproperties>
       <!-- Use property expansion to fill in the gaps in the template submission document. -->
       <copy file="../submission/submission.xml" todir="${spec.install.dir}/submission">