[jboss-cvs] JBoss Messaging SVN: r4323 - in trunk/examples/jms: src/org/jboss/jms/example and 1 other directory.

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

Author: jmesnil
Date: 2008-05-28 11:06:48 -0400 (Wed, 28 May 2008)
New Revision: 4323

Modified:
   trunk/examples/jms/build.xml
   trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
Log:
- in build.xml, reformatted display of formatters
- reordered attributes to put together session-related attributes

Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml	2008-05-28 14:51:10 UTC (rev 4322)
+++ trunk/examples/jms/build.xml	2008-05-28 15:06:48 UTC (rev 4323)
@@ -113,22 +113,22 @@
 
    <target name="echo-params">
       <echo>
-         ***********************************************************************************
-         * 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.ackmode Ack mode DUPS_OK/AUTO_ACK DUPS_OK ${sess.ackmode}
-         * 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}
-         ***********************************************************************************
+***********************************************************************************
+* 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}
+* sess.ackmode          Ack mode DUPS_OK/AUTO_ACK        DUPS_OK               ${sess.ackmode}
+* 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>
 
@@ -148,10 +148,10 @@
          <arg value="${sample.period}"/>
          <arg value="${sess.trans}"/>
          <arg value="${sess.trans.size}"/>
+         <arg value="${sess.ackmode}"/>
          <arg value="${drain.queue}"/>
          <arg value="${queue.lookup}"/>
          <arg value="${cf.lookup}"/>
-         <arg value="${sess.ackmode}"/>
       </java>
    </target>
 
@@ -171,10 +171,10 @@
          <arg value="${sample.period}"/>
          <arg value="${sess.trans}"/>
          <arg value="${sess.trans.size}"/>
+         <arg value="${sess.ackmode}"/>
          <arg value="false"/>
          <arg value="${queue.lookup}"/>
          <arg value="${cf.lookup}"/>
-         <arg value="${sess.ackmode}"/>
       </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 14:51:10 UTC (rev 4322)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java	2008-05-28 15:06:48 UTC (rev 4323)
@@ -61,10 +61,11 @@
       boolean transacted = Boolean.parseBoolean(args[5]);
       log.info("Transacted:" + transacted);
       int transactionBatchSize = Integer.parseInt(args[6]);
-      boolean drainQueue = Boolean.parseBoolean(args[7]);
-      String queueLookup = args[8];
-      String connectionFactoryLookup = args[9];
-      boolean dupsok = "DUPS_OK".equalsIgnoreCase(args[10]);
+      boolean dupsok = "DUPS_OK".equalsIgnoreCase(args[7]);
+      boolean drainQueue = Boolean.parseBoolean(args[8]);
+      String queueLookup = args[9];
+      String connectionFactoryLookup = args[10];
+
       PerfParams perfParams = new PerfParams();
       perfParams.setNoOfMessagesToSend(noOfMessages);
       perfParams.setNoOfWarmupMessages(noOfWarmupMessages);
@@ -72,10 +73,10 @@
       perfParams.setSamplePeriod(samplePeriod);
       perfParams.setSessionTransacted(transacted);
       perfParams.setTransactionBatchSize(transactionBatchSize);
+      perfParams.setDupsOk(dupsok);
       perfParams.setDrainQueue(drainQueue);
       perfParams.setQueueLookup(queueLookup);
       perfParams.setConnectionFactoryLookup(connectionFactoryLookup);
-      perfParams.setDupsOk(dupsok);
 
       if (args[0].equalsIgnoreCase("-l"))
       {