(Patch submitted by Rupert Smith) Created distribution zip from all deps jar and generated/hand coded scripts.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@516062 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 300 insertions, 253 deletions

diff --git a/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
new file mode 100644
index 0000000000..00311bd43c
--- /dev/null
+++ b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+    if [[ $arg == -java:* ]]; then
+        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "
+    else
+        ARGS="${ARGS}$arg "
+    fi
+done
+
+echo "Starting 6 parallel tests"
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.1 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd1 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.2 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd2 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.3 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd3 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.4 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd4 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.5 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd5 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.6 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd6 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS}
+
diff --git a/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
new file mode 100644
index 0000000000..b5a07c180b
--- /dev/null
+++ b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Parse arguements taking all - prefixed args as JAVA_OPTS
+for arg in "$@"; do
+    if [[ $arg == -java:* ]]; then
+        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "
+    else
+        ARGS="${ARGS}$arg "
+    fi
+done
+echo "Starting 6 parallel tests"
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping1 BatchSize=250 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping2 BatchSize=250 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping3 BatchSize=250 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256destinationname=ping4  BatchSize=250 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping5 BatchSize=250 -o $QPID_WORK/results ${ARGS} &
+
+java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping6 BatchSize=250 -o $QPID_WORK/results ${ARGS}
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index 2d23e411a2..22f78662a0 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -15,7 +15,7 @@
     KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
     under the License.
-  -->
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -42,24 +42,24 @@
     <!-- Temporary local maven repo, whilst JUnit Toolkit is still reaching stable version to add to central maven repository. -->
     <repositories>
         <repository>
-          <id>junit-toolkit.snapshots</id>
-          <name>JUnit Toolkit SNAPSHOT Repository</name>
-      <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
+            <id>junit-toolkit.snapshots</id>
+            <name>JUnit Toolkit SNAPSHOT Repository</name>
+            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
     <!-- Temporary local maven repo, whilst JUnit Toolkit is still reaching stable version to add to central maven repository. -->
     <pluginRepositories>
         <pluginRepository>
-          <id>junit-toolkit-plugin.snapshots</id>
-          <name>JUnit Toolkit SNAPSHOT Repository</name>
-      <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
+            <id>junit-toolkit-plugin.snapshots</id>
+            <name>JUnit Toolkit SNAPSHOT Repository</name>
+            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </pluginRepository>
     </pluginRepositories>
 
@@ -100,268 +100,268 @@
             </plugin>
 
             <!-- The JUnit Toolkit maven2 plugin is in the process of being added to the maven repository.
-
+                 
                  Configures the toolkit test runner for performance testing. These can be run from within maven, or by using the generated
                  scripts.
-
+                 
                  To run from within maven:
-
+                 
                  mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tktest
-
+                 
                  To run from the command line (after doing assembly:assembly goal):
-
+                 
                  java -cp target/test_jar-jar-with-dependencies.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -s 1 -r 100000 
-                      -o target org.apache.qpid.requestreply.PingPongTestPerf
-
+                 -o target org.apache.qpid.requestreply.PingPongTestPerf
+                 
                  To generate the scripts do:
-
+                 
                  mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tkscriptgen
-
+                 
                  Then to run the scripts, in the target directory do (after doing assembly:assembly goal):
-
+                 
                  ./script_name.sh
-
+                 
                  These scripts can find everything in the 'all test dependencies' jar created by the assembly:assembly goal.
-                 -->
+            -->
             <plugin>
-              <groupId>uk.co.thebadgerset</groupId>
-              <artifactId>junit-toolkit-maven-plugin</artifactId>
-
-              <configuration>
-                <scriptOutDirectory>target</scriptOutDirectory>
-                <testJar>${project.build.finalName}-all-test-deps.jar</testJar>
-
-                <systemproperties>
-                  <property>
-                    <name>-Xms</name>
-                    <value>256m</value>
-                  </property>
-                  <property>
-                    <name>-Xmx</name>
-                    <value>3072m</value>
-                  </property>
-                  <property>
-                    <name>log4j.configuration</name>
-                    <value>${log4j.perftests}</value>
-                  </property>
-                  <property>
-                    <name>amqj.logging.level</name>
-                    <value>warn</value>
-                  </property>
-                  <property><!-- Turn off most logging messages from the junit-toolkit test tool itself. -->
-                    <name>badger.level</name>
-                    <value>warn</value>
-                  </property>
-                  <property>
-                    <name>amqj.test.logging.level</name>
-                    <value>info</value>
-                  </property>
-                </systemproperties>
-
-                <commands>
-                  <!-- Single pings. These can be scaled up by overriding the parameters when calling the test script. -->
-                  <Ping-Once>-n Ping-Once -s [1] -r 1 -t testPingOk -o . org.apache.qpid.ping.PingTestPerf</Ping-Once>
-                  <Ping-Once-Async>-n Ping-Once-Async -s [1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf</Ping-Once-Async>
-                  <Ping-Latency>-n Ping-Latency -s [1000] -d 10S -t testPingLatency -o . org.apache.qpid.ping.PingLatencyTestPerf</Ping-Latency>
-
-                  <!-- More example Tests. These are examples to exercise all the features of the test harness. Can scale up with option overrides. -->
-                  <Ping-Tx>-n Ping-Tx -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true</Ping-Tx>
-                  <Ping-Size>-n Ping-Size -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=512</Ping-Size>
-                  <Ping-Concurrent>-n Ping-Concurrent -s [100] -c [4] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Concurrent>
-                  <Ping-Many-Queues>
-              -n Ping-Many-Queues -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf destinationcount=4
-          </Ping-Many-Queues>
-                  <Ping-Duration>-n Ping-Duration -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Duration>
-                  <Ping-Rate>-n Ping-Rate -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=500</Ping-Rate>
-          <Ping-PubSub>-n Ping-PubSub -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true</Ping-PubSub>
-          <Ping-Many-Topics>
-              -n Ping-Many-Topics -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationcount=4
-          </Ping-Many-Topics>
-                  <Ping-Persistent>
-              -n Ping-Persistent -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true
-          </Ping-Persistent>
-                  <Ping-Batch-Logging>
-              -n Ping-Batch-Logging -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10
-          </Ping-Batch-Logging>
-          <Ping-Failover-Before-Send> 
-              -n Ping-Failover-Before-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeSend=true
-          </Ping-Failover-Before-Send>
-          <Ping-Failover-After-Send>
-              -n Ping-Failover-After-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterSend=true
-          </Ping-Failover-After-Send>
-          <Ping-Failover-Before-Commit>
-              -n Ping-Failover-Before-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeCommit=true
-          </Ping-Failover-Before-Commit>
-          <Ping-Failover-After-Commit>
-              -n Ping-Failover-After-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterCommit=true
-          </Ping-Failover-After-Commit>
-
-           
-          <!-- P2P Volume Tests. -->
-          <VT-Qpid-1>-n VT-Qpid-1 -s [15000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</VT-Qpid-1>
-          <VT-Qpid-2>-n VT-Qpid-2 -s [15000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true CommitBatchSize=1000 pausetimeAfterEachBatch=50  messagesize=256 BatchSize=10000 -o $QPID_WORK/results</VT-Qpid-2>
-          <!-- Setting sample to 3,000,000 will result in a log entry every 10 minutes so should have 144 data points for the run. -->
-          <VT-Qpid-3>-n VT-Qpid-3 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true rate=10000  messagesize=256 BatchSize=3000000 transacted=true -o $QPID_WORK/results</VT-Qpid-3>
-          <VT-Qpid-4>-n VT-Qpid-4 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true rate=10000  messagesize=256 BatchSize=3000000 -o $QPID_WORK/results</VT-Qpid-4>
-
-          <!-- P2P Scalability Tests. -->
-          <!-- 250,000 Total, 1P-1T-1C -->
-          <PT-Qpid-1>-n PT-Qpid-1 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</PT-Qpid-1>
-          <PT-Qpid-2>-n PT-Qpid-2 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 -o $QPID_WORK/results</PT-Qpid-2>
-
-          <!-- 25000 Msgs * 10 Brokers = 250,000 Total, 10P-1Q-10C -->
-          <PT-Qpid-3>-n PT-Qpid-3 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</PT-Qpid-3>
-          <PT-Qpid-4>-n PT-Qpid-4 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=10000  -o $QPID_WORK/results</PT-Qpid-4>
-
-          <!-- 25000 Msgs * 10 Brokers = 250,000 Tota,l 10P-10T-10C 10*(1P-1Q-1C) -->
-          <PT-Qpid-5>-n PT-Qpid-5 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true transacted=true messagesize=256 BatchSize=5000 -o $QPID_WORK/results</PT-Qpid-5>
-          <PT-Qpid-6>-n PT-Qpid-6 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=5000 -o $QPID_WORK/results</PT-Qpid-6>
-
-          <!-- 2500 Msgs * 10 Brokers * 10 Topics/Clients = 250,000 Total, 10P-100T-10C 10*(1P-10T-1C) -->
-          <PT-Qpid-7>-n PT-Qpid-7 -s [2500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationscount=10 transacted=true messagesize=256 BatchSize=500 -o $QPID_WORK/results</PT-Qpid-7>
-          <PT-Qpid-8>-n PT-Qpid-8 -s [2500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationscount=10 messagesize=256 BatchSize=500 -o $QPID_WORK/results</PT-Qpid-8>
-
-          <!-- 2500 Msgs * 100 Brokers = 250,000 Total, 100P-100T-100C 100*(1P-1T-1C) -->
-          <PT-Qpid-9>-n PT-Qpid-9 -s [2500] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PT-Qpid-9>
-          <PT-Qpid-10>-n PT-Qpid-10 -s [2500] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 -o $QPID_WORK/results</PT-Qpid-10>
-
-          <!-- 250 Msgs * 100 Brokers * 10 Clients = 250,000 Total, 100P-1000T-100C 100*(1P-10T-1C)  -->
-          <PT-Qpid-11>-n PT-Qpid-11 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 destinationscount=10 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PT-Qpid-11>
-          <PT-Qpid-12>-n PT-Qpid-12 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 destinationscount=10 -o $QPID_WORK/results</PT-Qpid-12>
-
-          <!-- 250 Msgs * 1000 Brokers = 250,000 Total, 1000P-1000T-1000C 1000*(1P-1T-1C) -->
-          <PT-Qpid-13>-n PT-Qpid-13 -s [250] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PT-Qpid-13>
-          <PT-Qpid-14>-n PT-Qpid-14 -s [250] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 -o $QPID_WORK/results</PT-Qpid-14>
-
-          <!-- P2P Volume Tests. -->
-          <VQ-Qpid-1>-n VQ-Qpid-1 -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</VQ-Qpid-1>
-          <VQ-Qpid-2>-n VQ-Qpid-2 -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 CommitBatchSize=1000 pausetimeAfterEachBatch=50 BatchSize=10000 -o $QPID_WORK/results</VQ-Qpid-2>
-          <!-- Setting sample to 3,000,000 will result in a log entry every 10 minutes so should have 144 data points for the run. -->
-          <VQ-Qpid-3>-n VQ-Qpid-3 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=10000 messagesize=256 BatchSize=3000000 transacted=true -o $QPID_WORK/results</VQ-Qpid-3>
-          <VQ-Qpid-4>-n VQ-Qpid-4 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=10000 messagesize=256 BatchSize=3000000  -o $QPID_WORK/results</VQ-Qpid-4>
-
-          <!-- P2P Scalability Tests. -->
-          <!-- 15,000 Total, 1P-1Q-1C -->
-          <PQ-Qpid-1>-n PQ-Qpid-1 -s [15000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true -o $QPID_WORK/results</PQ-Qpid-1>
-          <PQ-Qpid-2>-n PQ-Qpid-2 -s [15000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf -o $QPID_WORK/results</PQ-Qpid-2>
-
-          <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-1Q-10C -->
-          <PQ-Qpid-3>-n PQ-Qpid-3 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationname=ping transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-3>
-          <PQ-Qpid-4>-n PQ-Qpid-4 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationname=ping -o $QPID_WORK/results</PQ-Qpid-4>
-
-          <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-10Q-10C 10*(1P-1Q-1C) -->
-          <PQ-Qpid-5>-n PQ-Qpid-5 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-5>
-          <PQ-Qpid-6>-n PQ-Qpid-6 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 -o $QPID_WORK/results</PQ-Qpid-6>
-
-          <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-100Q-10C 10*(1P-10Q-1C) -->
-          <PQ-Qpid-7>-n PQ-Qpid-7 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-7>
-          <PQ-Qpid-8>-n PQ-Qpid-8 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 -o $QPID_WORK/results</PQ-Qpid-8>
-
-          <!-- 150 Messages * 100 Brokers = 15,000 Total, 100P-100Q-100C 100*(1P-1Q-1C) -->
-          <PQ-Qpid-9>-n PQ-Qpid-9 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=50 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PQ-Qpid-9>
-          <PQ-Qpid-10>-n PQ-Qpid-10 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=50 -o $QPID_WORK/results</PQ-Qpid-10>
-
-          <!-- 150 Messages * 100 Brokers = 15,000 Total, 100P-1000Q-100C 100*(1P-10Q-1C) -->
-          <PQ-Qpid-11>-n PQ-Qpid-11 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PQ-Qpid-11>
-          <PQ-Qpid-12>-n PQ-Qpid-12 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 -o $QPID_WORK/results</PQ-Qpid-12>
-
-          <!-- 15 Messages * 1000 Brokers = 15,000 Total, 1000P-1000Q-1000C 1000*(1P-1Q-1C) -->
-          <PQ-Qpid-13>-n PQ-Qpid-13 -s [15] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=15 transacted=true CommitBatchSize=15 -o $QPID_WORK/results</PQ-Qpid-13>
-          <PQ-Qpid-14>-n PQ-Qpid-14 -s [15] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=15  -o $QPID_WORK/results</PQ-Qpid-14>
-
-          <!-- Increasing Message Payload Tests. -->
-          <!-- Topic Testing -->
-          <LT-Qpid-1-512b>-n LT-Qpid-1-512b -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=512 transacted=true -o $QPID_WORK/results</LT-Qpid-1-512b>
-          <LT-Qpid-2-512b>-n LT-Qpid-2-512b -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=512 -o $QPID_WORK/results</LT-Qpid-2-512b>
-
-          <LT-Qpid-1-1K>-n LT-Qpid-1-1K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 transacted=true -o $QPID_WORK/results</LT-Qpid-1-1K>
-          <LT-Qpid-2-1K>-n LT-Qpid-2-1K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 -o $QPID_WORK/results</LT-Qpid-2-1K>
-
-          <LT-Qpid-1-5K>-n LT-Qpid-1-5K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=5120 transacted=true -o $QPID_WORK/results</LT-Qpid-1-5K>
-          <LT-Qpid-2-5K>-n LT-Qpid-2-5K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=100 messagesize=5120 -o $QPID_WORK/results</LT-Qpid-2-5K>
-
-          <LT-Qpid-1-10K>-n LT-Qpid-1-10K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=10240 transacted=true -o $QPID_WORK/results</LT-Qpid-1-10K>
-          <LT-Qpid-2-10K>-n LT-Qpid-2-10K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=200 messagesize=10240  -o $QPID_WORK/results</LT-Qpid-2-10K>
-
-          <LT-Qpid-1-50K>-n LT-Qpid-1-50K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=51200 transacted=true -o $QPID_WORK/results</LT-Qpid-1-50K>
-          <LT-Qpid-2-50K>-n LT-Qpid-2-50K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=1000 messagesize=51200 -o $QPID_WORK/results</LT-Qpid-2-50K>
-
-          <LT-Qpid-1-100K>-n LT-Qpid-1-100K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=102400 transacted=true -o $QPID_WORK/results</LT-Qpid-1-100K>
-          <LT-Qpid-2-100K>-n LT-Qpid-2-100K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=2000 messagesize=102400 -o $QPID_WORK/results</LT-Qpid-2-100K>
-          
-          <LT-Qpid-1-1M>-n LT-Qpid-1-1M -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=1048576 transacted=true -o $QPID_WORK/results</LT-Qpid-1-1M>
-          <LT-Qpid-2-1M>-n LT-Qpid-2-1M -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 CommitBatchSize=50 pausetimeAfterEachBatch=15000 messagesize=1048476 -o $QPID_WORK/results</LT-Qpid-2-1M>
-
-          <!-- Queue Testing -->
-          <LT-Qpid-3-512b>-n LT-Qpid-3-512b -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=512 transacted=true -o $QPID_WORK/results</LT-Qpid-3-512b>
-          <LT-Qpid-4-512b>-n LT-Qpid-4-512b -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=512 -o $QPID_WORK/results</LT-Qpid-4-512b>
-
-          <LT-Qpid-3-1K>-n LT-Qpid-3-1K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 transacted=true -o $QPID_WORK/results</LT-Qpid-3-1K>
-          <LT-Qpid-4-1K>-n LT-Qpid-4-1K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 -o $QPID_WORK/results</LT-Qpid-4-1K>
-
-          <LT-Qpid-3-5K>-n LT-Qpid-3-5K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=5120 transacted=true -o $QPID_WORK/results</LT-Qpid-3-5K>
-          <LT-Qpid-4-5K>-n LT-Qpid-4-5K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=100 messagesize=5120 -o $QPID_WORK/results</LT-Qpid-4-5K>
-
-          <LT-Qpid-3-10K>-n LT-Qpid-3-10K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=10240 transacted=true -o $QPID_WORK/results</LT-Qpid-3-10K>
-          <LT-Qpid-4-10K>-n LT-Qpid-4-10K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=200 messagesize=10240 -o $QPID_WORK/results</LT-Qpid-4-10K>
-
-          <LT-Qpid-3-50K>-n LT-Qpid-3-50K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=51200 transacted=true -o $QPID_WORK/results</LT-Qpid-3-50K>
-          <LT-Qpid-4-50K>-n LT-Qpid-4-50K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=1000 messagesize=51200 -o $QPID_WORK/results</LT-Qpid-4-50K>
-          
-          <LT-Qpid-3-100K>-n LT-Qpid-3-100K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=102400 transacted=true -o $QPID_WORK/results</LT-Qpid-3-100K>
-          <LT-Qpid-4-100K>-n LT-Qpid-4-100K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=2000 messagesize=102400 -o $QPID_WORK/results</LT-Qpid-4-100K>
-
-          <LT-Qpid-3-1M>-n LT-Qpid-3-1M -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=1048576 transacted=true -o $QPID_WORK/results</LT-Qpid-3-1M>
-          <LT-Qpid-4-1M>-n LT-Qpid-4-1M -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=1000 CommitBatchSize=50 pausetimeAfterEachBatch=15000 messagesize=1048576  -o $QPID_WORK/results</LT-Qpid-4-1M>
-
-          <!-- Failover Tests. -->
-          <!-- Transactional -->
-          <FT-Qpid-1>-n FT-Qpid-1 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailBeforeSend=true -o $QPID_WORK/results</FT-Qpid-1>
-          <FT-Qpid-2>-n FT-Qpid-2 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailAfterSend=true -o $QPID_WORK/results</FT-Qpid-2>
-          <FT-Qpid-3>-n FT-Qpid-3 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailAfterCommit=true -o $QPID_WORK/results</FT-Qpid-3>
-
-          <!-- Non Transactional -->
-          <FT-Qpid-4>-n FT-Qpid-4 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" transacted=false FailBeforeSend=true -o $QPID_WORK/results</FT-Qpid-4>
-          <FT-Qpid-5>-n FT-Qpid-5 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" transacted=false FailAfterSend=true -o $QPID_WORK/results</FT-Qpid-5>
-
-
-                </commands>
-              </configuration>
-
-              <executions>
-                <execution>
-                  <phase>test</phase>
-                  <!--<goals>
-                    <goal>tktest</goal>
-                  </goals>-->
-                </execution>
-              </executions>
+                <groupId>uk.co.thebadgerset</groupId>
+                <artifactId>junit-toolkit-maven-plugin</artifactId>
+
+                <configuration>
+                    <scriptOutDirectory>target</scriptOutDirectory>
+                    <testJar>${project.build.finalName}-all-test-deps.jar</testJar>
+                    <systemproperties>
+                        <property>
+                            <name>-Xms</name>
+                            <value>256m</value>
+                        </property>
+                        <property>
+                            <name>-Xmx</name>
+                            <value>3072m</value>
+                        </property>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>${log4j.perftests}</value>
+                        </property>
+                        <property>
+                            <name>amqj.logging.level</name>
+                            <value>warn</value>
+                        </property>
+                        <property><!-- Turn off most logging messages from the junit-toolkit test tool itself. -->
+                            <name>badger.level</name>
+                            <value>warn</value>
+                        </property>
+                        <property>
+                            <name>amqj.test.logging.level</name>
+                            <value>info</value>
+                        </property>
+                    </systemproperties>
+
+                    <commands>
+                        <!-- Single pings. These can be scaled up by overriding the parameters when calling the test script. -->
+                        <Ping-Once>-n Ping-Once -s [1] -r 1 -t testPingOk -o . org.apache.qpid.ping.PingTestPerf</Ping-Once>
+                        <Ping-Once-Async>-n Ping-Once-Async -s [1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf</Ping-Once-Async>
+                        <Ping-Latency>-n Ping-Latency -s [1000] -d 10S -t testPingLatency -o . org.apache.qpid.ping.PingLatencyTestPerf</Ping-Latency>
+
+                        <!-- More example Tests. These are examples to exercise all the features of the test harness. Can scale up with option overrides. -->
+                        <Ping-Tx>-n Ping-Tx -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true</Ping-Tx>
+                        <Ping-Size>-n Ping-Size -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=512</Ping-Size>
+                        <Ping-Concurrent>-n Ping-Concurrent -s [100] -c [4] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Concurrent>
+                        <Ping-Many-Queues>
+                            -n Ping-Many-Queues -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf destinationcount=4
+                        </Ping-Many-Queues>
+                        <Ping-Duration>-n Ping-Duration -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Duration>
+                        <Ping-Rate>-n Ping-Rate -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=500</Ping-Rate>
+                        <Ping-PubSub>-n Ping-PubSub -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true</Ping-PubSub>
+                        <Ping-Many-Topics>
+                            -n Ping-Many-Topics -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationcount=4
+                        </Ping-Many-Topics>
+                        <Ping-Persistent>
+                            -n Ping-Persistent -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true
+                        </Ping-Persistent>
+                        <Ping-Batch-Logging>
+                            -n Ping-Batch-Logging -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10
+                        </Ping-Batch-Logging>
+                        <Ping-Failover-Before-Send> 
+                            -n Ping-Failover-Before-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeSend=true
+                        </Ping-Failover-Before-Send>
+                        <Ping-Failover-After-Send>
+                            -n Ping-Failover-After-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterSend=true
+                        </Ping-Failover-After-Send>
+                        <Ping-Failover-Before-Commit>
+                            -n Ping-Failover-Before-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeCommit=true
+                        </Ping-Failover-Before-Commit>
+                        <Ping-Failover-After-Commit>
+                            -n Ping-Failover-After-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterCommit=true
+                        </Ping-Failover-After-Commit>
+                        
+                        <!-- P2P Volume Tests. -->
+                        <VT-Qpid-1>-n VT-Qpid-1 -s [15000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</VT-Qpid-1>
+                        <VT-Qpid-2>-n VT-Qpid-2 -s [15000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true CommitBatchSize=1000 pausetimeAfterEachBatch=50  messagesize=256 BatchSize=10000 -o $QPID_WORK/results</VT-Qpid-2>
+                        <!-- Setting sample to 3,000,000 will result in a log entry every 10 minutes so should have 144 data points for the run. -->
+                        <VT-Qpid-3>-n VT-Qpid-3 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true rate=10000  messagesize=256 BatchSize=3000000 transacted=true -o $QPID_WORK/results</VT-Qpid-3>
+                        <VT-Qpid-4>-n VT-Qpid-4 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true rate=10000  messagesize=256 BatchSize=3000000 -o $QPID_WORK/results</VT-Qpid-4>
+
+                        <!-- P2P Scalability Tests. -->
+                        <!-- 250,000 Total, 1P-1T-1C -->
+                        <PT-Qpid-1>-n PT-Qpid-1 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</PT-Qpid-1>
+                        <PT-Qpid-2>-n PT-Qpid-2 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true  messagesize=256 BatchSize=10000 -o $QPID_WORK/results</PT-Qpid-2>
+
+                        <!-- 25000 Msgs * 10 Brokers = 250,000 Total, 10P-1Q-10C -->
+                        <PT-Qpid-3>-n PT-Qpid-3 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</PT-Qpid-3>
+                        <PT-Qpid-4>-n PT-Qpid-4 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=10000  -o $QPID_WORK/results</PT-Qpid-4>
+
+                        <!-- 25000 Msgs * 10 Brokers = 250,000 Tota,l 10P-10T-10C 10*(1P-1Q-1C) -->
+                        <PT-Qpid-5>-n PT-Qpid-5 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true transacted=true messagesize=256 BatchSize=5000 -o $QPID_WORK/results</PT-Qpid-5>
+                        <PT-Qpid-6>-n PT-Qpid-6 -s [25000] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=5000 -o $QPID_WORK/results</PT-Qpid-6>
+
+                        <!-- 2500 Msgs * 10 Brokers * 10 Topics/Clients = 250,000 Total, 10P-100T-10C 10*(1P-10T-1C) -->
+                        <PT-Qpid-7>-n PT-Qpid-7 -s [2500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationscount=10 transacted=true messagesize=256 BatchSize=500 -o $QPID_WORK/results</PT-Qpid-7>
+                        <PT-Qpid-8>-n PT-Qpid-8 -s [2500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationscount=10 messagesize=256 BatchSize=500 -o $QPID_WORK/results</PT-Qpid-8>
+
+                        <!-- 2500 Msgs * 100 Brokers = 250,000 Total, 100P-100T-100C 100*(1P-1T-1C) -->
+                        <PT-Qpid-9>-n PT-Qpid-9 -s [2500] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PT-Qpid-9>
+                        <PT-Qpid-10>-n PT-Qpid-10 -s [2500] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 -o $QPID_WORK/results</PT-Qpid-10>
+
+                        <!-- 250 Msgs * 100 Brokers * 10 Clients = 250,000 Total, 100P-1000T-100C 100*(1P-10T-1C)  -->
+                        <PT-Qpid-11>-n PT-Qpid-11 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 destinationscount=10 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PT-Qpid-11>
+                        <PT-Qpid-12>-n PT-Qpid-12 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 destinationscount=10 -o $QPID_WORK/results</PT-Qpid-12>
+
+                        <!-- 250 Msgs * 1000 Brokers = 250,000 Total, 1000P-1000T-1000C 1000*(1P-1T-1C) -->
+                        <PT-Qpid-13>-n PT-Qpid-13 -s [250] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PT-Qpid-13>
+                        <PT-Qpid-14>-n PT-Qpid-14 -s [250] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 BatchSize=250 -o $QPID_WORK/results</PT-Qpid-14>
+
+                        <!-- P2P Volume Tests. -->
+                        <VQ-Qpid-1>-n VQ-Qpid-1 -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true -o $QPID_WORK/results</VQ-Qpid-1>
+                        <VQ-Qpid-2>-n VQ-Qpid-2 -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 CommitBatchSize=1000 pausetimeAfterEachBatch=50 BatchSize=10000 -o $QPID_WORK/results</VQ-Qpid-2>
+                        <!-- Setting sample to 3,000,000 will result in a log entry every 10 minutes so should have 144 data points for the run. -->
+                        <VQ-Qpid-3>-n VQ-Qpid-3 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=10000 messagesize=256 BatchSize=3000000 transacted=true -o $QPID_WORK/results</VQ-Qpid-3>
+                        <VQ-Qpid-4>-n VQ-Qpid-4 -s [3000000] -d 24H -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=10000 messagesize=256 BatchSize=3000000  -o $QPID_WORK/results</VQ-Qpid-4>
+
+                        <!-- P2P Scalability Tests. -->
+                        <!-- 15,000 Total, 1P-1Q-1C -->
+                        <PQ-Qpid-1>-n PQ-Qpid-1 -s [15000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true -o $QPID_WORK/results</PQ-Qpid-1>
+                        <PQ-Qpid-2>-n PQ-Qpid-2 -s [15000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf -o $QPID_WORK/results</PQ-Qpid-2>
+
+                        <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-1Q-10C -->
+                        <PQ-Qpid-3>-n PQ-Qpid-3 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationname=ping transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-3>
+                        <PQ-Qpid-4>-n PQ-Qpid-4 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationname=ping -o $QPID_WORK/results</PQ-Qpid-4>
+
+                        <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-10Q-10C 10*(1P-1Q-1C) -->
+                        <PQ-Qpid-5>-n PQ-Qpid-5 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-5>
+                        <PQ-Qpid-6>-n PQ-Qpid-6 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 -o $QPID_WORK/results</PQ-Qpid-6>
+
+                        <!-- 1500 Messages * 10 Brokers = 15,000 Total, 10P-100Q-10C 10*(1P-10Q-1C) -->
+                        <PQ-Qpid-7>-n PQ-Qpid-7 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 transacted=true CommitBatchSize=500 -o $QPID_WORK/results</PQ-Qpid-7>
+                        <PQ-Qpid-8>-n PQ-Qpid-8 -s [1500] -c[10] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 -o $QPID_WORK/results</PQ-Qpid-8>
+
+                        <!-- 150 Messages * 100 Brokers = 15,000 Total, 100P-100Q-100C 100*(1P-1Q-1C) -->
+                        <PQ-Qpid-9>-n PQ-Qpid-9 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=50 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PQ-Qpid-9>
+                        <PQ-Qpid-10>-n PQ-Qpid-10 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=50 -o $QPID_WORK/results</PQ-Qpid-10>
+
+                        <!-- 150 Messages * 100 Brokers = 15,000 Total, 100P-1000Q-100C 100*(1P-10Q-1C) -->
+                        <PQ-Qpid-11>-n PQ-Qpid-11 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 transacted=true CommitBatchSize=50 -o $QPID_WORK/results</PQ-Qpid-11>
+                        <PQ-Qpid-12>-n PQ-Qpid-12 -s [150] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=100 destinationscount=10 -o $QPID_WORK/results</PQ-Qpid-12>
+
+                        <!-- 15 Messages * 1000 Brokers = 15,000 Total, 1000P-1000Q-1000C 1000*(1P-1Q-1C) -->
+                        <PQ-Qpid-13>-n PQ-Qpid-13 -s [15] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=15 transacted=true CommitBatchSize=15 -o $QPID_WORK/results</PQ-Qpid-13>
+                        <PQ-Qpid-14>-n PQ-Qpid-14 -s [15] -c[1000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=15  -o $QPID_WORK/results</PQ-Qpid-14>
+
+                        <!-- Increasing Message Payload Tests. -->
+                        <!-- Topic Testing -->
+                        <LT-Qpid-1-512b>-n LT-Qpid-1-512b -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=512 transacted=true -o $QPID_WORK/results</LT-Qpid-1-512b>
+                        <LT-Qpid-2-512b>-n LT-Qpid-2-512b -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=512 -o $QPID_WORK/results</LT-Qpid-2-512b>
+
+                        <LT-Qpid-1-1K>-n LT-Qpid-1-1K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 transacted=true -o $QPID_WORK/results</LT-Qpid-1-1K>
+                        <LT-Qpid-2-1K>-n LT-Qpid-2-1K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 -o $QPID_WORK/results</LT-Qpid-2-1K>
+
+                        <LT-Qpid-1-5K>-n LT-Qpid-1-5K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=5120 transacted=true -o $QPID_WORK/results</LT-Qpid-1-5K>
+                        <LT-Qpid-2-5K>-n LT-Qpid-2-5K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=100 messagesize=5120 -o $QPID_WORK/results</LT-Qpid-2-5K>
+
+                        <LT-Qpid-1-10K>-n LT-Qpid-1-10K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=10240 transacted=true -o $QPID_WORK/results</LT-Qpid-1-10K>
+                        <LT-Qpid-2-10K>-n LT-Qpid-2-10K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=200 messagesize=10240  -o $QPID_WORK/results</LT-Qpid-2-10K>
+
+                        <LT-Qpid-1-50K>-n LT-Qpid-1-50K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=51200 transacted=true -o $QPID_WORK/results</LT-Qpid-1-50K>
+                        <LT-Qpid-2-50K>-n LT-Qpid-2-50K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=1000 messagesize=51200 -o $QPID_WORK/results</LT-Qpid-2-50K>
+
+                        <LT-Qpid-1-100K>-n LT-Qpid-1-100K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=102400 transacted=true -o $QPID_WORK/results</LT-Qpid-1-100K>
+                        <LT-Qpid-2-100K>-n LT-Qpid-2-100K -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 pausetimeAfterEachBatch=2000 messagesize=102400 -o $QPID_WORK/results</LT-Qpid-2-100K>
+                        
+                        <LT-Qpid-1-1M>-n LT-Qpid-1-1M -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 messagesize=1048576 transacted=true -o $QPID_WORK/results</LT-Qpid-1-1M>
+                        <LT-Qpid-2-1M>-n LT-Qpid-2-1M -s [1000000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true BatchSize=10000 CommitBatchSize=50 pausetimeAfterEachBatch=15000 messagesize=1048476 -o $QPID_WORK/results</LT-Qpid-2-1M>
+
+                        <!-- Queue Testing -->
+                        <LT-Qpid-3-512b>-n LT-Qpid-3-512b -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=512 transacted=true -o $QPID_WORK/results</LT-Qpid-3-512b>
+                        <LT-Qpid-4-512b>-n LT-Qpid-4-512b -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=512 -o $QPID_WORK/results</LT-Qpid-4-512b>
+
+                        <LT-Qpid-3-1K>-n LT-Qpid-3-1K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 transacted=true -o $QPID_WORK/results</LT-Qpid-3-1K>
+                        <LT-Qpid-4-1K>-n LT-Qpid-4-1K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 -o $QPID_WORK/results</LT-Qpid-4-1K>
+
+                        <LT-Qpid-3-5K>-n LT-Qpid-3-5K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=5120 transacted=true -o $QPID_WORK/results</LT-Qpid-3-5K>
+                        <LT-Qpid-4-5K>-n LT-Qpid-4-5K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=100 messagesize=5120 -o $QPID_WORK/results</LT-Qpid-4-5K>
+
+                        <LT-Qpid-3-10K>-n LT-Qpid-3-10K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=10240 transacted=true -o $QPID_WORK/results</LT-Qpid-3-10K>
+                        <LT-Qpid-4-10K>-n LT-Qpid-4-10K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=200 messagesize=10240 -o $QPID_WORK/results</LT-Qpid-4-10K>
+
+                        <LT-Qpid-3-50K>-n LT-Qpid-3-50K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=51200 transacted=true -o $QPID_WORK/results</LT-Qpid-3-50K>
+                        <LT-Qpid-4-50K>-n LT-Qpid-4-50K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=1000 messagesize=51200 -o $QPID_WORK/results</LT-Qpid-4-50K>
+                        
+                        <LT-Qpid-3-100K>-n LT-Qpid-3-100K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=102400 transacted=true -o $QPID_WORK/results</LT-Qpid-3-100K>
+                        <LT-Qpid-4-100K>-n LT-Qpid-4-100K -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 pausetimeAfterEachBatch=2000 messagesize=102400 -o $QPID_WORK/results</LT-Qpid-4-100K>
+
+                        <LT-Qpid-3-1M>-n LT-Qpid-3-1M -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10000 messagesize=1048576 transacted=true -o $QPID_WORK/results</LT-Qpid-3-1M>
+                        <LT-Qpid-4-1M>-n LT-Qpid-4-1M -s [900000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=1000 CommitBatchSize=50 pausetimeAfterEachBatch=15000 messagesize=1048576  -o $QPID_WORK/results</LT-Qpid-4-1M>
+
+                        <!-- Failover Tests. -->
+                        <!-- Transactional -->
+                        <FT-Qpid-1>-n FT-Qpid-1 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailBeforeSend=true -o $QPID_WORK/results</FT-Qpid-1>
+                        <FT-Qpid-2>-n FT-Qpid-2 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailAfterSend=true -o $QPID_WORK/results</FT-Qpid-2>
+                        <FT-Qpid-3>-n FT-Qpid-3 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 transacted=true broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" FailAfterCommit=true -o $QPID_WORK/results</FT-Qpid-3>
+
+                        <!-- Non Transactional -->
+                        <FT-Qpid-4>-n FT-Qpid-4 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" transacted=false FailBeforeSend=true -o $QPID_WORK/results</FT-Qpid-4>
+                        <FT-Qpid-5>-n FT-Qpid-5 -s [250000] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=256 BatchSize=10000 broker="tcp://10.0.0.1:5001;tcp://10.0.0.2:5002" transacted=false FailAfterSend=true -o $QPID_WORK/results</FT-Qpid-5>
+
+
+                    </commands>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <!--<goals>
+                            <goal>tktest</goal>
+                            </goals>-->
+                    </execution>
+                </executions>
             </plugin>
 
             <!-- Bundles all the dependencies, fully expanded into a single jar, required to run the tests.
-
+                 Also builds all thescripts and this jar into distributable .zip and .tar.gz files.
+                 
                  Usefull when bundling system, integration or performance tests into a convenient
                  package to hand over to testers. To use it run:
-
+                 
                  java -cp target/your_app_name-all-test-deps.jar path.to.your.Class
-
+                 
                  or often:
-
+                 
                  java -cp target/your_app_name-all-test-deps.jar junit.framework.textui.TestRunner path.to.your.test.Class
-
+                 
                  or other JUnit test runner invocations.
-                 -->
+            -->
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-assembly-plugin</artifactId>
-              <version>2.2-SNAPSHOT</version>
-              <configuration>
-                <descriptors>
-                  <descriptor>jar-with-dependencies.xml</descriptor>
-                </descriptors>
-                <outputDirectory>target</outputDirectory>
-                <workDirectory>target/assembly/work</workDirectory>
-              </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>jar-with-dependencies.xml</descriptor>
+                        <descriptor>dist-zip.xml</descriptor>
+                    </descriptors>
+                    <outputDirectory>target</outputDirectory>
+                    <workDirectory>target/assembly/work</workDirectory>
+                </configuration>
             </plugin>
 
         </plugins>