qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r561365 [8/10] - in /incubator/qpid/trunk/qpid: ./ cpp/ dotnet/ dotnet/Qpid.Buffer.Tests/ dotnet/Qpid.Buffer.Tests/Properties/ dotnet/Qpid.Buffer/ dotnet/Qpid.Buffer/Properties/ dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/BrokerDetai...
Date Tue, 31 Jul 2007 15:54:49 GMT
Modified: incubator/qpid/trunk/qpid/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/perftests/pom.xml Tue Jul 31 08:53:37 2007
@@ -87,6 +87,12 @@
             <artifactId>junit</artifactId>
         </dependency>
 
+        <dependency>  
+            <groupId>org.slf4j</groupId> 
+            <artifactId>slf4j-log4j12</artifactId>  
+            <version>1.4.0</version>  
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -186,124 +192,124 @@
                         -->
 
                         <!-- Transient, P2P Tests -->
-                        <TQR-Qpid-01>-n TQR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TQR-Qpid-01>
-                        <TQR-Qpid-02>-n TQR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TQR-Qpid-02>
-                        <TQR-Qpid-03>-n TQR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=100000 messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TQR-Qpid-03>
-                        <TQR-Qpid-04>-n TQR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=100000 messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TQR-Qpid-04>
-
-                        <TQC-Qpid-01>-n TQC-Qpid-01           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=1000  maxPending=1000000 </TQC-Qpid-01>
-                        <TQC-Qpid-02>-n TQC-Qpid-02           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=1000  maxPending=1000000 </TQC-Qpid-02>
-                        <TQC-Qpid-03>-n TQC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </TQC-Qpid-03>
-                        <TQC-Qpid-04>-n TQC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </TQC-Qpid-04>
-                        <TQC-Qpid-05>-n TQC-Qpid-05         -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </TQC-Qpid-05>
-                        <TQC-Qpid-06>-n TQC-Qpid-06         -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </TQC-Qpid-06>
-
-                        <TQM-Qpid-01-512b>-n TQM-Qpid-01-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-512b>
-                        <TQM-Qpid-02-512b>-n TQM-Qpid-02-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-512b>
-                        <TQM-Qpid-01-1K>-n TQM-Qpid-01-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-1K>
-                        <TQM-Qpid-02-1K>-n TQM-Qpid-02-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-1K>
-                        <TQM-Qpid-01-5K>-n TQM-Qpid-01-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-5K>
-                        <TQM-Qpid-02-5K>-n TQM-Qpid-02-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-5K>
-                        <TQM-Qpid-01-10K>-n TQM-Qpid-01-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-10K>
-                        <TQM-Qpid-02-10K>-n TQM-Qpid-02-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-10K>
-                        <TQM-Qpid-01-50K>-n TQM-Qpid-01-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-50K>
-                        <TQM-Qpid-02-50K>-n TQM-Qpid-02-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-50K>
-                        <TQM-Qpid-01-100K>-n TQM-Qpid-01-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-100K>
-                        <TQM-Qpid-02-100K>-n TQM-Qpid-02-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-100K>
-                        <TQM-Qpid-01-500K>-n TQM-Qpid-01-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-500K>
-                        <TQM-Qpid-02-500K>-n TQM-Qpid-02-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-500K>
-                        <TQM-Qpid-01-1M>-n TQM-Qpid-01-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-1M>
-                        <TQM-Qpid-02-1M>-n TQM-Qpid-02-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-1M>
+                        <TQR-Qpid-01>-n TQR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TQR-Qpid-01>
+                        <TQR-Qpid-02>-n TQR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TQR-Qpid-02>
+                        <TQR-Qpid-03>-n TQR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TQR-Qpid-03>
+                        <TQR-Qpid-04>-n TQR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TQR-Qpid-04>
+
+                        <TQC-Qpid-01>-n TQC-Qpid-01           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=1000000 </TQC-Qpid-01>
+                        <TQC-Qpid-02>-n TQC-Qpid-02           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=1000000 </TQC-Qpid-02>
+                        <TQC-Qpid-03>-n TQC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </TQC-Qpid-03>
+                        <TQC-Qpid-04>-n TQC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </TQC-Qpid-04>
+                        <TQC-Qpid-05>-n TQC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-05>
+                        <TQC-Qpid-06>-n TQC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-06>
+
+                        <TQM-Qpid-01-512b>-n TQM-Qpid-01-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-512b>
+                        <TQM-Qpid-02-512b>-n TQM-Qpid-02-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-512b>
+                        <TQM-Qpid-01-1K>-n TQM-Qpid-01-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-1K>
+                        <TQM-Qpid-02-1K>-n TQM-Qpid-02-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-1K>
+                        <TQM-Qpid-01-5K>-n TQM-Qpid-01-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-5K>
+                        <TQM-Qpid-02-5K>-n TQM-Qpid-02-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-5K>
+                        <TQM-Qpid-01-10K>-n TQM-Qpid-01-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-10K>
+                        <TQM-Qpid-02-10K>-n TQM-Qpid-02-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-10K>
+                        <TQM-Qpid-01-50K>-n TQM-Qpid-01-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-50K>
+                        <TQM-Qpid-02-50K>-n TQM-Qpid-02-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-50K>
+                        <TQM-Qpid-01-100K>-n TQM-Qpid-01-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-100K>
+                        <TQM-Qpid-02-100K>-n TQM-Qpid-02-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-100K>
+                        <TQM-Qpid-01-500K>-n TQM-Qpid-01-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-500K>
+                        <TQM-Qpid-02-500K>-n TQM-Qpid-02-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-500K>
+                        <TQM-Qpid-01-1M>-n TQM-Qpid-01-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-01-1M>
+                        <TQM-Qpid-02-1M>-n TQM-Qpid-02-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</TQM-Qpid-02-1M>
 
                         <!-- Transient, Pub/Sub Tests -->
-                        <TTR-Qpid-01>-n TTR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TTR-Qpid-01>
-                        <TTR-Qpid-02>-n TTR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TTR-Qpid-02>
-                        <TTR-Qpid-03>-n TTR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=10000  messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TTR-Qpid-03>
-                        <TTR-Qpid-04>-n TTR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=10000  messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </TTR-Qpid-04>
-
-                        <TTC-Qpid-01>-n TTC-Qpid-01           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=1000  maxPending=1000000 </TTC-Qpid-01>
-                        <TTC-Qpid-02>-n TTC-Qpid-02           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=1000  maxPending=1000000 </TTC-Qpid-02>
-                        <TTC-Qpid-03>-n TTC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </TTC-Qpid-03>
-                        <TTC-Qpid-04>-n TTC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </TTC-Qpid-04>
-                        <TTC-Qpid-05>-n TTC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </TTC-Qpid-05>
-                        <TTC-Qpid-06>-n TTC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </TTC-Qpid-06>
-
-                        <TTM-Qpid-01-512b>-n TTM-Qpid-01-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-512b>
-                        <TTM-Qpid-02-512b>-n TTM-Qpid-02-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-512b>
-                        <TTM-Qpid-01-1K>-n TTM-Qpid-01-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-1K>
-                        <TTM-Qpid-02-1K>-n TTM-Qpid-02-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1K>
-                        <TTM-Qpid-01-5K>-n TTM-Qpid-01-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-5K>
-                        <TTM-Qpid-02-5K>-n TTM-Qpid-02-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-5K>
-                        <TTM-Qpid-01-10K>-n TTM-Qpid-01-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-10K>
-                        <TTM-Qpid-02-10K>-n TTM-Qpid-02-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-10K>
-                        <TTM-Qpid-01-50K>-n TTM-Qpid-01-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-50K>
-                        <TTM-Qpid-02-50K>-n TTM-Qpid-02-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-50K>
-                        <TTM-Qpid-01-100K>-n TTM-Qpid-01-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-100K>
-                        <TTM-Qpid-02-100K>-n TTM-Qpid-02-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-100K>
-                        <TTM-Qpid-01-500K>-n TTM-Qpid-01-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-500K>
-                        <TTM-Qpid-02-500K>-n TTM-Qpid-02-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-500K>
-                        <TTM-Qpid-01-1M>-n TTM-Qpid-01-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-1M>
-                        <TTM-Qpid-02-1M>-n TTM-Qpid-02-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationsCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1M>
+                        <TTR-Qpid-01>-n TTR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TTR-Qpid-01>
+                        <TTR-Qpid-02>-n TTR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TTR-Qpid-02>
+                        <TTR-Qpid-03>-n TTR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=10000  messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TTR-Qpid-03>
+                        <TTR-Qpid-04>-n TTR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=10000  messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </TTR-Qpid-04>
+
+                        <TTC-Qpid-01>-n TTC-Qpid-01           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=1000000 </TTC-Qpid-01>
+                        <TTC-Qpid-02>-n TTC-Qpid-02           -d1M  -s[1000]   -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=1000000 </TTC-Qpid-02>
+                        <TTC-Qpid-03>-n TTC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </TTC-Qpid-03>
+                        <TTC-Qpid-04>-n TTC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </TTC-Qpid-04>
+                        <TTC-Qpid-05>-n TTC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-05>
+                        <TTC-Qpid-06>-n TTC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-06>
+
+                        <TTM-Qpid-01-512b>-n TTM-Qpid-01-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-512b>
+                        <TTM-Qpid-02-512b>-n TTM-Qpid-02-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-512b>
+                        <TTM-Qpid-01-1K>-n TTM-Qpid-01-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-1K>
+                        <TTM-Qpid-02-1K>-n TTM-Qpid-02-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1K>
+                        <TTM-Qpid-01-5K>-n TTM-Qpid-01-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-5K>
+                        <TTM-Qpid-02-5K>-n TTM-Qpid-02-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-5K>
+                        <TTM-Qpid-01-10K>-n TTM-Qpid-01-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-10K>
+                        <TTM-Qpid-02-10K>-n TTM-Qpid-02-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-10K>
+                        <TTM-Qpid-01-50K>-n TTM-Qpid-01-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-50K>
+                        <TTM-Qpid-02-50K>-n TTM-Qpid-02-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-50K>
+                        <TTM-Qpid-01-100K>-n TTM-Qpid-01-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-100K>
+                        <TTM-Qpid-02-100K>-n TTM-Qpid-02-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-100K>
+                        <TTM-Qpid-01-500K>-n TTM-Qpid-01-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-500K>
+                        <TTM-Qpid-02-500K>-n TTM-Qpid-02-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-500K>
+                        <TTM-Qpid-01-1M>-n TTM-Qpid-01-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-1M>
+                        <TTM-Qpid-02-1M>-n TTM-Qpid-02-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=false pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1M>
 
                         <!-- Persistent, P2P Tests -->
-                        <PQR-Qpid-01>-n PQR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PQR-Qpid-01>
-                        <PQR-Qpid-02>-n PQR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PQR-Qpid-02>
-                        <PQR-Qpid-03>-n PQR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=100000 messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PQR-Qpid-03>
-                        <PQR-Qpid-04>-n PQR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=100000 messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PQR-Qpid-04>
-
-                        <PQC-Qpid-01>-n PQC-Qpid-01           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=300   maxPending=1000000 </PQC-Qpid-01>
-                        <PQC-Qpid-02>-n PQC-Qpid-02           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=100   maxPending=1000000 </PQC-Qpid-02>
-                        <PQC-Qpid-03>-n PQC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=100    messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </PQC-Qpid-03>
-                        <PQC-Qpid-04>-n PQC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </PQC-Qpid-04>
-                        <PQC-Qpid-05>-n PQC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </PQC-Qpid-05>
-                        <PQC-Qpid-06>-n PQC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </PQC-Qpid-06>
-
-                        <PQM-Qpid-01-512b>-n PQM-Qpid-01-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-512b>
-                        <PQM-Qpid-02-512b>-n PQM-Qpid-02-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-512b>
-                        <PQM-Qpid-01-1K>-n PQM-Qpid-01-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-1K>
-                        <PQM-Qpid-02-1K>-n PQM-Qpid-02-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-1K>
-                        <PQM-Qpid-01-5K>-n PQM-Qpid-01-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-5K>
-                        <PQM-Qpid-02-5K>-n PQM-Qpid-02-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-5K>
-                        <PQM-Qpid-01-10K>-n PQM-Qpid-01-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-10K>
-                        <PQM-Qpid-02-10K>-n PQM-Qpid-02-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-10K>
-                        <PQM-Qpid-01-50K>-n PQM-Qpid-01-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-50K>
-                        <PQM-Qpid-02-50K>-n PQM-Qpid-02-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-50K>
-                        <PQM-Qpid-01-100K>-n PQM-Qpid-01-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-100K>
-                        <PQM-Qpid-02-100K>-n PQM-Qpid-02-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-100K>
-                        <PQM-Qpid-01-500K>-n PQM-Qpid-01-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-500K>
-                        <PQM-Qpid-02-500K>-n PQM-Qpid-02-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-500K>
-                        <PQM-Qpid-01-1M>-n PQM-Qpid-01-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-1M>
-                        <PQM-Qpid-02-1M>-n PQM-Qpid-02-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-1M>
+                        <PQR-Qpid-01>-n PQR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PQR-Qpid-01>
+                        <PQR-Qpid-02>-n PQR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PQR-Qpid-02>
+                        <PQR-Qpid-03>-n PQR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PQR-Qpid-03>
+                        <PQR-Qpid-04>-n PQR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PQR-Qpid-04>
+
+                        <PQC-Qpid-01>-n PQC-Qpid-01           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=1000000 </PQC-Qpid-01>
+                        <PQC-Qpid-02>-n PQC-Qpid-02           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=1000000 </PQC-Qpid-02>
+                        <PQC-Qpid-03>-n PQC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=100    messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </PQC-Qpid-03>
+                        <PQC-Qpid-04>-n PQC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </PQC-Qpid-04>
+                        <PQC-Qpid-05>-n PQC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-05>
+                        <PQC-Qpid-06>-n PQC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-06>
+
+                        <PQM-Qpid-01-512b>-n PQM-Qpid-01-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-512b>
+                        <PQM-Qpid-02-512b>-n PQM-Qpid-02-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-512b>
+                        <PQM-Qpid-01-1K>-n PQM-Qpid-01-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-1K>
+                        <PQM-Qpid-02-1K>-n PQM-Qpid-02-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-1K>
+                        <PQM-Qpid-01-5K>-n PQM-Qpid-01-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-5K>
+                        <PQM-Qpid-02-5K>-n PQM-Qpid-02-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-5K>
+                        <PQM-Qpid-01-10K>-n PQM-Qpid-01-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-10K>
+                        <PQM-Qpid-02-10K>-n PQM-Qpid-02-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-10K>
+                        <PQM-Qpid-01-50K>-n PQM-Qpid-01-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-50K>
+                        <PQM-Qpid-02-50K>-n PQM-Qpid-02-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-50K>
+                        <PQM-Qpid-01-100K>-n PQM-Qpid-01-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-100K>
+                        <PQM-Qpid-02-100K>-n PQM-Qpid-02-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-100K>
+                        <PQM-Qpid-01-500K>-n PQM-Qpid-01-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-500K>
+                        <PQM-Qpid-02-500K>-n PQM-Qpid-02-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-500K>
+                        <PQM-Qpid-01-1M>-n PQM-Qpid-01-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-1M>
+                        <PQM-Qpid-02-1M>-n PQM-Qpid-02-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=false transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-1M>
 
                         <!-- Persistent, Pub/Sub Tests -->
-                        <PTR-Qpid-01>-n PTR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PTR-Qpid-01>
-                        <PTR-Qpid-02>-n PTR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PTR-Qpid-02>
-                        <PTR-Qpid-03>-n PTR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=10000  messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PTR-Qpid-03>
-                        <PTR-Qpid-04>-n PTR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=10000  messageSize=256     destinationsCount=1  rate=0     maxPending=1000000 </PTR-Qpid-04>
-
-                        <PTC-Qpid-01>-n PTC-Qpid-01           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=300   maxPending=1000000 </PTC-Qpid-01>
-                        <PTC-Qpid-02>-n PTC-Qpid-02           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=1  rate=100   maxPending=1000000 </PTC-Qpid-02>
-                        <PTC-Qpid-03>-n PTC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </PTC-Qpid-03>
-                        <PTC-Qpid-04>-n PTC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=1000000 </PTC-Qpid-04>
-                        <PTC-Qpid-05>-n PTC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </PTC-Qpid-05>
-                        <PTC-Qpid-06>-n PTC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationsCount=10 rate=0     maxPending=100000  </PTC-Qpid-06>
-
-                        <PTM-Qpid-01-512b>-n PTM-Qpid-01-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-512b>
-                        <PTM-Qpid-02-512b>-n PTM-Qpid-02-512b -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-512b>
-                        <PTM-Qpid-01-1K>-n PTM-Qpid-01-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-1K>
-                        <PTM-Qpid-02-1K>-n PTM-Qpid-02-1K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-1K>
-                        <PTM-Qpid-01-5K>-n PTM-Qpid-01-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-5K>
-                        <PTM-Qpid-02-5K>-n PTM-Qpid-02-5K     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-5K>
-                        <PTM-Qpid-01-10K>-n PTM-Qpid-01-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-10K>
-                        <PTM-Qpid-02-10K>-n PTM-Qpid-02-10K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-10K>
-                        <PTM-Qpid-01-50K>-n PTM-Qpid-01-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-50K>
-                        <PTM-Qpid-02-50K>-n PTM-Qpid-02-50K   -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-50K>
-                        <PTM-Qpid-01-100K>-n PTM-Qpid-01-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-100K>
-                        <PTM-Qpid-02-100K>-n PTM-Qpid-02-100K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-100K>
-                        <PTM-Qpid-01-500K>-n PTM-Qpid-01-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-500K>
-                        <PTM-Qpid-02-500K>-n PTM-Qpid-02-500K -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-500K>
-                        <PTM-Qpid-01-1M>-n PTM-Qpid-01-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-1M>
-                        <PTM-Qpid-02-1M>-n PTM-Qpid-02-1M     -d10M -s[1000]   -c[1]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationsCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-1M>
+                        <PTR-Qpid-01>-n PTR-Qpid-01           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PTR-Qpid-01>
+                        <PTR-Qpid-02>-n PTR-Qpid-02           -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PTR-Qpid-02>
+                        <PTR-Qpid-03>-n PTR-Qpid-03           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=10000  messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PTR-Qpid-03>
+                        <PTR-Qpid-04>-n PTR-Qpid-04           -d24H -s[100000] -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=10000  messageSize=256     destinationCount=1  rate=0     maxPending=1000000 </PTR-Qpid-04>
+
+                        <PTC-Qpid-01>-n PTC-Qpid-01           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=1000000 </PTC-Qpid-01>
+                        <PTC-Qpid-02>-n PTC-Qpid-02           -d1M  -s[100]    -c[1,30],samples=30 -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=1000000 </PTC-Qpid-02>
+                        <PTC-Qpid-03>-n PTC-Qpid-03           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </PTC-Qpid-03>
+                        <PTC-Qpid-04>-n PTC-Qpid-04           -d10M -s[1000]   -c[10]              -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=1000000 </PTC-Qpid-04>
+                        <PTC-Qpid-05>-n PTC-Qpid-05           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PTC-Qpid-05>
+                        <PTC-Qpid-06>-n PTC-Qpid-06           -d10M -s[1000]   -c[100]             -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=100 batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PTC-Qpid-06>
+
+                        <PTM-Qpid-01-512b>-n PTM-Qpid-01-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-512b>
+                        <PTM-Qpid-02-512b>-n PTM-Qpid-02-512b -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-512b>
+                        <PTM-Qpid-01-1K>-n PTM-Qpid-01-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-1K>
+                        <PTM-Qpid-02-1K>-n PTM-Qpid-02-1K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-1K>
+                        <PTM-Qpid-01-5K>-n PTM-Qpid-01-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-5K>
+                        <PTM-Qpid-02-5K>-n PTM-Qpid-02-5K     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-5K>
+                        <PTM-Qpid-01-10K>-n PTM-Qpid-01-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-10K>
+                        <PTM-Qpid-02-10K>-n PTM-Qpid-02-10K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-10K>
+                        <PTM-Qpid-01-50K>-n PTM-Qpid-01-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-50K>
+                        <PTM-Qpid-02-50K>-n PTM-Qpid-02-50K   -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-50K>
+                        <PTM-Qpid-01-100K>-n PTM-Qpid-01-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-100K>
+                        <PTM-Qpid-02-100K>-n PTM-Qpid-02-100K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-100K>
+                        <PTM-Qpid-01-500K>-n PTM-Qpid-01-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-500K>
+                        <PTM-Qpid-02-500K>-n PTM-Qpid-02-500K -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-500K>
+                        <PTM-Qpid-01-1M>-n PTM-Qpid-01-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=true  commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-1M>
+                        <PTM-Qpid-02-1M>-n PTM-Qpid-02-1M     -d10M -s[1000]   -c[8]               -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true  pubsub=true  transacted=false commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-1M>
 
                         <!-- Failover Tests. -->
                         <FT-Qpid-01>-n FT-Qpid-01 -s[250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=10000 transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failBeforeSend=true -o $QPID_WORK/results</FT-Qpid-01>

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java Tue Jul 31 08:53:37 2007
@@ -1,18 +1,21 @@
 /*
  *
- * Copyright (c) 2006 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
  */
 package org.apache.qpid.client.message;

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java Tue Jul 31 08:53:37 2007
@@ -20,18 +20,6 @@
  */
 package org.apache.qpid.ping;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.requestreply.PingPongProducer;
@@ -40,6 +28,18 @@
 import uk.co.thebadgerset.junit.extensions.util.MathUtils;
 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
 
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * PingDurableClient is a variation of the {@link PingPongProducer} ping tool. Instead of sending its pings and
  * receiving replies to them at the same time, this tool sends pings until it is signalled by some 'event' to stop
@@ -167,7 +167,8 @@
         try
         {
             // Create a ping producer overriding its defaults with all options passed on the command line.
-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));
+            Properties options =
+                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());
             PingDurableClient pingProducer = new PingDurableClient(options);
 
             // Create a shutdown hook to terminate the ping-pong producer.

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java Tue Jul 31 08:53:37 2007
@@ -57,7 +57,7 @@
         try
         {
             // Create a ping producer overriding its defaults with all options passed on the command line.
-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));
+            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());
             PingSendOnlyClient pingProducer = new PingSendOnlyClient(options);
 
             // Create a shutdown hook to terminate the ping-pong producer.

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java Tue Jul 31 08:53:37 2007
@@ -20,20 +20,6 @@
  */
 package org.apache.qpid.requestreply;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.jms.*;
-
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
@@ -51,6 +37,18 @@
 import uk.co.thebadgerset.junit.extensions.Throttle;
 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
 
+import javax.jms.*;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 /**
  * PingPongProducer is a client that sends test messages, and waits for replies to these messages. The replies may
  * either be generated by another client (see {@link PingPongBouncer}, or an extension of it may be used that listens
@@ -89,7 +87,7 @@
  * <tr><td> destinationCount <td> 1        <td> The number of receivers listening to the pings.
  * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.
  * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.
- * <tr><td> uniqueDests      <td> true     <td> Whether each receiver only listens to one ping destination or all.
+ * <tr><td> uniqueDests      <td> true     <td> Whether each receivers only listens to one ping destination or all.
  * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.
  * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:
  *                                               0 - SESSION_TRANSACTED
@@ -237,7 +235,7 @@
     /** Holds the default message selector. */
     public static final String SELECTOR_DEFAULT = "";
 
-    /** Holds the name of the proeprty to get the destination count from. */
+    /** Holds the name of the property to get the destination count from. */
     public static final String DESTINATION_COUNT_PROPNAME = "destinationCount";
 
     /** Defines the default number of destinations to ping. */
@@ -373,7 +371,7 @@
     protected int _maxPendingSize;
 
     /**
-     * Holds a monitor which is used to synchronize sender and receiver threads, where the sender has elected
+     * Holds a monitor which is used to synchronize sender and receivers threads, where the sender has elected
      * to wait until the number of unreceived message is reduced before continuing to send.
      */
     protected Object _sendPauseMonitor = new Object();
@@ -570,7 +568,8 @@
     {
         try
         {
-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));
+            Properties options =
+                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());
 
             // Create a ping producer overriding its defaults with all options passed on the command line.
             PingPongProducer pingProducer = new PingPongProducer(options);

Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Tue Jul 31 08:53:37 2007
@@ -155,14 +155,26 @@
         <module>perftests</module>
         <module>integrationtests</module>
         <module>management/eclipse-plugin</module>
-		<module>client/example</module>
-		<module>client-java14</module>
+        <module>client/example</module>
+        <module>client-java14</module>
 
     </modules>
 
 
     <build>
         <resources>
+
+            <resource>
+                <targetPath>META-INF/</targetPath>
+                <filtering>false</filtering>
+                <directory>../resources</directory>
+                <includes>
+                    <include>DISCLAIMER</include>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+ 
             <resource>
                 <directory>src/main/java</directory>
                 <excludes>
@@ -172,26 +184,28 @@
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
             </resource>
             <resource>
                 <directory>src/main/resources-filtered</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
                 <filtering>true</filtering>
             </resource>
             <resource>
                 <directory>target/generated/src/main/resources</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
             </resource>
         </resources>
 
         <testResources>
+           <testResource>
+                <targetPath>META-INF/</targetPath>
+                <filtering>false</filtering>
+                <directory>../resources</directory>
+                <includes>
+                    <include>DISCLAIMER</include>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </testResource>
+
             <testResource>
                 <directory>src/test/java</directory>
                 <excludes>
@@ -200,9 +214,6 @@
             </testResource>
             <testResource>
                 <directory>src/test/resources</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
             </testResource>
             <testResource>
                 <directory>src/test/java</directory>
@@ -391,7 +402,19 @@
                     <version>0.5</version>
                 </plugin>
 
-         <plugin>
+        
+
+
+            </plugins>
+        </pluginManagement>
+
+
+        <plugins>
+
+            <!-- Disabled as plugin crashes on the systest module. 
+             Also, the resulting NOTICE file doesn't include all license info due to missing data in dependant poms.
+
+            <plugin>
                <artifactId>maven-remote-resources-plugin</artifactId>
                <version>1.0-alpha-5</version>
                <executions>
@@ -411,11 +434,8 @@
                        </configuration>
                    </execution>
                </executions>
-           </plugin>
-
-
-            </plugins>
-        </pluginManagement>
+           </plugin-->
+        </plugins>
 
         <defaultGoal>install</defaultGoal>
 
@@ -586,7 +606,6 @@
             -->
 
             <!-- Run the javadoc report. -->
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -600,7 +619,6 @@
                     </tags>
                 </configuration>
             </plugin>
-            -->
 
             <!-- Generate the clover coverage report. -->
             <!--



Mime
View raw message