[jboss-cvs] JBoss Messaging SVN: r4317 - in trunk/examples/jms: src/org/jboss/jms/example and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 28 05:45:50 EDT 2008
Author: jmesnil
Date: 2008-05-28 05:45:50 -0400 (Wed, 28 May 2008)
New Revision: 4317
Modified:
trunk/examples/jms/build.xml
trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
Log:
JBMESSAGING-1343 - Some more tweaks to PerfExample:
- make the Queue and ConnectionFactory JNDI lookups configurable (resp. with queue.lookup and cf.lookup)
Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml 2008-05-28 09:17:52 UTC (rev 4316)
+++ trunk/examples/jms/build.xml 2008-05-28 09:45:50 UTC (rev 4317)
@@ -49,6 +49,8 @@
<property name="sess.trans" value="false"/>
<property name="sess.trans.size" value="100"/>
<property name="drain.queue" value="true"/>
+ <property name="queue.lookup" value="/queue/testPerfQueue"/>
+ <property name="cf.lookup" value="/ConnectionFactory"/>
<path id="compile.classpath">
<fileset dir="${lib.dir}">
@@ -112,15 +114,17 @@
***********************************************************************************
* available parameters (-Dmessage.count=1000)
*
-* parameter description default current
-* --------- ----------- ------- -------
-* message.count number of messages 200000 ${message.count}
-* message.warmup.count number of messages to warm up 10000 ${message.warmup.count}
-* delivery.mode PERSISTENT/NON_PERSISTENT PERSISTENT ${delivery.mode}
-* sample.period timing period in seconds 1 ${sample.period}
-* sess.trans Is session transacted true ${sess.trans}
-* sess.trans.size batch size to commit 100 ${sess.trans.size}
-* drain.queue drain the queue (listener only) true ${drain.queue}
+* parameter description default current
+* --------- ----------- ------- -------
+* message.count number of messages 200000 ${message.count}
+* message.warmup.count number of messages to warm up 10000 ${message.warmup.count}
+* delivery.mode PERSISTENT/NON_PERSISTENT PERSISTENT ${delivery.mode}
+* sample.period timing period in seconds 1 ${sample.period}
+* sess.trans Is session transacted true ${sess.trans}
+* sess.trans.size batch size to commit 100 ${sess.trans.size}
+* drain.queue drain the queue (listener only) true ${drain.queue}
+* queue.lookup Queue JNDI lookup /queue/testPerfQueue ${queue.lookup}
+* cf.lookup ConnectionFactory JNDI lookup /ConnectionFactory ${cf.lookup}
***********************************************************************************
</echo>
</target>
@@ -142,6 +146,8 @@
<arg value="${sess.trans}"/>
<arg value="${sess.trans.size}"/>
<arg value="${drain.queue}"/>
+ <arg value="${queue.lookup}"/>
+ <arg value="${cf.lookup}"/>
</java>
</target>
@@ -163,6 +169,8 @@
<arg value="${sess.trans}"/>
<arg value="${sess.trans.size}"/>
<arg value="false"/>
+ <arg value="${queue.lookup}"/>
+ <arg value="${cf.lookup}"/>
</java>
</target>
Modified: trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-28 09:17:52 UTC (rev 4316)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-28 09:45:50 UTC (rev 4317)
@@ -60,6 +60,8 @@
log.info("Transacted:" + transacted);
int transactionBatchSize = Integer.parseInt(args[6]);
boolean drainQueue = Boolean.parseBoolean(args[7]);
+ String queueLookup = args[8];
+ String connectionFactoryLookup = args[9];
PerfParams perfParams = new PerfParams();
perfParams.setNoOfMessagesToSend(noOfMessages);
@@ -69,6 +71,8 @@
perfParams.setSessionTransacted(transacted);
perfParams.setTransactionBatchSize(transactionBatchSize);
perfParams.setDrainQueue(drainQueue);
+ perfParams.setQueueLookup(queueLookup);
+ perfParams.setConnectionFactoryLookup(connectionFactoryLookup);
if (args[0].equalsIgnoreCase("-l"))
{
@@ -81,12 +85,12 @@
}
- private void init(boolean transacted)
+ private void init(boolean transacted, String queueLookup, String connectionFactoryLookup)
throws NamingException, JMSException
{
InitialContext initialContext = new InitialContext();
- queue = (Queue) initialContext.lookup("/queue/testPerfQueue");
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");
+ queue = (Queue) initialContext.lookup(queueLookup);
+ ConnectionFactory cf = (ConnectionFactory) initialContext.lookup(connectionFactoryLookup);
connection = cf.createConnection();
session = connection.createSession(transacted, transacted ? Session.SESSION_TRANSACTED : Session.DUPS_OK_ACKNOWLEDGE);
}
@@ -96,7 +100,7 @@
try
{
log.info("params = " + perfParams);
- init(perfParams.isSessionTransacted());
+ init(perfParams.isSessionTransacted(), perfParams.getQueueLookup(), perfParams.getConnectionFactoryLookup());
log.info("warming up by sending " + perfParams.getNoOfWarmupMessages() + " messages");
sendMessages(perfParams.getNoOfWarmupMessages(), perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted());
log.info("warmed up");
@@ -164,7 +168,7 @@
{
try
{
- init(perfParams.isSessionTransacted());
+ init(perfParams.isSessionTransacted(), perfParams.getQueueLookup(), perfParams.getConnectionFactoryLookup());
MessageConsumer messageConsumer = session.createConsumer(queue);
connection.start();
Modified: trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-28 09:17:52 UTC (rev 4316)
+++ trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-28 09:45:50 UTC (rev 4317)
@@ -36,6 +36,8 @@
boolean isSessionTransacted = false;
int transactionBatchSize = 5000;
private boolean drainQueue = true;
+ private String queueLookup = "/queue/testPerfQueue";
+ private String connectionFactoryLookup = "/ConnectionFactory";
public int getNoOfMessagesToSend()
{
@@ -107,12 +109,33 @@
{
this.drainQueue = drainQueue;
}
-
+
+ public String getQueueLookup()
+ {
+ return queueLookup;
+ }
+
+ public void setQueueLookup(String queueLookup)
+ {
+ this.queueLookup = queueLookup;
+ }
+
+ public String getConnectionFactoryLookup()
+ {
+ return connectionFactoryLookup;
+ }
+
+ public void setConnectionFactoryLookup(String connectionFactoryLookup)
+ {
+ this.connectionFactoryLookup = connectionFactoryLookup;
+ }
+
public String toString()
{
return "message to send = " + noOfMessagesToSend + ", samplePeriod = " + samplePeriod + "s" + ", DeliveryMode = " +
(deliveryMode == DeliveryMode.PERSISTENT?"PERSISTENT":"NON_PERSISTENT") + ", session transacted = " + isSessionTransacted +
- (isSessionTransacted?", transaction batch size = " + transactionBatchSize:"" + ", drain queue = " + drainQueue);
+ (isSessionTransacted?", transaction batch size = " + transactionBatchSize:"" ) + ", drain queue = " + drainQueue +
+ ", queue lookup = " + queueLookup + ", connection factory lookup = " + connectionFactoryLookup;
}
}
More information about the jboss-cvs-commits
mailing list