QPID-3858: Updated branch - merged from trunk r.1333987

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

14 files changed, 2404 insertions, 0 deletions

diff --git a/java/perftests/example/PQBT-AA-Qpid-01.json b/java/perftests/example/PQBT-AA-Qpid-01.json
new file mode 100644
index 0000000000..28cb4fa410
--- /dev/null
+++ b/java/perftests/example/PQBT-AA-Qpid-01.json
@@ -0,0 +1,795 @@
+{
+    "_tests":[
+    {
+      "_name": "PQBT-AA-Qpid-01";
+      "_description": "16 clients, one 1P 1C each. Persistent, Auto-Ack, 10 minutes";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue1?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue2?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue3?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue4?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue5?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue6?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue7?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue8?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue9?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue10?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue11?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue12?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue13?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue14?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue15?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue16?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "client1",
+          "_connections":[
+            {
+              "_name": "pconnection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession1",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue1?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession1",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue1?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client2",
+          "_connections":[
+            {
+              "_name": "pconnection2",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession2",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer2",
+                      "_destinationName": "direct://amq.direct//testQueue2?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection2",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession2",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer2",
+                      "_destinationName": "direct://amq.direct//testQueue2?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client3",
+          "_connections":[
+            {
+              "_name": "pconnection3",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession3",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer3",
+                      "_destinationName": "direct://amq.direct//testQueue3?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection3",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession3",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer3",
+                      "_destinationName": "direct://amq.direct//testQueue3?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client4",
+          "_connections":[
+            {
+              "_name": "pconnection4",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession4",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer4",
+                      "_destinationName": "direct://amq.direct//testQueue4?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection4",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession4",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer4",
+                      "_destinationName": "direct://amq.direct//testQueue4?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client5",
+          "_connections":[
+            {
+              "_name": "pconnection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession5",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer5",
+                      "_destinationName": "direct://amq.direct//testQueue5?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession5",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer5",
+                      "_destinationName": "direct://amq.direct//testQueue5?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client6",
+          "_connections":[
+            {
+              "_name": "pconnection6",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession6",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer6",
+                      "_destinationName": "direct://amq.direct//testQueue6?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection6",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession6",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer6",
+                      "_destinationName": "direct://amq.direct//testQueue6?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client7",
+          "_connections":[
+            {
+              "_name": "pconnection7",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession7",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer7",
+                      "_destinationName": "direct://amq.direct//testQueue7?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection7",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession7",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer7",
+                      "_destinationName": "direct://amq.direct//testQueue7?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client8",
+          "_connections":[
+            {
+              "_name": "pconnection8",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession8",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer8",
+                      "_destinationName": "direct://amq.direct//testQueue8?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection8",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession8",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer8",
+                      "_destinationName": "direct://amq.direct//testQueue8?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client9",
+          "_connections":[
+            {
+              "_name": "pconnection9",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession9",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer9",
+                      "_destinationName": "direct://amq.direct//testQueue9?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection9",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession9",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer9",
+                      "_destinationName": "direct://amq.direct//testQueue9?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client10",
+          "_connections":[
+            {
+              "_name": "pconnection10",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession10",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer10",
+                      "_destinationName": "direct://amq.direct//testQueue10?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection10",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession10",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer10",
+                      "_destinationName": "direct://amq.direct//testQueue10?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client11",
+          "_connections":[
+            {
+              "_name": "pconnection11",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession11",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer11",
+                      "_destinationName": "direct://amq.direct//testQueue11?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection11",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession11",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer11",
+                      "_destinationName": "direct://amq.direct//testQueue11?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client12",
+          "_connections":[
+            {
+              "_name": "pconnection12",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession12",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer12",
+                      "_destinationName": "direct://amq.direct//testQueue12?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection12",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession12",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer12",
+                      "_destinationName": "direct://amq.direct//testQueue12?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client13",
+          "_connections":[
+            {
+              "_name": "pconnection13",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession13",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer13",
+                      "_destinationName": "direct://amq.direct//testQueue13?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection13",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession13",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer13",
+                      "_destinationName": "direct://amq.direct//testQueue13?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client14",
+          "_connections":[
+            {
+              "_name": "pconnection14",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession14",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer14",
+                      "_destinationName": "direct://amq.direct//testQueue14?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection14",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession14",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer14",
+                      "_destinationName": "direct://amq.direct//testQueue14?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client15",
+          "_connections":[
+            {
+              "_name": "pconnection15",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession15",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer15",
+                      "_destinationName": "direct://amq.direct//testQueue15?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection15",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession15",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer15",
+                      "_destinationName": "direct://amq.direct//testQueue15?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client16",
+          "_connections":[
+            {
+              "_name": "pconnection16",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession16",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer16",
+                      "_destinationName": "direct://amq.direct//testQueue16?durable='true'",
+                      "_messageSize": 256,
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection16",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession16",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer16",
+                      "_destinationName": "direct://amq.direct//testQueue16?durable='true'",
+                      "_maximumDuration": 600000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }]
+}
diff --git a/java/perftests/example/TQBT-TX-Qpid-01.json b/java/perftests/example/TQBT-TX-Qpid-01.json
new file mode 100644
index 0000000000..eea8666fa4
--- /dev/null
+++ b/java/perftests/example/TQBT-TX-Qpid-01.json
@@ -0,0 +1,843 @@
+{
+    "_tests":[
+    {
+      "_name": "TQBT-TX-Qpid-01";
+      "_description": "16 clients, one 1P 1C each. Non-Persistent, Transactional publisher batch 1, Transactional consumer batch 1000, 10 minutes";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue1",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue2",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue3",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue4",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue5",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue6",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue7",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue8",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue9",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue10",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue11",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue12",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue13",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue14",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue15",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        },
+        {
+          "_name": "direct://amq.direct//testQueue16",
+          "_durable": false,
+          "_attributes":
+            {
+              "x-qpid-capacity": 2000000,
+              "x-qpid-flow-resume-capacity": 1500000
+            }
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "client1",
+          "_connections":[
+            {
+              "_name": "pconnection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession1",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue1",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession1",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue1",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client2",
+          "_connections":[
+            {
+              "_name": "pconnection2",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession2",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer2",
+                      "_destinationName": "direct://amq.direct//testQueue2",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection2",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession2",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer2",
+                      "_destinationName": "direct://amq.direct//testQueue2",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client3",
+          "_connections":[
+            {
+              "_name": "pconnection3",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession3",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer3",
+                      "_destinationName": "direct://amq.direct//testQueue3",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection3",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession3",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer3",
+                      "_destinationName": "direct://amq.direct//testQueue3",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client4",
+          "_connections":[
+            {
+              "_name": "pconnection4",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession4",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer4",
+                      "_destinationName": "direct://amq.direct//testQueue4",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection4",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession4",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer4",
+                      "_destinationName": "direct://amq.direct//testQueue4",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client5",
+          "_connections":[
+            {
+              "_name": "pconnection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession5",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer5",
+                      "_destinationName": "direct://amq.direct//testQueue5",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession5",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer5",
+                      "_destinationName": "direct://amq.direct//testQueue5",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client6",
+          "_connections":[
+            {
+              "_name": "pconnection6",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession6",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer6",
+                      "_destinationName": "direct://amq.direct//testQueue6",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection6",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession6",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer6",
+                      "_destinationName": "direct://amq.direct//testQueue6",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client7",
+          "_connections":[
+            {
+              "_name": "pconnection7",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession7",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer7",
+                      "_destinationName": "direct://amq.direct//testQueue7",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection7",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession7",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer7",
+                      "_destinationName": "direct://amq.direct//testQueue7",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client8",
+          "_connections":[
+            {
+              "_name": "pconnection8",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession8",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer8",
+                      "_destinationName": "direct://amq.direct//testQueue8",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection8",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession8",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer8",
+                      "_destinationName": "direct://amq.direct//testQueue8",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client9",
+          "_connections":[
+            {
+              "_name": "pconnection9",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession9",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer9",
+                      "_destinationName": "direct://amq.direct//testQueue9",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection9",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession9",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer9",
+                      "_destinationName": "direct://amq.direct//testQueue9",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client10",
+          "_connections":[
+            {
+              "_name": "pconnection10",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession10",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer10",
+                      "_destinationName": "direct://amq.direct//testQueue10",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection10",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession10",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer10",
+                      "_destinationName": "direct://amq.direct//testQueue10",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client11",
+          "_connections":[
+            {
+              "_name": "pconnection11",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession11",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer11",
+                      "_destinationName": "direct://amq.direct//testQueue11",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection11",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession11",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer11",
+                      "_destinationName": "direct://amq.direct//testQueue11",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client12",
+          "_connections":[
+            {
+              "_name": "pconnection12",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession12",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer12",
+                      "_destinationName": "direct://amq.direct//testQueue12",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection12",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession12",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer12",
+                      "_destinationName": "direct://amq.direct//testQueue12",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client13",
+          "_connections":[
+            {
+              "_name": "pconnection13",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession13",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer13",
+                      "_destinationName": "direct://amq.direct//testQueue13",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection13",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession13",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer13",
+                      "_destinationName": "direct://amq.direct//testQueue13",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client14",
+          "_connections":[
+            {
+              "_name": "pconnection14",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession14",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer14",
+                      "_destinationName": "direct://amq.direct//testQueue14",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection14",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession14",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer14",
+                      "_destinationName": "direct://amq.direct//testQueue14",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client15",
+          "_connections":[
+            {
+              "_name": "pconnection15",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession15",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer15",
+                      "_destinationName": "direct://amq.direct//testQueue15",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection15",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession15",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer15",
+                      "_destinationName": "direct://amq.direct//testQueue15",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "client16",
+          "_connections":[
+            {
+              "_name": "pconnection16",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "psession16",
+                  "_acknowledgeMode": 0,
+                  "_producers": [
+                    {
+                      "_name": "Producer16",
+                      "_destinationName": "direct://amq.direct//testQueue16",
+                      "_messageSize": 256,
+                      "_deliveryMode": 1,
+                      "_batchSize": 1,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "_name": "cconnection16",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "csession16",
+                  "_acknowledgeMode": 0,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer16",
+                      "_destinationName": "direct://amq.direct//testQueue16",
+                      "_batchSize": 1000,
+                      "_numberOfMessages": 1500000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }]
+}
diff --git a/java/perftests/example/brokerconfig/log4j.xml b/java/perftests/example/brokerconfig/log4j.xml
new file mode 100644
index 0000000000..7dbb1bc87d
--- /dev/null
+++ b/java/perftests/example/brokerconfig/log4j.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - 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
+ -
+ -   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.
+ -
+ --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null">
+    <appender class="org.apache.log4j.QpidCompositeRollingAppender" name="ArchivingFileAppender">
+        <!-- Ensure that logs always have the DatePattern appended to the filename.
+             DEFAULT IF NOT CONFIGURED: true -->
+        <param name="StaticLogFileName" value="true"/>
+        <param name="file" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <!-- Style of rolling to use, by:
+             File Size(1)
+             Date(2)
+             Both(3)
+
+             When Date (or Both) is enabled then the value of DatePattern will determine
+             when the new file is made. e.g. a DatePattern of "'.'yyyy-MM-dd-HH-mm"
+             which includes minutes will cause a new backup file to be made every minute.
+
+             DEFAULT IF NOT CONFIGURED: 3 -->
+        <param name="RollingStyle" value="1"/>
+        <!-- Set the count direction:
+             Negative numbers mean backups are numbered <latest>, .0, .1, .2,..., .n
+             0 means backup is DatePattern stamped and followed with a Positive number
+                 if the DatePattern stamp clashes with other existing backups.
+             Positive numbers mean backups are numbered 0, 1, 2, ..., n, <latest>
+
+             DEFAULT IF NOT CONFIGURED: -1 -->
+        <param name="CountDirection" value="0"/>
+        <!-- Maximum File Size:
+             DEFAULT IF NOT CONFIGURED: 10MB -->
+        <param name="MaxFileSize" value="1MB"/>
+        <!-- Date Pattern:
+             DEFAULT IF NOT CONFIGURED: "'.'yyyy-MM-dd" -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd-HH-mm"/>
+        <!-- Maximum number of backup files:
+              0 means no backups
+             -1 means infinite backups
+
+             DEFAULT IF NOT CONFIGURED: 0 -->
+        <param name="MaxSizeRollBackups" value="-1"/>
+        <!-- Compress(gzip) the backup files to the backup location:
+             DEFAULT IF NOT CONFIGURED: FALSE -->
+        <param name="CompressBackupFiles" value="true"/>
+        <!-- Compress the backup files using a second thread:
+             DEFAULT IF NOT CONFIGURED: FALSE -->
+        <param name="CompressAsync" value="true"/>
+        <!-- Backup Location:
+             DEFAULT IF NOT CONFIGURED: same dir as log file -->
+        <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender class="org.apache.log4j.FileAppender" name="FileAppender">
+        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender class="org.apache.log4j.ConsoleAppender" name="STDOUT">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <category additivity="true" name="org.apache.qpid.server.queue.AMQQueueMBean">
+        <priority value="info"/>
+    </category>
+
+    <!-- Provide warnings to standard output -->
+    <category additivity="true" name="org.apache.qpid">
+        <priority value="warn"/>
+    </category>
+
+    <!-- Enable info messages for the status-logging hierarchy -->
+    <logger additivity="true" name="qpid.message">
+      <level value="info"/>
+    </logger>
+
+
+
+    <!-- Examples of additional logging settings -->
+    <!-- Used to generate extra debug. See debug.log4j.xml -->
+    
+    <!--<category additivity="true" name="org.apache.qpid.server.store">
+        <priority value="debug"/>
+    </category-->
+
+    <!-- Set the commons logging that the XML parser uses to WARN, it is very chatty at debug -->
+    <logger name="org.apache.commons">
+        <level value="WARN"/>
+    </logger>
+
+    <!-- Log all info events to file -->
+    <root>
+        <priority value="info"/>
+        <appender-ref ref="FileAppender"/>
+        <!--appender-ref ref="ArchivingFileAppender"/-->
+    </root>
+
+</log4j:configuration>
diff --git a/java/perftests/example/brokerconfig/passwd b/java/perftests/example/brokerconfig/passwd
new file mode 100644
index 0000000000..99f0f05c6a
--- /dev/null
+++ b/java/perftests/example/brokerconfig/passwd
@@ -0,0 +1,23 @@
+#
+# 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
+#
+#   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.
+#
+guest:guest
+client:guest
+server:guest
+admin:admin
+
diff --git a/java/perftests/example/brokerconfig/virtualhosts.xml b/java/perftests/example/brokerconfig/virtualhosts.xml
new file mode 100644
index 0000000000..b0dbc89833
--- /dev/null
+++ b/java/perftests/example/brokerconfig/virtualhosts.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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
+ -
+ -   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.
+ -
+ -->
+<virtualhosts>
+    <default>test</default>
+
+    <virtualhost>
+        <name>test</name>
+        <test>
+            <store>
+                <!-- class>org.apache.qpid.server.store.MemoryMessageStore</class -->
+                
+                <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+                <environment-path>/home/V510279/dev/qpid/qpid/java/build/work/bdbstore/test-store</environment-path>
+            </store>
+
+            <queues>
+                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                <maximumMessageCount>50</maximumMessageCount>
+                <queue>
+                    <name>queue</name>
+                    <queue>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </queue>
+                </queue>
+                <queue>
+                    <name>ping</name>
+                    <ping>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </ping>
+                </queue>
+            </queues>
+        </test>
+    </virtualhost>
+</virtualhosts>
+
+
diff --git a/java/perftests/example/config-one-test.json b/java/perftests/example/config-one-test.json
new file mode 100644
index 0000000000..8f4e577d49
--- /dev/null
+++ b/java/perftests/example/config-one-test.json
@@ -0,0 +1,55 @@
+{
+    "_tests":[
+    {
+      "_name": "One producer to one consumer";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue"
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }]
+}
diff --git a/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json b/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json
new file mode 100644
index 0000000000..42c0f4a155
--- /dev/null
+++ b/java/perftests/example/config-stress-testing-manyp-c1-with-psfc.json
@@ -0,0 +1,162 @@
+{
+    "_tests":[
+    {
+      "_name": "Many producers to one consumer w/producer flow-control";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue",
+          "_attributes":
+            {
+              "comment": "does not work yet - configure in virtualhost.xml",
+              "x-qpid-capacity": 10485760,
+              "x-qpid-flow-resume-capacity": 8388608
+            }
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "producingClient1",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1,
+                      "_messageSize": 10000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "producingClient2",
+          "_connections":[
+            {
+              "_name": "connection2",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session2",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer2",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1,
+                      "_messageSize": 10000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "producingClient3",
+          "_connections":[
+            {
+              "_name": "connection3",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session3",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer3",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1,
+                      "_messageSize": 10000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "producingClient4",
+          "_connections":[
+            {
+              "_name": "connection4",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session4",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer4",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1,
+                      "_messageSize": 10000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "producingClient5",
+          "_connections":[
+            {
+              "_name": "connection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session5",
+                  "_acknowledgeMode": "1",
+                  "_producers": [
+                    {
+                      "_name": "Producer5",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1,
+                      "_messageSize": 10000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection5",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session5",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/java/perftests/example/config-stress-testing.json b/java/perftests/example/config-stress-testing.json
new file mode 100644
index 0000000000..f6029b848d
--- /dev/null
+++ b/java/perftests/example/config-stress-testing.json
@@ -0,0 +1,84 @@
+{
+    "_tests":[
+    {
+      "_name": "One producer to one consumer";
+      "_iterations":[ 
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        },
+        {
+          "_messageSize": 10000
+        }
+      ],      
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue"
+        }
+      ],
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000,
+                      "_deliveryMode": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 1000000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }]
+}
diff --git a/java/perftests/example/config-two-tests.json b/java/perftests/example/config-two-tests.json
new file mode 100644
index 0000000000..79d305b100
--- /dev/null
+++ b/java/perftests/example/config-two-tests.json
@@ -0,0 +1,117 @@
+{
+    "_tests":[
+    {
+      "_name": "One producer to one consumer";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue"
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_producers": [
+                    {
+                      "_name": "Producer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "_name": "One producer to two consumers";
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//testQueue"
+        }
+      ];
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_producers": [
+                    {
+                      "_name": "Producer",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 5000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection1",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session1",
+                  "_consumers": [
+                    {
+                      "_name": "Consumer1",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 2500
+                    }
+                  ]
+                },
+                {
+                  "_sessionName": "session2",
+                  "_consumers": [
+                    {
+                      "_name": "Consumer2",
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_numberOfMessages": 2500
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }]
+}
diff --git a/java/perftests/example/log4j-client.properties b/java/perftests/example/log4j-client.properties
new file mode 100644
index 0000000000..b724cbf5f2
--- /dev/null
+++ b/java/perftests/example/log4j-client.properties
@@ -0,0 +1,29 @@
+#
+# 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
+#
+#   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.
+#
+log4j.rootLogger=ERROR,console
+
+log4j.logger.org.apache.qpid=WARN
+log4j.logger.org.apache.qpid.disttest=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=all
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.console.layout.ConversionPattern=%d %p [%c{1}] %m%n
+
diff --git a/java/perftests/example/log4j.properties b/java/perftests/example/log4j.properties
new file mode 100644
index 0000000000..8af70ebef2
--- /dev/null
+++ b/java/perftests/example/log4j.properties
@@ -0,0 +1,35 @@
+#
+# 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
+#
+#   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.
+#
+log4j.rootLogger=ERROR,console,fileApp
+
+log4j.logger.org.apache.qpid=WARN
+log4j.logger.org.apache.qpid.disttest=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=all
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.console.layout.ConversionPattern=%d %p [%c{1}] %m%n
+
+log4j.appender.fileApp=org.apache.log4j.FileAppender
+log4j.appender.fileApp.file=perftests.log
+log4j.appender.fileApp.Threshold=info
+log4j.appender.fileApp.append=false
+log4j.appender.fileApp.layout=org.apache.log4j.PatternLayout
+log4j.appender.fileApp.layout.ConversionPattern=%d %p [%c{1}] %m%n
\ No newline at end of file
diff --git a/java/perftests/example/perftests-jndi.properties b/java/perftests/example/perftests-jndi.properties
new file mode 100644
index 0000000000..8ad0decaad
--- /dev/null
+++ b/java/perftests/example/perftests-jndi.properties
@@ -0,0 +1,26 @@
+# 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
+#
+#   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.
+
+# this file is used for running system tests of the performance test framework,
+# (i.e. not for running the performance tests themselves!)
+
+java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
+
+# use QpidBrokerTestCase's default port
+connectionfactory.connectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
+
+destination.controllerqueue = direct://amq.direct//controllerqueue
diff --git a/java/perftests/example/run-client.sh b/java/perftests/example/run-client.sh
new file mode 100755
index 0000000000..ad158529b6
--- /dev/null
+++ b/java/perftests/example/run-client.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# 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
+#
+#   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.
+#
+
+java -cp ".:${QPID_HOME}/lib/*" -Dlog4j.configuration=log4j-client.properties -Dqpid.dest_syntax=BURL  org.apache.qpid.disttest.ClientRunner jndi-config=perftests-jndi.properties
diff --git a/java/perftests/example/run.sh b/java/perftests/example/run.sh
new file mode 100755
index 0000000000..cb68c52853
--- /dev/null
+++ b/java/perftests/example/run.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# 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
+#
+#   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.
+#
+
+java -cp ".:${QPID_HOME}/lib/*" -Dqpid.dest_syntax=BURL  org.apache.qpid.disttest.ControllerRunner jndi-config=perftests-jndi.properties test-config=$1 distributed=false
+