[jboss-svn-commits] JBL Code SVN: r16241 - 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
Wed Oct 31 23:03:07 EDT 2007
Author: tcunning
Date: 2007-10-31 23:03:06 -0400 (Wed, 31 Oct 2007)
New Revision: 16241
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt
labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/LoadUtil.groovy
Log:
bug:JBESB-1221
Removed reference to GROOVY_HOME (no longer needed), added code to
deal with the fact that org.jboss.jms.server.destination.QueueService has
no "QueueDepth" but has a "MessageCount", changed load-run target
to runtest to match the standard in other quickstarts, added some additional
classpaths that were necessary for compilation/run, added mep="OneWay" to
actions tag.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml 2007-11-01 01:30:46 UTC (rev 16240)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/build.xml 2007-11-01 03:03:06 UTC (rev 16241)
@@ -1,16 +1,22 @@
-<project name="Quickstart_load_generator" default="run" basedir=".">
+<project name="Quickstart_load_generator" default="runtest" basedir=".">
<description>
${ant.project.name}
${line.separator}
</description>
+ <property environment="env"/>
+
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml" />
- <property file="../conf/quickstarts.properties" />
+ <property file="${product.dir}/install/deployment.properties" />
<path id="groovy.classpath">
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="groovy*.jar" />
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
+ <include name="jboss-aop-jdk50**/*.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.jar" />
<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
@@ -45,7 +51,7 @@
</java>
</target>
- <target name="load-run" depends="compile-churn,load-agent,load-report" description="Run the agent in background thread and report script in console">
+ <target name="runtest" depends="compile-churn,load-agent,load-report" description="Run the agent in background thread and report script in console">
</target>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml 2007-11-01 01:30:46 UTC (rev 16240)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml 2007-11-01 03:03:06 UTC (rev 16241)
@@ -34,7 +34,7 @@
<jms-listener name="load_generator"
busidref="quickstartEsbChannel" maxThreads="1" />
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="action1"
class="org.jboss.soa.esb.samples.quickstart.load_generator.JMSLoadAction"
process="doNothing" />
@@ -51,7 +51,7 @@
<jms-listener name="load_generator"
busidref="quickstartEsbChannel2" maxThreads="1" />
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="action1"
class="org.jboss.soa.esb.samples.quickstart.load_generator.JMSLoadAction"
process="displayMessage" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt 2007-11-01 01:30:46 UTC (rev 16240)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/readme.txt 2007-11-01 03:03:06 UTC (rev 16241)
@@ -30,18 +30,14 @@
Load Test Targets
===========================
-load-run - Runs the load agent to simulate load and the load reporter to report on load
+runtest - Runs the load agent to simulate load and the load reporter to report on load
load-agent - Simulates load only
load-report - Report on load only
-NOTE: "load-run" will run the agent in a daemon thread, then start the reporter. This is
+NOTE: "runtest" will run the agent in a daemon thread, then start the reporter. This is
a good target for running tests, but if there's a problem with JMSLoadAgent.groovy, you will
not see it. Use the "load-agent" target to troubleshoot the agent script/properties.
-Also, the build.xml script assumes that you have installed Groovy and specified a $GROOVY_HOME
-environment variable. If you don't have Groovy installed, you can get it from:
-http://groovy.codehaus.org/Download. Installing Groovy is very similar to Ant.
-
Key Files
===========================
./scripts/load.xml
Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/LoadUtil.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/LoadUtil.groovy 2007-11-01 01:30:46 UTC (rev 16240)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/scripts/LoadUtil.groovy 2007-11-01 03:03:06 UTC (rev 16241)
@@ -53,9 +53,19 @@
public double getQueueDepthFactor(queue)
{
def queueDepthCount = {
- server.getAttribute(new ObjectName("$queue"), "QueueDepth").toLong()
+ def temp = 0
+ try {
+ temp = server.getAttribute(new ObjectName("$queue"), "QueueDepth").toLong()
+ } catch (javax.management.AttributeNotFoundException e) {
+ temp = server.getAttribute(new ObjectName("$queue"), "MessageCount").toInteger()
+ }
+ if (temp == null) {
+ return 0
+ } else {
+ return temp
+ }
}
-
+
def depthBefore = queueDepthCount()
sleep(1000)
def depthAfter = queueDepthCount()
@@ -67,4 +77,4 @@
-
\ No newline at end of file
+
More information about the jboss-svn-commits
mailing list