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

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

Author: whitingjr
Date: 2011-02-15 06:05:26 -0500 (Tue, 15 Feb 2011)
New Revision: 36601

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:
Added configuration for additional client in the SUT.
4 clients are now supported.

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	2011-02-14 14:32:30 UTC (rev 36600)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.properties	2011-02-15 11:05:26 UTC (rev 36601)
@@ -6,6 +6,7 @@
 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.satellite.four=nohup ${env.ANT_HOME}/bin/ant -buildfile ${spec.install.dir}/build.xml startSatellite -Dcontroller.host=jmsclient1 > /tmp/satellite-jmsclient4.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	2011-02-14 14:32:30 UTC (rev 36600)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2011-02-15 11:05:26 UTC (rev 36601)
@@ -34,14 +34,7 @@
    <property name="framework.file" location="${framework.properties.dir}/specjms.seq" />
    <property file="${framework.file}" />
    <property file="../src/main/resources/environments/${env.BENCHMARK_SYSTEM}/environment.properties" />
-   <!--property file="${spec.install.dir}/config/run.properties" />
    
-   <path id="spec.classpath">
-      <fileset dir="${spec.install.dir}/lib">
-         <include name="*.jar" />
-      </fileset>
-   </path-->
-   
    <target name="clean">
       <echo>Removing prior run collected data.</echo>
       <delete failonerror="false" file="${spec.install.dir}/config/run.conf"/>
@@ -60,7 +53,6 @@
          command="${env.ANT_HOME}/bin/ant -buildfile 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>
          <waitfor maxwait="${server.startup.sleep.inMinutes}" maxwaitunit="minute" checkevery="${server.startup.check.inMilliseconds}">
            <http url="${waitfor.eap.url}"/>
@@ -142,6 +134,11 @@
             username="${benchmark.client.03.username}"
             password="${benchmark.client.03.password}"
             command="${start.satellite.three}"/>
+        <echo>start satellite4</echo>
+        <sshexec host="${benchmark.client.04.host}"
+           username="${benchmark.client.04.username}"
+           password="${benchmark.client.04.password}"
+           command="${start.satellite.four}"/>
             
       </parallel>
       <sleep seconds="${wait.benchmark.startup.period.inSeconds}"/>
@@ -523,10 +520,6 @@
       
    </target>
    
-   <target name="purge-jvm">
-   
-   </target>
-   
    <target name="generate-jms-configuration">
       <java dir="${spec.install.dir}" classpathref="spec.classpath" fork="true" classname="org.spec.jms.setup.Main" output="${jms.raw.file}">
          <arg value="-hp=${spec.install.dir}/config/agent.properties" />
@@ -568,9 +561,27 @@
       <if>
          <equals arg1="${org.spec.jms.files.vendor}" arg2="hornetq.properties"/>
          <then>
-            <xslt in="../build.xml" style="../src/main/resources/xsl/jms-config-jbm.xsl" out="${spec.install.dir}/config/">
-               <param name="jms-configuration-raw" expression="${jms.configuration.raw}"/>
-            </xslt>
+         	<xslt in="../build.xml" style="../src/main/resources/xsl/jms-config-hornetq.xsl" out="${spec.install.dir}/config/hornetq-jms.xml">
+			  <param name="HQ_SMStatsQ" expression="${HQ_SMStatsQ}"/>
+			  <param name="HQ_OrderDCStatsQ" expression="${HQ_OrderDCStatsQ}"/>
+			  <param name="HQ_ShipDCStatsQ" expression="${HQ_ShipDCStatsQ}"/>
+			  <param name="HQ_InvoiceQ" expression="${HQ_InvoiceQ}"/>
+			  <param name="HQ_CreditCardHLT" expression="${HQ_CreditCardHLT}"/>
+			  <param name="HQ_ProductAnnouncementT" expression="${HQ_ProductAnnouncementT}"/>
+			  <param name="HQ_PriceUpdateT" expression="${HQ_PriceUpdateT}"/>
+			  <param name="HQ_ProductFamilyT" expression="${HQ_ProductFamilyT}"/>
+			  <param name="SP_PShipConfQ" expression="${SP_PShipConfQ}"/>
+			  <param name="SP_POrderQ" expression="${SP_POrderQ}"/>
+			  <param name="SM_OrderConfQ" expression="${SM_OrderConfQ}"/>
+			  <param name="SM_ShipArrQ" expression="${SM_ShipArrQ}"/>
+			  <param name="SM_InvMovementQ" expression="${SM_InvMovementQ}"/>
+			  <param name="DC_OrderQ" expression="${DC_OrderQ}"/>
+			  <param name="DC_ShipDepQ" expression="${DC_ShipDepQ}"/>
+			  <param name="DC_PShipArrQ" expression="${DC_PShipArrQ}"/>
+			  <param name="DC_ShipConfQ" expression="${DC_ShipConfQ}"/>
+			  <param name="DC_POrderConfQ" expression="${DC_IncomingOffersQ}"/>
+			  <param name="DC_IncomingOffersQ" expression="${DC_IncomingOffersQ}"/>
+           </xslt>
          </then>
          <elseif>
             <equals arg1="${org.spec.jms.files.vendor}" arg2="jbm.properties"/>