[jboss-svn-commits] JBL Code SVN: r34482 - in labs/jbossesb/trunk/product/samples/quickstarts/load_generator: scripts and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 3 12:11:53 EDT 2010
Author: tfennelly
Date: 2010-08-03 12:11:52 -0400 (Tue, 03 Aug 2010)
New Revision: 34482
Added:
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.default
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.hornetq
Removed:
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt
Log:
https://jira.jboss.org/browse/JBESB-3422
Update the load_generator quickstart to work with hornetq
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml 2010-08-03 13:40:02 UTC (rev 34481)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml 2010-08-03 16:11:52 UTC (rev 34482)
@@ -12,7 +12,7 @@
<delete dir="load_generator_classes"/>
</target>
- <target name="compile-churn" depends="compile" description="compile groovy to bytecode">
+ <target name="compile-churn" depends="compile,jbm-load-xml,jbmq-load-xml,hornetq-load-xml" description="compile groovy to bytecode">
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="exec-classpath" />
<mkdir dir="load_generator_classes" />
<copy todir="load_generator_classes" overwrite="true">
@@ -24,9 +24,21 @@
<include name="log4j.xml" />
</fileset>
</copy>
+ <copy file="${basedir}/scripts/${load-xml}" tofile="load_generator_classes/load.xml" overwrite="true" />
+
<groovyc destdir="load_generator_classes" srcdir="${basedir}/scripts" includes="*.groovy" classpathref="exec-classpath" />
</target>
+ <target name="jbm-load-xml" if="messaging.present">
+ <property name="load-xml" value="load.xml.default" />
+ </target>
+ <target name="jbmq-load-xml" if="jbossmq.present">
+ <property name="load-xml" value="load.xml.default" />
+ </target>
+ <target name="hornetq-load-xml" if="hornetq.present">
+ <property name="load-xml" value="load.xml.hornetq" />
+ </target>
+
<target name="load-agent" depends="compile-churn" description="Test the load agent script/settings">
<java classname="JmsLoadAgent" >
<classpath refid="exec-classpath" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt 2010-08-03 13:40:02 UTC (rev 34481)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt 2010-08-03 16:11:52 UTC (rev 34482)
@@ -36,7 +36,7 @@
Key Files
===========================
-./scripts/load.xml
+./scripts/load.xml (.default/.hornetq)
This is where you specify the properties of the load script and reporter. Things like
the number of messages, throttling of load, services to report and more are listed here
so you don't have to edit the groovy scripts.
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml 2010-08-03 13:40:02 UTC (rev 34481)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml 2010-08-03 16:11:52 UTC (rev 34482)
@@ -1,34 +0,0 @@
-<load-script log-directory="/tmp/esb-load-logs">
- <load-generators batch-count="20">
- <load-generator
- payload="load_generator_classes/payload.xml"
- queue="queue/quickstart_load_generator_Request_gw"
- msg-count="200"
- batch-interval-seconds="1"
- />
- <load-generator
- payload="load_generator_classes/payload.xml"
- queue="queue/quickstart_load_generator_Request_gw"
- msg-count="200"
- batch-interval-seconds="1"
- />
- </load-generators>
- <reporters>
- <jms-reporters tps-interval-seconds="1" fastest-queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb" >
- <jms-reporter
- queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb" />
- <jms-reporter
- queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb2" />
- </jms-reporters>
- <service-reporters>
- <service-reporter
- service-category="LoadServiceCategory"
- service-name="DummyJMSLoad"
- esb-archive-name="Quickstart_load_generator.esb" />
- <service-reporter
- service-category="LoadServiceCategory"
- service-name="DummyJMSLoad2"
- esb-archive-name="Quickstart_load_generator.esb" />
- </service-reporters>
- </reporters>
-</load-script>
Copied: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.default (from rev 34481, labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.default (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.default 2010-08-03 16:11:52 UTC (rev 34482)
@@ -0,0 +1,34 @@
+<load-script log-directory="/tmp/esb-load-logs">
+ <load-generators batch-count="20">
+ <load-generator
+ payload="load_generator_classes/payload.xml"
+ queue="queue/quickstart_load_generator_Request_gw"
+ msg-count="200"
+ batch-interval-seconds="1"
+ />
+ <load-generator
+ payload="load_generator_classes/payload.xml"
+ queue="queue/quickstart_load_generator_Request_gw"
+ msg-count="200"
+ batch-interval-seconds="1"
+ />
+ </load-generators>
+ <reporters>
+ <jms-reporters tps-interval-seconds="1" fastest-queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb" >
+ <jms-reporter
+ queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb" />
+ <jms-reporter
+ queue-mbean-name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_load_generator_Request_esb2" />
+ </jms-reporters>
+ <service-reporters>
+ <service-reporter
+ service-category="LoadServiceCategory"
+ service-name="DummyJMSLoad"
+ esb-archive-name="Quickstart_load_generator.esb" />
+ <service-reporter
+ service-category="LoadServiceCategory"
+ service-name="DummyJMSLoad2"
+ esb-archive-name="Quickstart_load_generator.esb" />
+ </service-reporters>
+ </reporters>
+</load-script>
Added: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.hornetq
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.hornetq (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/load.xml.hornetq 2010-08-03 16:11:52 UTC (rev 34482)
@@ -0,0 +1,34 @@
+<load-script log-directory="/tmp/esb-load-logs">
+ <load-generators batch-count="20">
+ <load-generator
+ payload="load_generator_classes/payload.xml"
+ queue="queue/quickstart_load_generator_Request_gw"
+ msg-count="200"
+ batch-interval-seconds="1"
+ />
+ <load-generator
+ payload="load_generator_classes/payload.xml"
+ queue="queue/quickstart_load_generator_Request_gw"
+ msg-count="200"
+ batch-interval-seconds="1"
+ />
+ </load-generators>
+ <reporters>
+ <jms-reporters tps-interval-seconds="1" fastest-queue-mbean-name='org.hornetq:module=JMS,type=Queue,name="quickstart_load_generator_Request_esb"' >
+ <jms-reporter
+ queue-mbean-name='org.hornetq:module=JMS,type=Queue,name="quickstart_load_generator_Request_esb"' />
+ <jms-reporter
+ queue-mbean-name='org.hornetq:module=JMS,type=Queue,name="quickstart_load_generator_Request_esb2"' />
+ </jms-reporters>
+ <service-reporters>
+ <service-reporter
+ service-category="LoadServiceCategory"
+ service-name="DummyJMSLoad"
+ esb-archive-name="Quickstart_load_generator.esb" />
+ <service-reporter
+ service-category="LoadServiceCategory"
+ service-name="DummyJMSLoad2"
+ esb-archive-name="Quickstart_load_generator.esb" />
+ </service-reporters>
+ </reporters>
+</load-script>
More information about the jboss-svn-commits
mailing list