Remerge of M2. All tests pass locally

Testing done in Intelij and mvn command line via windows/cygwin.
Python tests removed from auto build pending Jython-siztion. Tested running broker in intelij and python run-tests from cygwin.

All tests pass. (CombinedTest still exhibts a race condition. but that has always been so.)

Additional Race condition identified (around MsgReject/AutoDeleteQueues) during testing patch to follow.

systests are inconsistent Some use TestableMemoryMessageStore some use MemoryMessgaeStore.

Lets not roll back this change if issues are discovered. Lets work together to go forward and address any issues. I have spent a lot of time ensuring the tests work for me so I hope that they work for you.


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

55 files changed, 8080 insertions, 956 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index 20de0d5df0..b9b3168fcc 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
@@ -1,30 +1,34 @@
 /*
  *
- * Copyright (c) 2006 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
  */
 package org.apache.qpid.server;
 
 import junit.framework.TestCase;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.management.ManagedBroker;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.client.transport.TransportConnection;
 
 public class AMQBrokerManagerMBeanTest extends TestCase
 {
@@ -33,9 +37,9 @@ public class AMQBrokerManagerMBeanTest extends TestCase
 
     public void testExchangeOperations() throws Exception
     {
-        String exchange1 = "testExchange1_" +  System.currentTimeMillis();
-        String exchange2 = "testExchange2_" +  System.currentTimeMillis();
-        String exchange3 = "testExchange3_" +  System.currentTimeMillis();
+        String exchange1 = "testExchange1_" + System.currentTimeMillis();
+        String exchange2 = "testExchange2_" + System.currentTimeMillis();
+        String exchange3 = "testExchange3_" + System.currentTimeMillis();
 
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
@@ -43,10 +47,10 @@ public class AMQBrokerManagerMBeanTest extends TestCase
 
         VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
 
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean)vHost.getManagedObject());
-        mbean.createNewExchange(exchange1,"direct",false);
-        mbean.createNewExchange(exchange2,"topic",false);
-        mbean.createNewExchange(exchange3,"headers",false);
+        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
+        mbean.createNewExchange(exchange1, "direct", false);
+        mbean.createNewExchange(exchange2, "topic", false);
+        mbean.createNewExchange(exchange3, "headers", false);
 
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) != null);
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) != null);
@@ -66,10 +70,10 @@ public class AMQBrokerManagerMBeanTest extends TestCase
         String queueName = "testQueue_" + System.currentTimeMillis();
         VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
 
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean)vHost.getManagedObject());
+        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
 
         assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
-                
+
         mbean.createNewQueue(queueName, "test", false);
         assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null);
 
@@ -82,7 +86,7 @@ public class AMQBrokerManagerMBeanTest extends TestCase
     {
         super.setUp();
         IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        _queueRegistry    = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry();
+        _queueRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry();
         _exchangeRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getExchangeRegistry();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
index bca5636440..fd28c2f77e 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -26,9 +26,10 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.messageStore.MemoryMessageStore;
+import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
 
@@ -167,7 +168,7 @@ public class TxAckTest extends TestCase
             _op.consolidate();
             _op.undoPrepare();
 
-            assertCount(_acked, 0);
+            assertCount(_acked, 1); //DTX Changed to 0, but that is wrong msg 5 is acked!
             assertCount(_unacked, 0);
         }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 7d2420e223..4419768416 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -28,10 +28,10 @@ import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageHandleFactory;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.store.SkeletonMessageStore;
-import org.apache.qpid.server.messageStore.MemoryMessageStore;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.store.SkeletonMessageStore;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.RequiredDeliveryException;
@@ -49,7 +49,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     /**
      * Not used in this test, just there to stub out the routing calls
      */
-    private MessageStore _store = new MemoryMessageStore();
+    private MessageStore _store = new SkeletonMessageStore();
 
     private StoreContext _storeContext = new StoreContext();
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
index 048fcfb0b3..9b5c9c3d00 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
@@ -20,34 +20,15 @@
  */

 package org.apache.qpid.server.exchange;

 

-import junit.framework.TestCase;

-

-import org.apache.log4j.NDC;

-

-import org.apache.qpid.client.AMQNoConsumersException;

-import org.apache.qpid.client.AMQNoRouteException;

-import org.apache.qpid.client.AMQSession;

-import org.apache.qpid.client.transport.TransportConnection;

-import static org.apache.qpid.server.exchange.MessagingTestConfigProperties.*;

-import org.apache.qpid.server.registry.ApplicationRegistry;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import org.apache.qpid.test.framework.Circuit;

+import org.apache.qpid.test.framework.FrameworkBaseCase;

+import org.apache.qpid.test.framework.MessagingTestConfigProperties;

+import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

+import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

 import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

 

-import javax.jms.*;

-import javax.naming.Context;

-import javax.naming.InitialContext;

-import javax.naming.NamingException;

-

-import java.io.PrintWriter;

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.concurrent.atomic.AtomicLong;

-

 /**

  * ImmediateMessageTest tests for the desired behaviour of immediate messages. Immediate messages are a non-JMS

  * feature. A message may be marked with an immediate delivery flag, which means that a consumer must be connected

@@ -58,156 +39,172 @@ import java.util.concurrent.atomic.AtomicLong;
  * <tr><th> Responsibilities <th> Collaborations

  * <tr><td> Check that an immediate message is sent succesfully not using transactions when a consumer is connected.

  * <tr><td> Check that an immediate message is committed succesfully in a transaction when a consumer is connected.

- * <tr><td> Check that an immediate message results in no consumers code, not using transactions, when no consumer is

+ * <tr><td> Check that an immediate message results in no consumers code, not using transactions, when a consumer is

+ *          disconnected.

+ * <tr><td> Check that an immediate message results in no consumers code, in a transaction, when a consumer is

+ *          disconnected.

+ * <tr><td> Check that an immediate message results in no route code, not using transactions, when no outgoing route is

  *          connected.

- * <tr><td> Check that an immediate message results in no consumers code, upon transaction commit, when a consumer is

+ * <tr><td> Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is

  *          connected.

+ * <tr><td> Check that an immediate message is sent succesfully not using transactions when a consumer is connected.

+ * <tr><td> Check that an immediate message is committed succesfully in a transaction when a consumer is connected.

  * <tr><td> Check that an immediate message results in no consumers code, not using transactions, when a consumer is

  *          disconnected.

- * <tr><dt> Check that an immediate message results in no consumers code, in a transaction, when a consumer is

+ * <tr><td> Check that an immediate message results in no consumers code, in a transaction, when a consumer is

  *          disconnected.

+ * <tr><td> Check that an immediate message results in no route code, not using transactions, when no outgoing route is

+ *          connected.

+ * <tr><td> Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is

+ *          connected.

  * </table>

  *

- * @todo Write a test decorator, the sole function of which is to populate test context properties, from sys properties,

- *       from trailing prop=value pairs on the command line, from test properties files or other sources. This should

- *       run through stanard JUnit without the JUnit toolkit extensions, and through Maven surefire, and also through

- *       the JUnit toolkit extended test runners.

- *

- * @todo Veto test topologies using bounce back. Or else the bounce back client will act as an immediate consumer.

+ * @todo All of these test cases will be generated by a test generator that thoroughly tests all combinations of test

+ *       circuits.

  */

-public class ImmediateMessageTest extends TestCase

+public class ImmediateMessageTest extends FrameworkBaseCase

 {

-    /** Used for debugging. */

-    private static final Logger log = LoggerFactory.getLogger(ImmediateMessageTest.class);

-

     /** Used to read the tests configurable properties through. */

     ParsedProperties testProps;

 

-    /** Used to create unique destination names for each test.

-     * @todo Move into the test framework.

+    /**

+     * Creates a new test case with the specified name.

+     *

+     * @param name The test case name.

      */

-    private static AtomicLong uniqueDestsId = new AtomicLong();

+    public ImmediateMessageTest(String name)

+    {

+        super(name);

+    }

 

     /** Check that an immediate message is sent succesfully not using transactions when a consumer is connected. */

-    public void test_QPID_517_ImmediateOkNoTxP2P() throws Exception

+    public void test_QPID_517_ImmediateOkNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

+        // Run the default test sequence over the test circuit checking for no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an immediate message is committed succesfully in a transaction when a consumer is connected. */

-    public void test_QPID_517_ImmediateOkTxP2P() throws Exception

+    public void test_QPID_517_ImmediateOkTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an immediate message results in no consumers code, not using transactions, when a consumer is disconnected. */

-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P() throws Exception

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoConsumersException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noConsumersAssertion())));

     }

 

     /** Check that an immediate message results in no consumers code, in a transaction, when a consumer is disconnected. */

-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P() throws Exception

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoConsumersException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noConsumersAssertion())));

     }

 

-    /** Check that an immediate message results in no consumers code, not using transactions, when no consumer is connected. */

-    public void test_QPID_517_ImmediateFailsNoRouteNoTxP2P() throws Exception

+    /** Check that an immediate message results in no route code, not using transactions, when no outgoing route is connected. */

+    public void test_QPID_517_ImmediateFailsNoRouteNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

-    /** Check that an immediate message results in no consumers code, upon transaction commit, when a consumer is connected. */

-    public void test_QPID_517_ImmediateFailsNoRouteTxP2P() throws Exception

+    /** Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is connected. */

+    public void test_QPID_517_ImmediateFailsNoRouteTxP2P()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     /** Check that an immediate message is sent succesfully not using transactions when a consumer is connected. */

-    public void test_QPID_517_ImmediateOkNoTxPubSub() throws Exception

+    public void test_QPID_517_ImmediateOkNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an immediate message is committed succesfully in a transaction when a consumer is connected. */

-    public void test_QPID_517_ImmediateOkTxPubSub() throws Exception

+    public void test_QPID_517_ImmediateOkTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an immediate message results in no consumers code, not using transactions, when a consumer is disconnected. */

-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub() throws Exception

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

@@ -216,17 +213,18 @@ public class ImmediateMessageTest extends TestCase
         // Use durable subscriptions, so that the route remains open with no subscribers.

         testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoConsumersException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noConsumersAssertion())));

     }

 

     /** Check that an immediate message results in no consumers code, in a transaction, when a consumer is disconnected. */

-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub() throws Exception

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

@@ -235,696 +233,64 @@ public class ImmediateMessageTest extends TestCase
         // Use durable subscriptions, so that the route remains open with no subscribers.

         testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoConsumersException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noConsumersAssertion())));

     }

 

-    /** Check that an immediate message results in no consumers code, not using transactions, when no consumer is connected. */

-    public void test_QPID_517_ImmediateFailsNoRouteNoTxPubSub() throws Exception

+    /** Check that an immediate message results in no route code, not using transactions, when no outgoing route is connected. */

+    public void test_QPID_517_ImmediateFailsNoRouteNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

-    /** Check that an immediate message results in no consumers code, upon transaction commit, when a consumer is connected. */

-    public void test_QPID_517_ImmediateFailsNoRouteTxPubSub() throws Exception

+    /** Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is connected. */

+    public void test_QPID_517_ImmediateFailsNoRouteTxPubSub()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        PublisherReceiver testClients = PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     protected void setUp() throws Exception

     {

-        NDC.push(getName());

+        super.setUp();

 

         testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);

 

         /** All these tests should have the immediate flag on. */

         testProps.setProperty(IMMEDIATE_PROPNAME, true);

+        testProps.setProperty(MANDATORY_PROPNAME, false);

 

         /** Bind the receivers consumer by default. */

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, true);

-

-        // Ensure that the in-vm broker is created.

-        TransportConnection.createVMBroker(1);

-    }

-

-    protected void tearDown() throws Exception

-    {

-        try

-        {

-            // Ensure that the in-vm broker is cleaned up so that the next test starts afresh.

-            TransportConnection.killVMBroker(1);

-            ApplicationRegistry.remove(1);

-        }

-        finally

-        {

-            NDC.pop();

-        }

-    }

-

-    /*

-     * Stuff below:

-     *

-     * This will get tidied into some sort on JMS convenience framework, through which practically any usefull test

-     * topology can be created. This will become a replacement for PingPongProducer.

-     *

-     * Base everything on standard connection properties defined in PingPongProducer. Split JMS and AMQP-only properties.

-     *

-     * Integrate with ConversationFactory, so that it will work with prod/con pairs.

-     *

-     * Support pub/rec pairs.

-     * Support m*n pub/rec setups. All pubs/recs on one machine.

-     *

-     * Support bounce back clients, with configurable bounce back behavior. All, one in X, round robin one in m, etc.

-     *

-     * Support pairing of m*n pub/rec setups with bounce back clients. JVM running a test, can simulate m publishers,

-     * will receive (a known subset of) all messages sent, bounced back to n receivers. Co-location of pub/rec will be

-     * the normal model to allow accurate timings to be taken.

-     *

-     * Support creation of pub or rec only.

-     * Support clock synching of pub/rec on different JVMs, by calculating clock offsets. Must also provide an accuracy

-     * estimate to +- the results.

-     *

-     * Augment the interop Coordinator, to become a full distributed test coordinator. Capable of querying available

-     * tests machines, looking at test parameters and farming out tests onto the test machines, passing all test

-     * parameters, standard naming of pub/rec config parameters used to set up m*n test topologies, run test cases,

-     * report results, tear down m*n topologies. Need to split the re-usable general purpose distributed test coordinator

-     * from the Qpid specific test framework for creating test-topoloigies and passing Qpid specific parameters.

-     *

-     * Write all tests against pub/rec pairs, without coding to the fact that the topology may be anything from 1:1 in

-     * JVM to m*n with bounce back clients accross many machines. That is, make the test topology orthogonal to the test

-     * case.

-     */

-

-    private static class ExceptionMonitor implements ExceptionListener

-    {

-        List<JMSException> exceptions = new ArrayList<JMSException>();

-

-        public void onException(JMSException e)

-        {

-            log.debug("ExceptionMonitor got JMSException: ", e);

-

-            exceptions.add(e);

-        }

-

-        public boolean assertNoExceptions()

-        {

-            return exceptions.isEmpty();

-        }

-

-        public boolean assertOneJMSException()

-        {

-            return exceptions.size() == 1;

-        }

-

-        public boolean assertOneJMSExceptionWithLinkedCause(Class aClass)

-        {

-            if (exceptions.size() == 1)

-            {

-                JMSException e = exceptions.get(0);

-

-                Exception linkedCause = e.getLinkedException();

-

-                if ((linkedCause != null) && aClass.isInstance(linkedCause))

-                {

-                    return true;

-                }

-            }

-

-            return false;

-        }

-

-        /**

-         * Reports the number of exceptions held by this monitor.

-         *

-         * @return The number of exceptions held by this monitor.

-         */

-        public int size()

-        {

-            return exceptions.size();

-        }

-

-        public void reset()

-        {

-            exceptions = new ArrayList();

-        }

-

-        /**

-         * Provides a dump of the stack traces of all exceptions that this exception monitor was notified of. Mainly

-         * use for debugging/test failure reporting purposes.

-         *

-         * @return A string containing a dump of the stack traces of all exceptions.

-         */

-        public String toString()

-        {

-            String result = "ExceptionMonitor: holds " + exceptions.size() + " exceptions.\n\n";

-

-            for (JMSException ex : exceptions)

-            {

-                result += getStackTrace(ex) + "\n";

-            }

-

-            return result;

-        }

-

-        /**

-         * Prints an exception stack trace into a string.

-         *

-         * @param t The throwable to get the stack trace from.

-         *

-         * @return A string containing the throwables stack trace.

-         */

-        public static String getStackTrace(Throwable t)

-        {

-            StringWriter sw = new StringWriter();

-            PrintWriter pw = new PrintWriter(sw, true);

-            t.printStackTrace(pw);

-            pw.flush();

-            sw.flush();

-

-            return sw.toString();

-        }

-    }

-

-    public static class MessageMonitor implements MessageListener

-    {

-        public void onMessage(Message message)

-        {

-            log.debug("public void onMessage(Message message): called");

-        }

-    }

-

-    /**

-     * Establishes a JMS connection using a properties file and qpids built in JNDI implementation. This is a simple

-     * convenience method for code that does anticipate handling connection failures. All exceptions that indicate

-     * that the connection has failed, are wrapped as rutime exceptions, preumably handled by a top level failure

-     * handler.

-     *

-     * @param messagingProps Any additional connection properties.

-     *

-     * @return A JMS conneciton.

-     *

-     * @todo Move this to a Utils library class or base test class. Also move the copy in interop.TestClient too.

-     *

-     * @todo Make in VM broker creation step optional on whether one is to be used or not.

-     */

-    public static Connection createConnection(ParsedProperties messagingProps)

-    {

-        log.debug("public static Connection createConnection(Properties messagingProps = " + messagingProps + "): called");

-

-        try

-        {

-            // Extract the configured connection properties from the test configuration.

-            String conUsername = messagingProps.getProperty(USERNAME_PROPNAME);

-            String conPassword = messagingProps.getProperty(PASSWORD_PROPNAME);

-            String virtualHost = messagingProps.getProperty(VIRTUAL_HOST_PROPNAME);

-            String brokerUrl = messagingProps.getProperty(BROKER_PROPNAME);

-

-            // Set up the broker connection url.

-            String connectionString =

-                "amqp://" + conUsername + ":" + conPassword + "/" + ((virtualHost != null) ? virtualHost : "")

-                + "?brokerlist='" + brokerUrl + "'";

-

-            // messagingProps.setProperty(CONNECTION_PROPNAME, connectionString);

-

-            Context ctx = new InitialContext(messagingProps);

-

-            ConnectionFactory cf = (ConnectionFactory) ctx.lookup(CONNECTION_NAME);

-            Connection connection = cf.createConnection();

-

-            return connection;

-        }

-        catch (NamingException e)

-        {

-            log.debug("Got NamingException: ", e);

-            throw new RuntimeException("Got JNDI NamingException whilst looking up the connection factory.", e);

-        }

-        catch (JMSException e)

-        {

-            log.debug("Got JMSException: ", e);

-            throw new RuntimeException("Could not establish connection due to JMSException.", e);

-        }

-    }

-

-    /**

-     * Creates a publisher and a receiver on the same connection, configured according the to specified standard

-     * properties.

-     *

-     * @param messagingProps The connection properties.

-     *

-     * @return A publisher/receiver client pair.

-     */

-    public static PublisherReceiver createPublisherReceiverPairSharedConnection(ParsedProperties messagingProps)

-    {

-        try

-        {

-            // Get a unique offset to append to destination names to make them unique to the connection.

-            long uniqueId = uniqueDestsId.incrementAndGet();

-

-            // Extract the standard test configuration parameters relevant to the connection.

-            String destinationSendRoot = messagingProps.getProperty(SEND_DESTINATION_NAME_ROOT_PROPNAME) + "_" + uniqueId;

-            String destinationReceiveRoot =

-                messagingProps.getProperty(RECEIVE_DESTINATION_NAME_ROOT_PROPNAME) + "_" + uniqueId;

-            boolean createPublisherProducer = messagingProps.getPropertyAsBoolean(PUBLISHER_PRODUCER_BIND_PROPNAME);

-            boolean createPublisherConsumer = messagingProps.getPropertyAsBoolean(PUBLISHER_CONSUMER_BIND_PROPNAME);

-            boolean createReceiverProducer = messagingProps.getPropertyAsBoolean(RECEIVER_PRODUCER_BIND_PROPNAME);

-            boolean createReceiverConsumer = messagingProps.getPropertyAsBoolean(RECEIVER_CONSUMER_BIND_PROPNAME);

-

-            // Check which JMS flags and options are to be set.

-            int ackMode = messagingProps.getPropertyAsInteger(ACK_MODE_PROPNAME);

-            boolean useTopics = messagingProps.getPropertyAsBoolean(PUBSUB_PROPNAME);

-            boolean transactional = messagingProps.getPropertyAsBoolean(TRANSACTED_PROPNAME);

-            boolean durableSubscription = messagingProps.getPropertyAsBoolean(DURABLE_SUBSCRIPTION_PROPNAME);

-

-            // Check if any Qpid/AMQP specific flags or options need to be set.

-            boolean immediate = messagingProps.getPropertyAsBoolean(IMMEDIATE_PROPNAME);

-            boolean mandatory = messagingProps.getPropertyAsBoolean(MANDATORY_PROPNAME);

-            boolean needsQpidOptions = immediate | mandatory;

-

-            /*log.debug("ackMode = " + ackMode);

-            log.debug("useTopics = " + useTopics);

-            log.debug("destinationSendRoot = " + destinationSendRoot);

-            log.debug("destinationReceiveRoot = " + destinationReceiveRoot);

-            log.debug("createPublisherProducer = " + createPublisherProducer);

-            log.debug("createPublisherConsumer = " + createPublisherConsumer);

-            log.debug("createReceiverProducer = " + createReceiverProducer);

-            log.debug("createReceiverConsumer = " + createReceiverConsumer);

-            log.debug("transactional = " + transactional);

-            log.debug("immediate = " + immediate);

-            log.debug("mandatory = " + mandatory);

-            log.debug("needsQpidOptions = " + needsQpidOptions);*/

-

-            // Create connection, sessions and producer/consumer pairs on each session.

-            Connection connection = createConnection(messagingProps);

-

-            // Add the connection exception listener to assert on exception conditions with.

-            ExceptionMonitor exceptionMonitor = new ExceptionMonitor();

-            connection.setExceptionListener(exceptionMonitor);

-

-            Session publisherSession = connection.createSession(transactional, ackMode);

-            Session receiverSession = connection.createSession(transactional, ackMode);

-

-            Destination publisherProducerDestination =

-                useTopics ? (Destination) publisherSession.createTopic(destinationSendRoot)

-                          : publisherSession.createQueue(destinationSendRoot);

-

-            MessageProducer publisherProducer =

-                createPublisherProducer

-                ? (needsQpidOptions

-                    ? ((AMQSession) publisherSession).createProducer(publisherProducerDestination, mandatory, immediate)

-                    : publisherSession.createProducer(publisherProducerDestination)) : null;

-

-            MessageConsumer publisherConsumer =

-                createPublisherConsumer

-                ? publisherSession.createConsumer(publisherSession.createQueue(destinationReceiveRoot)) : null;

-

-            if (publisherConsumer != null)

-            {

-                publisherConsumer.setMessageListener(new MessageMonitor());

-            }

-

-            MessageProducer receiverProducer =

-                createReceiverProducer ? receiverSession.createProducer(receiverSession.createQueue(destinationReceiveRoot))

-                                       : null;

-

-            Destination receiverConsumerDestination =

-                useTopics ? (Destination) receiverSession.createTopic(destinationSendRoot)

-                          : receiverSession.createQueue(destinationSendRoot);

-

-            MessageConsumer receiverConsumer =

-                createReceiverConsumer

-                ? ((durableSubscription && useTopics)

-                    ? receiverSession.createDurableSubscriber((Topic) receiverConsumerDestination, "testsub")

-                    : receiverSession.createConsumer(receiverConsumerDestination)) : null;

-

-            if (receiverConsumer != null)

-            {

-                receiverConsumer.setMessageListener(new MessageMonitor());

-            }

-

-            // Start listening for incoming messages.

-            connection.start();

-

-            // Package everything up.

-            ProducerConsumerPair publisher =

-                new ProducerConsumerPairImpl(publisherProducer, publisherConsumer, publisherSession);

-            ProducerConsumerPair receiver =

-                new ProducerConsumerPairImpl(receiverProducer, receiverConsumer, receiverSession);

-

-            PublisherReceiver result = new PublisherReceiverImpl(publisher, receiver, connection, exceptionMonitor);

-

-            return result;

-        }

-        catch (JMSException e)

-        {

-            log.debug("Got JMSException: ", e);

-            throw new RuntimeException("Could not create publisher/receiver pair due to a JMSException.", e);

-        }

-    }

-

-    public static Message createTestMessage(ProducerConsumerPair client, ParsedProperties testProps) throws JMSException

-    {

-        return client.getSession().createTextMessage("Hello");

-            // return client.getSession().createMessage();

-    }

-

-    /**

-     * A ProducerConsumerPair is a pair consisting of one message producer and one message consumer. It is a standard

-     * unit of connectivity allowing a full-duplex conversation to be held, provided both the consumer and producer

-     * are instantiated and configured.

-     *

-     * In some situations a test, or piece of application code will be written with differing numbers of publishers

-     * and receivers in different roles, where one role produces only and one consumes only. This messaging topology

-     * can still make use of producer/consumer pairs as standard building blocks, combined into publisher/receiver

-     * units to fulfill the different messaging roles, with the publishers consumer uninstantiated and the receivers

-     * producer uninstantiated. Use a {@link PublisherReceiver} for this.

-     *

-     * <p/><table id="crc"><caption>CRC Card</caption>

-     * <tr><th> Responsibilities

-     * <tr><td> Provide a message producer for sending messages.

-     * <tr><td> Provide a message consumer for receiving messages.

-     * </table>

-     *

-     * @todo Update the {@link org.apache.qpid.util.ConversationFactory} so that it accepts these as the basic

-     *       conversation connection units.

-     */

-    public static interface ProducerConsumerPair

-    {

-        public MessageProducer getProducer();

-

-        public MessageConsumer getConsumer();

-

-        public void send(Message message) throws JMSException;

-

-        public Session getSession();

-

-        public void close() throws JMSException;

-    }

-

-    /**

-     * A single producer and consumer.

-     */

-    public static class ProducerConsumerPairImpl implements ProducerConsumerPair

-    {

-        MessageProducer producer;

-

-        MessageConsumer consumer;

-

-        Session session;

-

-        public ProducerConsumerPairImpl(MessageProducer producer, MessageConsumer consumer, Session session)

-        {

-            this.producer = producer;

-            this.consumer = consumer;

-            this.session = session;

-        }

-

-        public MessageProducer getProducer()

-        {

-            return producer;

-        }

-

-        public MessageConsumer getConsumer()

-        {

-            return consumer;

-        }

-

-        public void send(Message message) throws JMSException

-        {

-            producer.send(message);

-        }

-

-        public Session getSession()

-        {

-            return session;

-        }

-

-        public void close() throws JMSException

-        {

-            if (producer != null)

-            {

-                producer.close();

-            }

-

-            if (consumer != null)

-            {

-                consumer.close();

-            }

-        }

-    }

-

-    /**

-     * Multiple producers and consumers made to look like a single producer and consumer. All methods repeated accross

-     * all producers and consumers.

-     */

-    public static class MultiProducerConsumerPairImpl implements ProducerConsumerPair

-    {

-        public MessageProducer getProducer()

-        {

-            throw new RuntimeException("Not implemented.");

-        }

-

-        public MessageConsumer getConsumer()

-        {

-            throw new RuntimeException("Not implemented.");

-        }

-

-        public void send(Message message) throws JMSException

-        {

-            throw new RuntimeException("Not implemented.");

-        }

-

-        public Session getSession()

-        {

-            throw new RuntimeException("Not implemented.");

-        }

-

-        public void close()

-        {

-            throw new RuntimeException("Not implemented.");

-        }

-    }

-

-    /**

-     * A PublisherReceiver consists of two sets of producer/consumer pairs, one for an 'instigating' publisher

-     * role, and one for a more 'passive' receiver role.

-     *

-     * <p/>A set of publishers and receivers forms a typical test configuration where both roles are to be controlled

-     * from within a single JVM. This is not a particularly usefull arrangement for applications which want to place

-     * these roles on physically seperate machines and pass messages between them. It is a faily normal arrangement for

-     * test code though, either to publish and receive messages through an in-VM message broker in order to test its

-     * expected behaviour, or to publish and receive (possibly bounced back) messages through a seperate broker instance

-     * in order to take performance timings. In the case of performance timings, the co-location of the publisher and

-     * receiver means that the timings are taken on the same machine for accurate timing without the need for clock

-     * synchronization.

-     *

-     * <p/><table id="crc"><caption>CRC Card</caption>

-     * <tr><th> Responsibilities

-     * <tr><td> Manage an m*n array of publisher and recievers.

-     * </table>

-     */

-    public static interface PublisherReceiver

-    {

-        public ProducerConsumerPair getPublisher();

-

-        public ProducerConsumerPair getReceiver();

-

-        public void start();

-

-        public void send(ParsedProperties testProps, int numMessages);

-

-        public ExceptionMonitor getConnectionExceptionMonitor();

-

-        public ExceptionMonitor getExceptionMonitor();

-

-        public void testWithAssertions(ParsedProperties testProps, Class aClass /*, assertions */);

-

-        public void testNoExceptions(ParsedProperties testProps);

-

-        public void close();

-    }

-

-    public static class PublisherReceiverImpl implements PublisherReceiver

-    {

-        private ProducerConsumerPair publisher;

-        private ProducerConsumerPair receiver;

-        private Connection connection;

-        private ExceptionMonitor connectionExceptionMonitor;

-        private ExceptionMonitor exceptionMonitor;

-

-        public PublisherReceiverImpl(ProducerConsumerPair publisher, ProducerConsumerPair receiver, Connection connection,

-            ExceptionMonitor connectionExceptionMonitor)

-        {

-            this.publisher = publisher;

-            this.receiver = receiver;

-            this.connection = connection;

-            this.connectionExceptionMonitor = connectionExceptionMonitor;

-            this.exceptionMonitor = new ExceptionMonitor();

-        }

-

-        public ProducerConsumerPair getPublisher()

-        {

-            return publisher;

-        }

-

-        public ProducerConsumerPair getReceiver()

-        {

-            return receiver;

-        }

-

-        public void start()

-        { }

-

-        public void close()

-        {

-            try

-            {

-                publisher.close();

-                receiver.close();

-                connection.close();

-            }

-            catch (JMSException e)

-            {

-                throw new RuntimeException("Got JMSException during close.", e);

-            }

-        }

-

-        public ExceptionMonitor getConnectionExceptionMonitor()

-        {

-            return connectionExceptionMonitor;

-        }

-

-        public ExceptionMonitor getExceptionMonitor()

-        {

-            return exceptionMonitor;

-        }

-

-        public void send(ParsedProperties testProps, int numMessages)

-        {

-            boolean transactional = testProps.getPropertyAsBoolean(TRANSACTED_PROPNAME);

-

-            // Send an immediate message through the publisher and ensure that it results in a JMSException.

-            try

-            {

-                getPublisher().send(createTestMessage(getPublisher(), testProps));

-

-                if (transactional)

-                {

-                    getPublisher().getSession().commit();

-                }

-            }

-            catch (JMSException e)

-            {

-                log.debug("Got JMSException: ", e);

-                exceptionMonitor.onException(e);

-            }

-        }

-

-        public void testWithAssertions(ParsedProperties testProps, Class aClass /*, assertions */)

-        {

-            start();

-            send(testProps, 1);

-            pause(1000L);

-

-            String errors = "";

-

-            ExceptionMonitor connectionExceptionMonitor = getConnectionExceptionMonitor();

-            if (!connectionExceptionMonitor.assertOneJMSExceptionWithLinkedCause(aClass))

-            {

-                errors += "Was expecting linked exception type " + aClass.getName() + " on the connection.\n";

-                errors +=

-                    (connectionExceptionMonitor.size() > 0)

-                    ? ("Actually got the following exceptions on the connection, " + connectionExceptionMonitor)

-                    : "Got no exceptions on the connection.";

-            }

-

-            // Clean up the publisher/receiver client pair.

-            close();

-

-            assertEquals(errors, "", errors);

-        }

-

-        /**

-         */

-        public void testNoExceptions(ParsedProperties testProps)

-        {

-            start();

-            send(testProps, 1);

-            pause(1000L);

-

-            String errors = "";

-

-            if (!getConnectionExceptionMonitor().assertNoExceptions())

-            {

-                errors += "Was expecting no exceptions.\n";

-                errors += "Got the following exceptions on the connection, " + getConnectionExceptionMonitor();

-            }

-

-            if (!getExceptionMonitor().assertNoExceptions())

-            {

-                errors += "Was expecting no exceptions.\n";

-                errors += "Got the following exceptions on the producer, " + getExceptionMonitor();

-            }

-

-            // Clean up the publisher/receiver client pair.

-            close();

-

-            assertEquals(errors, "", errors);

-        }

-

-        public static PublisherReceiver connectClients(ParsedProperties testProps)

-        {

-            // Create a standard publisher/receiver test client pair on a shared connection, individual sessions.

-            return createPublisherReceiverPairSharedConnection(testProps);

-        }

-    }

-

-    /**

-     * Pauses for the specified length of time. In the event of failing to pause for at least that length of time

-     * due to interuption of the thread, a RutimeException is raised to indicate the failure. The interupted status

-     * of the thread is restores in that case. This method should only be used when it is expected that the pause

-     * will be succesfull, for example in test code that relies on inejecting a pause.

-     *

-     * @param t The minimum time to pause for in milliseconds.

-     */

-    public static void pause(long t)

-    {

-        try

-        {

-            Thread.sleep(t);

-        }

-        catch (InterruptedException e)

-        {

-            // Restore the interrupted status

-            Thread.currentThread().interrupt();

-

-            throw new RuntimeException("Failed to generate the requested pause length.", e);

-        }

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, true);

     }

 }

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
index 09a32aa3eb..df99d044d2 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
@@ -20,17 +20,11 @@
  */

 package org.apache.qpid.server.exchange;

 

-import junit.framework.TestCase;

-

-import org.apache.log4j.NDC;

-

-import org.apache.qpid.client.AMQNoRouteException;

-import org.apache.qpid.client.transport.TransportConnection;

-import static org.apache.qpid.server.exchange.MessagingTestConfigProperties.*;

-import org.apache.qpid.server.registry.ApplicationRegistry;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

+import org.apache.qpid.test.framework.Circuit;

+import org.apache.qpid.test.framework.FrameworkBaseCase;

+import org.apache.qpid.test.framework.MessagingTestConfigProperties;

+import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

+import org.apache.qpid.test.framework.sequencers.CircuitFactory;

 

 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

 import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

@@ -43,163 +37,183 @@ import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
  *

  * <p><table id="crc"><caption>CRC Card</caption>

  * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Check that a mandatory message is sent succesfully not using transactions when a consumer is connected.

- * <tr><td> Check that a mandatory message is committed succesfully in a transaction when a consumer is connected.

- * <tr><td> Check that a mandatory message results in no route code, not using transactions, when no consumer is

+ * <tr><td> Check that an mandatory message is sent succesfully not using transactions when a consumer is connected.

+ * <tr><td> Check that an mandatory message is committed succesfully in a transaction when a consumer is connected.

+ * <tr><td> Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected

+ *          but the route exists.

+ * <tr><td> Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but

+ *          the route exists.

+ * <tr><td> Check that an mandatory message results in no route code, not using transactions, when no consumer is

+ *          connected.

+ * <tr><td> Check that an mandatory message results in no route code, upon transaction commit, when a consumer is

  *          connected.

- * <tr><td> Check that a mandatory message results in no route code, upon transaction commit, when a consumer is

+ * <tr><td> Check that an mandatory message is sent succesfully not using transactions when a consumer is connected.

+ * <tr><td> Check that an mandatory message is committed succesfully in a transaction when a consumer is connected.

+ * <tr><td> Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected

+ *          but the route exists.

+ * <tr><td> Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but

+ *          the route exists.

+ * <tr><td> Check that an mandatory message results in no route code, not using transactions, when no consumer is

+ *          connected.

+ * <tr><td> Check that an mandatory message results in no route code, upon transaction commit, when a consumer is

  *          connected.

- * <tr><td> Check that a mandatory message is sent succesfully, not using transactions, when a consumer is

- *          disconnected but the route exists.

- * <tr><dt> Check that a mandatory message is send successfully, in a transactions, when a consumer is

- *          disconnected but when the route exists.

  * </table>

+ *

+ * @todo All of these test cases will be generated by a test generator that thoroughly tests all combinations of test

+ *       circuits.

  */

-public class MandatoryMessageTest extends TestCase

+public class MandatoryMessageTest extends FrameworkBaseCase

 {

-    /** Used for debugging. */

-    private static final Logger log = LoggerFactory.getLogger(MandatoryMessageTest.class);

-

     /** Used to read the tests configurable properties through. */

     ParsedProperties testProps;

 

+    /**

+     * Creates a new test case with the specified name.

+     *

+     * @param name The test case name.

+     */

+    public MandatoryMessageTest(String name)

+    {

+        super(name);

+    }

+

     /** Check that an mandatory message is sent succesfully not using transactions when a consumer is connected. */

-    public void test_QPID_508_MandatoryOkNoTxP2P() throws Exception

+    public void test_QPID_508_MandatoryOkNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Run the default test sequence over the test circuit checking for no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an mandatory message is committed succesfully in a transaction when a consumer is connected. */

-    public void test_QPID_508_MandatoryOkTxP2P() throws Exception

+    public void test_QPID_508_MandatoryOkTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Run the default test sequence over the test circuit checking for no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /**

      * Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected but

      * the route exists.

      */

-    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxP2P() throws Exception

+    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /**

      * Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but

      * the route exists.

      */

-    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxP2P() throws Exception

+    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxP2P()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an mandatory message results in no route code, not using transactions, when no consumer is connected. */

-    public void test_QPID_508_MandatoryFailsNoRouteNoTxP2P() throws Exception

+    public void test_QPID_508_MandatoryFailsNoRouteNoTxP2P()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     /** Check that an mandatory message results in no route code, upon transaction commit, when a consumer is connected. */

-    public void test_QPID_508_MandatoryFailsNoRouteTxP2P() throws Exception

+    public void test_QPID_508_MandatoryFailsNoRouteTxP2P()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, false);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     /** Check that an mandatory message is sent succesfully not using transactions when a consumer is connected. */

-    public void test_QPID_508_MandatoryOkNoTxPubSub() throws Exception

+    public void test_QPID_508_MandatoryOkNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Run the default test sequence over the test circuit checking for no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an mandatory message is committed succesfully in a transaction when a consumer is connected. */

-    public void test_QPID_508_MandatoryOkTxPubSub() throws Exception

+    public void test_QPID_508_MandatoryOkTxPubSub()

     {

-        // Ensure transactional sessions are off.

+        // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Run the default test sequence over the test circuit checking for no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /**

      * Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected but

      * the route exists.

      */

-    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxPubSub() throws Exception

+    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

@@ -208,21 +222,21 @@ public class MandatoryMessageTest extends TestCase
         // Use durable subscriptions, so that the route remains open with no subscribers.

         testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /**

      * Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but

      * the route exists.

      */

-    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxPubSub() throws Exception

+    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxPubSub()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

@@ -231,79 +245,64 @@ public class MandatoryMessageTest extends TestCase
         // Use durable subscriptions, so that the route remains open with no subscribers.

         testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

-

         // Disconnect the consumer.

-        testClients.getReceiver().getConsumer().close();

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

         // Send one message with no errors.

-        testClients.testNoExceptions(testProps);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion())));

     }

 

     /** Check that an mandatory message results in no route code, not using transactions, when no consumer is connected. */

-    public void test_QPID_508_MandatoryFailsNoRouteNoTxPubSub() throws Exception

+    public void test_QPID_508_MandatoryFailsNoRouteNoTxPubSub()

     {

         // Ensure transactional sessions are off.

         testProps.setProperty(TRANSACTED_PROPNAME, false);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     /** Check that an mandatory message results in no route code, upon transaction commit, when a consumer is connected. */

-    public void test_QPID_508_MandatoryFailsNoRouteTxPubSub() throws Exception

+    public void test_QPID_508_MandatoryFailsNoRouteTxPubSub()

     {

         // Ensure transactional sessions are on.

         testProps.setProperty(TRANSACTED_PROPNAME, true);

         testProps.setProperty(PUBSUB_PROPNAME, true);

 

-        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receiver to

+        // Set up the messaging topology so that only the publishers producer is bound (do not set up the receivers to

         // collect its messages).

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

 

-        ImmediateMessageTest.PublisherReceiver testClients =

-            ImmediateMessageTest.PublisherReceiverImpl.connectClients(testProps);

+        // Send one message and get a linked no route exception.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

 

-        // Send one message and get a linked no consumers exception.

-        testClients.testWithAssertions(testProps, AMQNoRouteException.class);

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noRouteAssertion())));

     }

 

     protected void setUp() throws Exception

     {

-        NDC.push(getName());

+        super.setUp();

 

         testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);

 

         /** All these tests should have the mandatory flag on. */

+        testProps.setProperty(IMMEDIATE_PROPNAME, false);

         testProps.setProperty(MANDATORY_PROPNAME, true);

 

         /** Bind the receivers consumer by default. */

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, true);

-

-        // Ensure that the in-vm broker is created.

-        TransportConnection.createVMBroker(1);

-    }

-

-    protected void tearDown() throws Exception

-    {

-        try

-        {

-            // Ensure that the in-vm broker is cleaned up so that the next test starts afresh.

-            TransportConnection.killVMBroker(1);

-            ApplicationRegistry.remove(1);

-        }

-        finally

-        {

-            NDC.pop();

-        }

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, true);

     }

 }

diff --git a/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index 6f14956cc4..66cd1cc7da 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
@@ -1,39 +1,37 @@
 /*
  *
- * Copyright (c) 2006 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
  */
 package org.apache.qpid.server.protocol;
 
 import junit.framework.TestCase;
-import org.apache.mina.common.IoSession;
+import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.txn.MemoryTransactionManager;
 import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.MemoryMessageStore;
-import org.apache.qpid.server.store.SkeletonMessageStore;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
 
 import javax.management.JMException;
 
@@ -41,7 +39,7 @@ import javax.management.JMException;
 /**
  * Test class to test MBean operations for AMQMinaProtocolSession.
  */
-public class AMQProtocolSessionMBeanTest   extends TestCase
+public class AMQProtocolSessionMBeanTest extends TestCase
 {
     private MessageStore _messageStore = new MemoryMessageStore();
     private TransactionManager _txm = new MemoryTransactionManager();
@@ -59,7 +57,7 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
                                                                    new AMQShortString("test"),
                                                                    true,
                                                                    _protocolSession.getVirtualHost());
-        AMQChannel channel = new AMQChannel(_protocolSession,2,_txm, _messageStore, null);
+        AMQChannel channel = new AMQChannel(_protocolSession, 2, _txm, _messageStore, null);
         channel.setDefaultQueue(queue);
         _protocolSession.addChannel(channel);
         channelCount = _mbean.channels().size();
@@ -70,7 +68,7 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
         assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L);
 
         // check APIs
-        AMQChannel channel3 = new AMQChannel(_protocolSession,3,_txm,  _messageStore, null);
+        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _txm, _messageStore, null);
         channel3.setLocalTransactional();
         _protocolSession.addChannel(channel3);
         _mbean.rollbackTransactions(2);
@@ -86,26 +84,26 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
         }
         catch (JMException ex)
         {
-            System.out.println("expected exception is thrown :" + ex.getMessage());     
+            System.out.println("expected exception is thrown :" + ex.getMessage());
         }
 
         // check if closing of session works
-        _protocolSession.addChannel(new AMQChannel(_protocolSession,5, _txm, _messageStore, null));
+        _protocolSession.addChannel(new AMQChannel(_protocolSession, 5, _txm, _messageStore, null));
         _mbean.closeConnection();
         try
         {
             channelCount = _mbean.channels().size();
             assertTrue(channelCount == 0);
             // session is now closed so adding another channel should throw an exception
-            _protocolSession.addChannel(new AMQChannel(_protocolSession,6, _txm, _messageStore, null));
+            _protocolSession.addChannel(new AMQChannel(_protocolSession, 6, _txm, _messageStore, null));
             fail();
         }
-        catch(AMQException ex)
+        catch (AMQException ex)
         {
             System.out.println("expected exception is thrown :" + ex.getMessage());
         }
     }
-    
+
     @Override
     protected void setUp() throws Exception
     {
@@ -117,8 +115,8 @@ public class AMQProtocolSessionMBeanTest   extends TestCase
                                                       new AMQCodecFactory(true),
                                                       null);
         _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
-        _channel = new AMQChannel(_protocolSession,1, _txm, _messageStore, null);
+        _channel = new AMQChannel(_protocolSession, 1, _txm, _messageStore, null);
         _protocolSession.addChannel(_channel);
-        _mbean = (AMQProtocolSessionMBean)_protocolSession.getManagedObject();
+        _mbean = (AMQProtocolSessionMBean) _protocolSession.getManagedObject();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
index dc1f592679..c1d7b0f598 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
@@ -1,39 +1,32 @@
 /*
  *
- * Copyright (c) 2006 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
  */
 package org.apache.qpid.server.protocol;
 
 import junit.framework.TestCase;
-import org.apache.mina.common.IoSession;
+import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
+import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.SkeletonMessageStore;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.framing.AMQShortString;
-
-import javax.management.JMException;
+import org.apache.qpid.server.registry.IApplicationRegistry;
 
 /** Test class to test MBean operations for AMQMinaProtocolSession. */
 public class MaxChannelsTest extends TestCase
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
index f98c046684..65ac12463f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
@@ -23,26 +23,25 @@ package org.apache.qpid.server.queue;
 import junit.framework.TestCase;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.ack.UnacknowledgedMessage;
 import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.messageStore.TestableMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
+import org.apache.qpid.server.txn.MemoryTransactionManager;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.txn.MemoryTransactionManager;
-import org.apache.qpid.server.util.TestApplicationRegistry;
 import org.apache.qpid.server.util.NullApplicationRegistry;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * Tests that acknowledgements are handled correctly.
@@ -80,7 +79,7 @@ public class AckTest extends TestCase
         _messageStore = new TestableMemoryMessageStore();
         _txm = new MemoryTransactionManager();
         _protocolSession = new MockProtocolSession(_messageStore);
-        _channel = new AMQChannel(_protocolSession,5,_txm, _messageStore, null/*dont need exchange registry*/);
+        _channel = new AMQChannel(_protocolSession, 5, _txm, _messageStore, null/*dont need exchange registry*/);
 
         _protocolSession.addChannel(_channel);
         _subscriptionManager = new SubscriptionSet();
@@ -161,7 +160,10 @@ public class AckTest extends TestCase
 
         UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
         assertTrue(map.size() == msgCount);
- //       assertTrue(_messageStore.getNumberStoredMessages() == msgCount);
+        assertTrue(_messageStore.getMessageMetaDataMap().size() == msgCount);
+        
+        //DTX
+        //       assertTrue(_messageStore.getNumberStoredMessages() == msgCount);
 
         Set<Long> deliveryTagSet = map.getDeliveryTags();
         int i = 1;
@@ -174,6 +176,9 @@ public class AckTest extends TestCase
         }
 
         assertTrue(map.size() == msgCount);
+        assertTrue(_messageStore.getMessageMetaDataMap().size() == msgCount);
+        
+        //DTX
 //        assertTrue(_messageStore.getNumberStoredMessages() == msgCount);
     }
 
@@ -189,7 +194,9 @@ public class AckTest extends TestCase
 
         UnacknowledgedMessageMap map = _channel.getUnacknowledgedMessageMap();
         assertTrue(map.size() == 0);
-        assertTrue(_messageStore.getNumberStoredMessages() == 0);
+        assertTrue(_messageStore.getMessageMetaDataMap().size() == 0);
+        //DTX MessageStore
+//        assertTrue(_messageStore.getNumberStoredMessages() == 0);
     }
 
     /**
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
index 4c3bf2a3ea..0d4e3e748b 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
@@ -20,16 +20,13 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.MemoryMessageStore;
-import org.apache.qpid.server.store.SkeletonMessageStore;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.TestApplicationRegistry;
 import org.apache.qpid.server.util.NullApplicationRegistry;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 37608ecc93..0ad6502755 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -30,7 +30,7 @@ import org.apache.qpid.server.output.ProtocolOutputConverter;
 import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.messageStore.MessageStore;
+import org.apache.qpid.server.store.MessageStore;
 
 import javax.security.sasl.SaslServer;
 import java.util.HashMap;
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java b/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
index f145703df2..c4e744573f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
@@ -20,19 +20,19 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.AMQException;
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQChannelClosedException;
 import org.apache.qpid.AMQConnectionClosedException;
-import org.apache.qpid.util.CommandLineParser;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.url.URLSyntaxException;
-import org.apache.log4j.Logger;
+import org.apache.qpid.util.CommandLineParser;
 
-import javax.jms.Session;
 import javax.jms.JMSException;
-import javax.jms.Queue;
 import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
 import javax.jms.TextMessage;
 import java.io.IOException;
 import java.util.Properties;
@@ -259,8 +259,8 @@ public class PersistentTestManual
     {
         PersistentTestManual test;
 
-        Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][]{}), null);
-
+        Properties options =
+                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][]{}), System.getProperties());
 
         test = new PersistentTestManual(options);
         try
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
new file mode 100644
index 0000000000..ab6d9742e4
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -0,0 +1,146 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.store;
+
+import junit.framework.TestCase;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.BasicContentHeaderProperties;
+import org.apache.qpid.framing.BasicPublishBody;
+import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.MessageHandleFactory;
+import org.apache.qpid.server.txn.NonTransactionalContext;
+
+/**
+ * Tests that reference counting works correctly with AMQMessage and the message store
+ */
+public class TestReferenceCounting extends TestCase
+{
+    private TestableMemoryMessageStore _store;
+
+    private StoreContext _storeContext = new StoreContext();
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        _store = new TestableMemoryMessageStore();
+    }
+
+    /**
+     * Check that when the reference count is decremented the message removes itself from the store
+     */
+    public void testMessageGetsRemoved() throws AMQException
+    {
+        createPersistentContentHeader();
+
+        MessagePublishInfo info = new MessagePublishInfo()
+        {
+
+            public AMQShortString getExchange()
+            {
+                return null;
+            }
+
+            public boolean isImmediate()
+            {
+                return false;
+            }
+
+            public boolean isMandatory()
+            {
+                return false;
+            }
+
+            public AMQShortString getRoutingKey()
+            {
+                return null;
+            }
+        };
+
+        AMQMessage message = new AMQMessage(_store.getNewMessageId(), info,
+                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            createPersistentContentHeader());
+        message = message.takeReference();
+
+        // we call routing complete to set up the handle
+        message.routingComplete(_store, _storeContext, new MessageHandleFactory());
+        assertTrue(_store.getMessageMetaDataMap().size() == 1);
+        message.decrementReference(_storeContext);
+        assertTrue(_store.getMessageMetaDataMap().size() == 0);
+    }
+
+    private ContentHeaderBody createPersistentContentHeader()
+    {
+        ContentHeaderBody chb = new ContentHeaderBody();
+        BasicContentHeaderProperties bchp = new BasicContentHeaderProperties();
+        bchp.setDeliveryMode((byte)2);
+        chb.properties = bchp;
+        return chb;
+    }
+
+    public void testMessageRemains() throws AMQException
+    {
+
+        MessagePublishInfo info = new MessagePublishInfo()
+        {
+
+            public AMQShortString getExchange()
+            {
+                return null;
+            }
+
+            public boolean isImmediate()
+            {
+                return false;
+            }
+
+            public boolean isMandatory()
+            {
+                return false;
+            }
+
+            public AMQShortString getRoutingKey()
+            {
+                return null;
+            }
+        };
+
+        AMQMessage message = new AMQMessage(_store.getNewMessageId(),
+                                            info,
+                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            createPersistentContentHeader());
+        
+        message = message.takeReference();
+        // we call routing complete to set up the handle
+        message.routingComplete(_store, _storeContext, new MessageHandleFactory());
+        assertTrue(_store.getMessageMetaDataMap().size() == 1);
+        message = message.takeReference();
+        message.decrementReference(_storeContext);
+        assertTrue(_store.getMessageMetaDataMap().size() == 1);
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(TestReferenceCounting.class);
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
index 540c91ddaf..4d8ddeaddd 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
 
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
+import org.apache.qpid.server.registry.ApplicationRegistry;
 
 import javax.naming.Context;
 import javax.naming.spi.InitialContextFactory;
@@ -112,6 +113,8 @@ public class VMTestCase extends TestCase
     protected void tearDown() throws Exception
     {
         TransportConnection.killVMBroker(1);
+        ApplicationRegistry.remove(1);
+        
         super.tearDown();
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
new file mode 100644
index 0000000000..60d54f1f6f
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+/**
+ * Assertion models an assertion on a test {@link Circuit}.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Indicate whether or not the assertion passes when applied.
+ * </table>
+ */
+public interface Assertion
+{
+    /**
+     * Applies the assertion.
+     *
+     * @return <tt>true</tt> if the assertion passes, <tt>false</tt> if it fails.
+     */
+    public boolean apply();
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
new file mode 100644
index 0000000000..0bb4911d4c
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
@@ -0,0 +1,66 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * AssertionBase is a base class for implenmenting assertions. It provides a mechanism to store error messages, and
+ * report all error messages when its {@link #toString()} method is called.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Collect error messages.
+ * </table>
+ */
+public abstract class AssertionBase implements Assertion
+{
+    /** Holds the error messages. */
+    List<String> errors = new LinkedList<String>();
+
+    /**
+     * Adds an error message to the assertion.
+     *
+     * @param error An error message to add to the assertion.
+     */
+    public void addError(String error)
+    {
+        errors.add(error);
+    }
+
+    /**
+     * Prints all of the error messages in the assertion into a string.
+     *
+     * @return All of the error messages in the assertion as a string.
+     */
+    public String toString()
+    {
+        String result = "";
+
+        for (String error : errors)
+        {
+            result += error;
+        }
+
+        return result;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
new file mode 100644
index 0000000000..4f9ab1a273
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
@@ -0,0 +1,109 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import java.util.List;
+
+/**
+ * A Circuit is the basic test unit against which test cases are to be written. A circuit consists of two 'ends', an
+ * instigating 'publisher' end and a more passive 'receivers' end.
+ *
+ * <p/>Once created, the life-cycle of a circuit may be controlled by {@link #start()}ing it, or {@link #close()}ing it.
+ * Once started, the circuit is ready to send messages over. Once closed the circuit can no longer be used.
+ *
+ * <p/>The state of the circuit may be taken with the {@link #check()} method, and asserted against by the
+ * {@link #applyAssertions(java.util.List)} method.
+ *
+ * <p/>There is a default test procedure which may be performed against the circuit. The outline of this procedure is:
+ *
+ * <p/><pre>
+ * Start the circuit.
+ * Send test messages.
+ * Request a status report.
+ * Assert conditions on the publishing end of the circuit.
+ * Assert conditions on the receiving end of the circuit.
+ * Close the circuit.
+ * Pass with no failed assertions or fail with a list of failed assertions.
+ * </pre>
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Supply the publishing and receiving ends of a test messaging circuit.
+ * <tr><td> Start the circuit running.
+ * <tr><td> Close the circuit down.
+ * <tr><td> Take a reading of the circuits state.
+ * <tr><td> Apply assertions against the circuits state.
+ * <tr><td> Send test messages over the circuit.
+ * <tr><td> Perform the default test procedue on the circuit.
+ * </table>
+ */
+public interface Circuit
+{
+    /**
+     * Gets the interface on the publishing end of the circuit.
+     *
+     * @return The publishing end of the circuit.
+     */
+    public Publisher getPublisher();
+
+    /**
+     * Gets the interface on the receiving end of the circuit.
+     *
+     * @return The receiving end of the circuit.
+     */
+    public Receiver getReceiver();
+
+    /**
+     * Connects and starts the circuit. After this method is called the circuit is ready to send messages.
+     */
+    public void start();
+
+    /**
+     * Checks the test circuit. The effect of this is to gather the circuits state, for both ends of the circuit,
+     * into a report, against which assertions may be checked.
+     */
+    public void check();
+
+    /**
+     * Closes the circuit. All associated resources are closed.
+     */
+    public void close();
+
+    /**
+     * Applied a list of assertions against the test circuit. The {@link #check()} method should be called before doing
+     * this, to ensure that the circuit has gathered its state into a report to assert against.
+     *
+     * @param assertions The list of assertions to apply to the circuit.
+     *
+     * @return Any assertions that failed.
+     */
+    public List<Assertion> applyAssertions(List<Assertion> assertions);
+
+    /**
+     * Runs the default test procedure against the circuit, and checks that all of the specified assertions hold.
+     *
+     * @param numMessages The number of messages to send using the default test procedure.
+     * @param assertions  The list of assertions to apply.
+     *
+     * @return Any assertions that failed.
+     */
+    public List<Assertion> test(int numMessages, List<Assertion> assertions);
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java b/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
new file mode 100644
index 0000000000..8f85d4a356
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
@@ -0,0 +1,91 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import javax.jms.*;
+
+/**
+ * A CircuitEnd is a pair consisting of one message producer and one message consumer, that represents one end of a
+ * test circuit. It is a standard unit of connectivity allowing a full-duplex conversation to be held, provided both
+ * the consumer and producer are instantiated and configured.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Provide a message producer for sending messages.
+ * <tr><td> Provide a message consumer for receiving messages.
+ * </table>
+ *
+ * @todo Update the {@link org.apache.qpid.util.ConversationFactory} so that it accepts these as the basic conversation
+ *       connection units.
+ */
+public interface CircuitEnd
+{
+    /**
+     * Gets the message producer at this circuit end point.
+     *
+     * @return The message producer at with this circuit end point.
+     */
+    public MessageProducer getProducer();
+
+    /**
+     * Gets the message consumer at this circuit end point.
+     *
+     * @return The message consumer at this circuit end point.
+     */
+    public MessageConsumer getConsumer();
+
+    /**
+     * Send the specified message over the producer at this end point.
+     *
+     * @param message The message to send.
+     *
+     * @throws JMSException Any JMS exception occuring during the send is allowed to fall through.
+     */
+    public void send(Message message) throws JMSException;
+
+    /**
+     * Gets the JMS Session associated with this circuit end point.
+     *
+     * @return The JMS Session associated with this circuit end point.
+     */
+    public Session getSession();
+
+    /**
+     * Closes the message producers and consumers and the sessions, associated with this circuit end point.
+     *
+     * @throws JMSException Any JMSExceptions occurring during the close are allowed to fall through.
+     */
+    public void close() throws JMSException;
+
+    /**
+     * Returns the message monitor for reporting on received messages on this circuit end.
+     *
+     * @return The message monitor for this circuit end.
+     */
+    public MessageMonitor getMessageMonitor();
+
+    /**
+     * Returns the exception monitor for reporting on exceptions received on this circuit end.
+     *
+     * @return The exception monitor for this circuit end.
+     */
+    public ExceptionMonitor getExceptionMonitor();
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
new file mode 100644
index 0000000000..d971aa5385
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
@@ -0,0 +1,149 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import javax.jms.*;
+
+/**
+ * A CircuitEndBase is a pair consisting of one message producer and one message consumer, that represents one end of a
+ * test circuit. It is a standard unit of connectivity allowing a full-duplex conversation to be held, provided both
+ * the consumer and producer are instantiated and configured.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Provide a message producer for sending messages.
+ * <tr><td> Provide a message consumer for receiving messages.
+ * </table>
+ */
+public class CircuitEndBase implements CircuitEnd
+{
+    /** Holds the single message producer. */
+    MessageProducer producer;
+
+    /** Holds the single message consumer. */
+    MessageConsumer consumer;
+
+    /** Holds the controlSession for the circuit end. */
+    Session session;
+
+    /** Holds the message monitor for the circuit end. */
+    MessageMonitor messageMonitor;
+
+    /** Holds the exception monitor for the circuit end. */
+    ExceptionMonitor exceptionMonitor;
+
+    /**
+     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     *
+     * @param producer The message producer for the circuit end point.
+     * @param consumer The message consumer for the circuit end point.
+     * @param session  The controlSession for the circuit end point.
+     */
+    public CircuitEndBase(MessageProducer producer, MessageConsumer consumer, Session session, MessageMonitor messageMonitor,
+        ExceptionMonitor exceptionMonitor)
+    {
+        this.producer = producer;
+        this.consumer = consumer;
+        this.session = session;
+
+        this.messageMonitor = messageMonitor;
+        this.exceptionMonitor = exceptionMonitor;
+    }
+
+    /**
+     * Gets the message producer at this circuit end point.
+     *
+     * @return The message producer at with this circuit end point.
+     */
+    public MessageProducer getProducer()
+    {
+        return producer;
+    }
+
+    /**
+     * Gets the message consumer at this circuit end point.
+     *
+     * @return The message consumer at this circuit end point.
+     */
+    public MessageConsumer getConsumer()
+    {
+        return consumer;
+    }
+
+    /**
+     * Send the specified message over the producer at this end point.
+     *
+     * @param message The message to send.
+     * @throws javax.jms.JMSException Any JMS exception occuring during the send is allowed to fall through.
+     */
+    public void send(Message message) throws JMSException
+    {
+        producer.send(message);
+    }
+
+    /**
+     * Gets the JMS Session associated with this circuit end point.
+     *
+     * @return The JMS Session associated with this circuit end point.
+     */
+    public Session getSession()
+    {
+        return session;
+    }
+
+    /**
+     * Closes the message producers and consumers and the sessions, associated with this circuit end point.
+     *
+     * @throws javax.jms.JMSException Any JMSExceptions occurring during the close are allowed to fall through.
+     */
+    public void close() throws JMSException
+    {
+        if (producer != null)
+        {
+            producer.close();
+        }
+
+        if (consumer != null)
+        {
+            consumer.close();
+        }
+    }
+
+    /**
+     * Returns the message monitor for reporting on received messages on this circuit end.
+     *
+     * @return The message monitor for this circuit end.
+     */
+    public MessageMonitor getMessageMonitor()
+    {
+        return messageMonitor;
+    }
+
+    /**
+     * Returns the exception monitor for reporting on exceptions received on this circuit end.
+     *
+     * @return The exception monitor for this circuit end.
+     */
+    public ExceptionMonitor getExceptionMonitor()
+    {
+        return exceptionMonitor;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java b/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
new file mode 100644
index 0000000000..78b5a72c1f
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
@@ -0,0 +1,51 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+/**
+ * A DropIn test is a test case that can accept late joining test clients into a running test. This can be usefull,
+ * for interactive experimentation.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Accept late joining test clients.
+ * </table>
+ */
+public interface DropInTest
+{
+    /**
+     * Should accept a late joining client into a running test case. The client will be enlisted with a control message
+     * with the 'CONTROL_TYPE' field set to the value 'LATEJOIN'. It should also provide values for the fields:
+     *
+     * <p/><table>
+     * <tr><td> CLIENT_NAME <td> A unique name for the new client.
+     * <tr><td> CLIENT_PRIVATE_CONTROL_KEY <td> The key for the route on which the client receives its control messages.
+     * </table>
+     *
+     * @param message The late joiners join message.
+     *
+     * @throws JMSException Any JMS Exception are allowed to fall through, indicating that the join failed.
+     */
+    public void lateJoin(Message message) throws JMSException;
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java b/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
new file mode 100644
index 0000000000..1ac94b5244
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
@@ -0,0 +1,158 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import org.apache.log4j.Logger;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An exception monitor, listens for JMS exception on a connection or consumer. It record all exceptions that it receives
+ * and provides methods to test the number and type of exceptions received.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Record all exceptions received. <td> {@link ExceptionListener}
+ * </table>
+ */
+public class ExceptionMonitor implements ExceptionListener
+{
+    /** Used for debugging. */
+    private final Logger log = Logger.getLogger(ExceptionMonitor.class);
+
+    /** Holds the received exceptions. */
+    List<JMSException> exceptions = new ArrayList<JMSException>();
+
+    /**
+     * Receives incoming exceptions.
+     *
+     * @param e The exception to record.
+     */
+    public void onException(JMSException e)
+    {
+        log.debug("public void onException(JMSException e): called", e);
+
+        exceptions.add(e);
+    }
+
+    /**
+     * Checks that no exceptions have been received.
+     *
+     * @return <tt>true</tt> if no exceptions have been received, <tt>false</tt> otherwise.
+     */
+    public boolean assertNoExceptions()
+    {
+        return exceptions.isEmpty();
+    }
+
+    /**
+     * Checks that exactly one exception has been received.
+     *
+     * @return <tt>true</tt> if exactly one exception been received, <tt>false</tt> otherwise.
+     */
+    public boolean assertOneJMSException()
+    {
+        return exceptions.size() == 1;
+    }
+
+    /**
+     * Checks that exactly one exception, with a linked cause of the specified type, has been received.
+     *
+     * @return <tt>true</tt> if exactly one exception, with a linked cause of the specified type, been received,
+     *         <tt>false</tt> otherwise.
+     */
+    public boolean assertOneJMSExceptionWithLinkedCause(Class aClass)
+    {
+        if (exceptions.size() == 1)
+        {
+            JMSException e = exceptions.get(0);
+
+            Exception linkedCause = e.getLinkedException();
+
+            if ((linkedCause != null) && aClass.isInstance(linkedCause))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Reports the number of exceptions held by this monitor.
+     *
+     * @return The number of exceptions held by this monitor.
+     */
+    public int size()
+    {
+        return exceptions.size();
+    }
+
+    /**
+     * Clears the record of received exceptions.
+     */
+    public void reset()
+    {
+        exceptions = new ArrayList();
+    }
+
+    /**
+     * Provides a dump of the stack traces of all exceptions that this exception monitor was notified of. Mainly
+     * use for debugging/test failure reporting purposes.
+     *
+     * @return A string containing a dump of the stack traces of all exceptions.
+     */
+    public String toString()
+    {
+        String result = "ExceptionMonitor: holds " + exceptions.size() + " exceptions.\n\n";
+
+        for (JMSException ex : exceptions)
+        {
+            result += getStackTrace(ex) + "\n";
+        }
+
+        return result;
+    }
+
+    /**
+     * Prints an exception stack trace into a string.
+     *
+     * @param t The throwable to get the stack trace from.
+     *
+     * @return A string containing the throwables stack trace.
+     */
+    public static String getStackTrace(Throwable t)
+    {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw, true);
+        t.printStackTrace(pw);
+        pw.flush();
+        sw.flush();
+
+        return sw.toString();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
new file mode 100644
index 0000000000..fa70e14d16
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
@@ -0,0 +1,280 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
+
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.test.framework.localcircuit.LocalCircuitImpl;
+import org.apache.qpid.test.framework.sequencers.CircuitFactory;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * FrameworkBaseCase provides a starting point for writing test cases against the test framework. Its main purpose is
+ * to provide some convenience methods for testing.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Create and clean up in-vm brokers on every test case.
+ * <tr><td> Produce lists of assertions from assertion creation calls.
+ * <tr><td> Produce JUnit failures from assertion failures.
+ * <tr><td> Convert failed assertions to error messages.
+ * </table>
+ */
+public class FrameworkBaseCase extends AsymptoticTestCase
+{
+    /** Used for debugging purposes. */
+    private static final Logger log = Logger.getLogger(FrameworkBaseCase.class);
+
+    /** Holds the test sequencer to create and run test circuits with. */
+    protected CircuitFactory circuitFactory = new DefaultCircuitFactory();
+
+    /**
+     * Creates a new test case with the specified name.
+     *
+     * @param name The test case name.
+     */
+    public FrameworkBaseCase(String name)
+    {
+        super(name);
+    }
+
+    /**
+     * Returns the test case sequencer that provides test circuit, and test sequence implementations. The sequencer
+     * that this base case returns by default is suitable for running a test circuit with both circuit ends colocated
+     * on the same JVM.
+     *
+     * @return The test case sequencer.
+     */
+    protected CircuitFactory getCircuitFactory()
+    {
+        return circuitFactory;
+    }
+
+    /**
+     * Overrides the default test circuit factory. Test decorators can use this to supply distributed test sequencers or
+     * other test circuit factory specializations.
+     *
+     * @param circuitFactory The new test circuit factory.
+     */
+    public void setCircuitFactory(CircuitFactory circuitFactory)
+    {
+        this.circuitFactory = circuitFactory;
+    }
+
+    /**
+     * Creates a list of assertions.
+     *
+     * @param asserts The assertions to compile in a list.
+     *
+     * @return A list of assertions.
+     */
+    protected List<Assertion> assertionList(Assertion... asserts)
+    {
+        List<Assertion> result = new ArrayList<Assertion>();
+
+        for (Assertion assertion : asserts)
+        {
+            result.add(assertion);
+        }
+
+        return result;
+    }
+
+    /**
+     * Generates a JUnit assertion exception (failure) if any assertions are passed into this method, also concatenating
+     * all of the error messages in the assertions together to form an error message to diagnose the test failure with.
+     *
+     * @param asserts The list of failed assertions.
+     */
+    protected void assertNoFailures(List<Assertion> asserts)
+    {
+        log.debug("protected void assertNoFailures(List<Assertion> asserts = " + asserts + "): called");
+
+        // Check if there are no assertion failures, and return without doing anything if so.
+        if ((asserts == null) || asserts.isEmpty())
+        {
+            return;
+        }
+
+        // Compile all of the assertion failure messages together.
+        String errorMessage = assertionsToString(asserts);
+
+        // Fail with the error message from all of the assertions.
+        fail(errorMessage);
+    }
+
+    /**
+     * Converts a list of failed assertions into an error message.
+     *
+     * @param asserts The failed assertions.
+     *
+     * @return The error message.
+     */
+    protected String assertionsToString(List<Assertion> asserts)
+    {
+        String errorMessage = "";
+
+        for (Assertion assertion : asserts)
+        {
+            errorMessage += assertion.toString() + "\n";
+        }
+
+        return errorMessage;
+    }
+
+    /**
+     * Ensures that the in-vm broker is created and initialized.
+     *
+     * @throws Exception Any exceptions allowed to fall through and fail the test.
+     */
+    protected void setUp() throws Exception
+    {
+        NDC.push(getName());
+
+        // Ensure that the in-vm broker is created.
+        TransportConnection.createVMBroker(1);
+    }
+
+    /**
+     * Ensures that the in-vm broker is cleaned up after each test run.
+     */
+    protected void tearDown()
+    {
+        try
+        {
+            // Ensure that the in-vm broker is cleaned up so that the next test starts afresh.
+            TransportConnection.killVMBroker(1);
+            ApplicationRegistry.remove(1);
+        }
+        finally
+        {
+            NDC.pop();
+        }
+    }
+
+    /**
+     * Should provide a translation from the junit method name of a test to its test case name as known to the test
+     * clients that will run the test. The purpose of this is to convert the JUnit method name into the correct test
+     * case name to place into the test invite. For example the method "testP2P" might map onto the interop test case
+     * name "TC2_BasicP2P".
+     *
+     * @param methodName The name of the JUnit test method.
+     *
+     * @return The name of the corresponding interop test case.
+     */
+    public String getTestCaseNameForTestMethod(String methodName)
+    {
+        return methodName;
+    }
+
+    /**
+     * DefaultCircuitFactory is a test sequencer that creates test circuits with publishing and receiving ends rooted
+     * on the same JVM.
+     */
+    public class DefaultCircuitFactory implements CircuitFactory
+    {
+        /**
+         * Holds a test coordinating conversation with the test clients. This should consist of assigning the test roles,
+         * begining the test and gathering the test reports from the participants.
+         *
+         * @param testCircuit    The test circuit.
+         * @param assertions     The list of assertions to apply to the test circuit.
+         * @param testProperties The test case definition.
+         */
+        public void sequenceTest(Circuit testCircuit, List<Assertion> assertions, Properties testProperties)
+        {
+            assertNoFailures(testCircuit.test(1, assertions));
+        }
+
+        /**
+         * Creates a test circuit for the test, configered by the test parameters specified.
+         *
+         * @param testProperties The test parameters.
+         * @return A test circuit.
+         */
+        public Circuit createCircuit(ParsedProperties testProperties)
+        {
+            return LocalCircuitImpl.createCircuit(testProperties);
+        }
+
+        /**
+         * Sets the sender test client to coordinate the test with.
+         *
+         * @param sender The contact details of the sending client in the test.
+         */
+        public void setSender(TestClientDetails sender)
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+
+        /**
+         * Sets the receiving test client to coordinate the test with.
+         *
+         * @param receiver The contact details of the sending client in the test.
+         */
+        public void setReceiver(TestClientDetails receiver)
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+
+        /**
+         * Supplies the sending test client.
+         *
+         * @return The sending test client.
+         */
+        public TestClientDetails getSender()
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+
+        /**
+         * Supplies the receiving test client.
+         *
+         * @return The receiving test client.
+         */
+        public List<TestClientDetails> getReceivers()
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+
+        /**
+         * Accepts the conversation factory over which to hold the test coordinating conversation.
+         *
+         * @param conversationFactory The conversation factory to coordinate the test over.
+         */
+        public void setConversationFactory(ConversationFactory conversationFactory)
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
new file mode 100644
index 0000000000..7bd65618e3
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
@@ -0,0 +1,11 @@
+package org.apache.qpid.test.framework;
+
+/**
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public class FrameworkClientBaseCase
+{
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java b/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
new file mode 100644
index 0000000000..3fac969369
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
@@ -0,0 +1,105 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import org.apache.log4j.Logger;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * MessageMonitor is used to record information about messages received. This will provide methods to check various
+ * properties, such as the type, number and content of messages received in order to verify the correct behaviour of
+ * tests.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Count incoming messages.
+ * <tr><td> Record time ellapsed since the arrival of the first message.
+ * <tr><td> Reset all counts and timings.
+ * </table>
+ */
+public class MessageMonitor implements MessageListener
+{
+    /** Used for debugging. */
+    private final Logger log = Logger.getLogger(MessageMonitor.class);
+
+    /** Holds the count of messages received since the last query. */
+    protected AtomicInteger numMessages = new AtomicInteger();
+
+    /** Holds the time of arrival of the first message. */
+    protected Long firstMessageTime = null;
+
+    /**
+     * Handles received messages. Does Nothing.
+     *
+     * @param message The message. Ignored.
+     */
+    public void onMessage(Message message)
+    {
+        // log.debug("public void onMessage(Message message): called");
+
+        numMessages.getAndIncrement();
+    }
+
+    /**
+     * Gets the count of messages.
+     *
+     * @return The count of messages.
+     */
+    public int getNumMessage()
+    {
+        if (firstMessageTime == null)
+        {
+            firstMessageTime = System.nanoTime();
+        }
+
+        return numMessages.get();
+    }
+
+    /**
+     * Gets the time elapsed since the first message arrived, in nanos, or zero if no messages have arrived yet.
+     *
+     * @return The time elapsed since the first message arrived, in nanos, or zero if no messages have arrived yet.
+     */
+    public long getTime()
+    {
+        if (firstMessageTime != null)
+        {
+            return System.nanoTime() - firstMessageTime;
+        }
+        else
+        {
+            return 0L;
+        }
+    }
+
+    /**
+     * Resets the message count and timer to zero.
+     */
+    public void reset()
+    {
+        numMessages.set(0);
+        firstMessageTime = null;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java b/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
new file mode 100644
index 0000000000..9e91286683
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
@@ -0,0 +1,485 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import org.apache.qpid.jms.Session;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import java.util.Properties;
+
+/**
+ * MessagingTestConfigProperties defines a set of property names and default values for specifying a messaging topology,
+ * and test parameters for running a messaging test over that topology. A Properties object holding some of these
+ * properties, superimposed onto the defaults, is used to establish test topologies and control test behaviour.
+ *
+ * <p/>A complete list of the parameters, default values and comments on their usage is provided here:
+ *
+ * <p/><table><caption>Parameters</caption>
+ * <tr><th> Parameter        <th> Default  <th> Comments
+ * <tr><td> messageSize      <td> 0        <td> Message size in bytes. Not including any headers.
+ * <tr><td> destinationName  <td> ping     <td> The root name to use to generate destination names to ping.
+ * <tr><td> persistent       <td> false    <td> Determines whether peristent delivery is used.
+ * <tr><td> transacted       <td> false    <td> Determines whether messages are sent/received in transactions.
+ * <tr><td> broker           <td> tcp://localhost:5672 <td> Determines the broker to connect to.
+ * <tr><td> virtualHost      <td> test     <td> Determines the virtual host to send all ping over.
+ * <tr><td> rate             <td> 0        <td> The maximum rate (in hertz) to send messages at. 0 means no limit.
+ * <tr><td> verbose          <td> false    <td> The verbose flag for debugging. Prints to console on every message.
+ * <tr><td> pubsub           <td> false    <td> Whether to ping topics or queues. Uses p2p by default.
+ * <tr><td> username         <td> guest    <td> The username to access the broker with.
+ * <tr><td> password         <td> guest    <td> The password to access the broker with.
+ * <tr><td> selector         <td> null     <td> Not used. Defines a message selector to filter pings with.
+ * <tr><td> destinationCount <td> 1        <td> The number of receivers listening to the pings.
+ * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.
+ * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.
+ * <tr><td> uniqueDests      <td> true     <td> Whether each receivers only listens to one ping destination or all.
+ * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.
+ * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:
+ *                                               0 - SESSION_TRANSACTED
+ *                                               1 - AUTO_ACKNOWLEDGE
+ *                                               2 - CLIENT_ACKNOWLEDGE
+ *                                               3 - DUPS_OK_ACKNOWLEDGE
+ *                                               257 - NO_ACKNOWLEDGE
+ *                                               258 - PRE_ACKNOWLEDGE
+ * <tr><td> maxPending       <td> 0        <td> The maximum size in bytes, of messages sent but not yet received.
+ *                                              Limits the volume of messages currently buffered on the client
+ *                                              or broker. Can help scale test clients by limiting amount of buffered
+ *                                              data to avoid out of memory errors.
+ * </table>
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Provide the names and defaults of all test parameters.
+ * </table>
+ *
+ * @todo Put a type-safe wrapper around these properties, but continue to store the parameters as properties. This is
+ *       simply to ensure that it is a simple matter to serialize/deserialize string/string pairs onto messages.
+ */
+public class MessagingTestConfigProperties extends ParsedProperties
+{
+    // ====================== Connection Properties ==================================
+
+    /** Holds the name of the default connection configuration. */
+    public static final String CONNECTION_NAME = "broker";
+
+    /** Holds the name of the property to get the initial context factory name from. */
+    public static final String INITIAL_CONTEXT_FACTORY_PROPNAME = "java.naming.factory.initial";
+
+    /** Defines the class to use as the initial context factory by default. */
+    public static final String INITIAL_CONTEXT_FACTORY_DEFAULT = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
+
+    /** Holds the name of the property to get the test broker url from. */
+    public static final String BROKER_PROPNAME = "qpid.test.broker";
+
+    /** Holds the default broker url for the test. */
+    public static final String BROKER_DEFAULT = "vm://:1";
+
+    /** Holds the name of the property to get the test broker virtual path. */
+    public static final String VIRTUAL_HOST_PROPNAME = "virtualHost";
+
+    /** Holds the default virtual path for the test. */
+    public static final String VIRTUAL_HOST_DEFAULT = "";
+
+    /** Holds the name of the property to get the broker access username from. */
+    public static final String USERNAME_PROPNAME = "username";
+
+    /** Holds the default broker log on username. */
+    public static final String USERNAME_DEFAULT = "guest";
+
+    /** Holds the name of the property to get the broker access password from. */
+    public static final String PASSWORD_PROPNAME = "password";
+
+    /** Holds the default broker log on password. */
+    public static final String PASSWORD_DEFAULT = "guest";
+
+    // ====================== Messaging Topology Properties ==========================
+
+    /** Holds the name of the property to get the bind publisher procuder flag from. */
+    public static final String PUBLISHER_PRODUCER_BIND_PROPNAME = "publisherProducerBind";
+
+    /** Holds the default value of the publisher producer flag. */
+    public static final boolean PUBLISHER_PRODUCER_BIND_DEFAULT = true;
+
+    /** Holds the name of the property to get the bind publisher procuder flag from. */
+    public static final String PUBLISHER_CONSUMER_BIND_PROPNAME = "publisherConsumerBind";
+
+    /** Holds the default value of the publisher consumer flag. */
+    public static final boolean PUBLISHER_CONSUMER_BIND_DEFAULT = false;
+
+    /** Holds the name of the property to get the bind receivers procuder flag from. */
+    public static final String RECEIVER_PRODUCER_BIND_PROPNAME = "receiverProducerBind";
+
+    /** Holds the default value of the receivers producer flag. */
+    public static final boolean RECEIVER_PRODUCER_BIND_DEFAULT = false;
+
+    /** Holds the name of the property to get the bind receivers procuder flag from. */
+    public static final String RECEIVER_CONSUMER_BIND_PROPNAME = "receiverConsumerBind";
+
+    /** Holds the default value of the receivers consumer flag. */
+    public static final boolean RECEIVER_CONSUMER_BIND_DEFAULT = true;
+
+    /** Holds the name of the property to get the publishers consumer active flag from. */
+    public static final String PUBLISHER_CONSUMER_ACTIVE_PROPNAME = "publisherConsumerActive";
+
+    /** Holds the default value of the publishers consumer active flag. */
+    public static final boolean PUBLISHER_CONSUMER_ACTIVE_DEFAULT = true;
+
+    /** Holds the name of the property to get the receivers consumer active flag from. */
+    public static final String RECEIVER_CONSUMER_ACTIVE_PROPNAME = "receiverConsumerActive";
+
+    /** Holds the default value of the receivers consumer active flag. */
+    public static final boolean RECEIVER_CONSUMER_ACTIVE_DEFAULT = true;
+
+    /** Holds the name of the property to get the destination name root from. */
+    public static final String SEND_DESTINATION_NAME_ROOT_PROPNAME = "sendDestinationRoot";
+
+    /** Holds the root of the name of the default destination to send to. */
+    public static final String SEND_DESTINATION_NAME_ROOT_DEFAULT = "sendTo";
+
+    /** Holds the name of the property to get the destination name root from. */
+    public static final String RECEIVE_DESTINATION_NAME_ROOT_PROPNAME = "receiveDestinationRoot";
+
+    /** Holds the root of the name of the default destination to send to. */
+    public static final String RECEIVE_DESTINATION_NAME_ROOT_DEFAULT = "receiveFrom";
+
+    /** Holds the name of the proeprty to get the destination count from. */
+    public static final String DESTINATION_COUNT_PROPNAME = "destinationCount";
+
+    /** Defines the default number of destinations to ping. */
+    public static final int DESTINATION_COUNT_DEFAULT = 1;
+
+    /** Holds the name of the property to get the p2p or pub/sub messaging mode from. */
+    public static final String PUBSUB_PROPNAME = "pubsub";
+
+    /** Holds the pub/sub mode default, true means ping a topic, false means ping a queue. */
+    public static final boolean PUBSUB_DEFAULT = false;
+
+    // ======================  JMS Options and Flags =================================
+
+    /** Holds the name of the property to get the test delivery mode from. */
+    public static final String PERSISTENT_MODE_PROPNAME = "persistent";
+
+    /** Holds the message delivery mode to use for the test. */
+    public static final boolean PERSISTENT_MODE_DEFAULT = false;
+
+    /** Holds the name of the property to get the test transactional mode from. */
+    public static final String TRANSACTED_PROPNAME = "transacted";
+
+    /** Holds the transactional mode to use for the test. */
+    public static final boolean TRANSACTED_DEFAULT = false;
+
+    /** Holds the name of the property to set the no local flag from. */
+    public static final String NO_LOCAL_PROPNAME = "noLocal";
+
+    /** Defines the default value of the no local flag to use when consuming messages. */
+    public static final boolean NO_LOCAL_DEFAULT = false;
+
+    /** Holds the name of the property to get the message acknowledgement mode from. */
+    public static final String ACK_MODE_PROPNAME = "ackMode";
+
+    /** Defines the default message acknowledgement mode. */
+    public static final int ACK_MODE_DEFAULT = Session.AUTO_ACKNOWLEDGE;
+
+    /** Holds the name of the property to get the durable subscriptions flag from, when doing pub/sub messaging. */
+    public static final String DURABLE_SUBSCRIPTION_PROPNAME = "durableSubscription";
+
+    /** Defines the default value of the durable subscriptions flag. */
+    public static final boolean DURABLE_SUBSCRIPTION_DEFAULT = false;
+
+    // ======================  Qpid Options and Flags ================================
+
+    /** Holds the name of the property to set the exclusive flag from. */
+    public static final String EXCLUSIVE_PROPNAME = "exclusive";
+
+    /** Defines the default value of the exclusive flag to use when consuming messages. */
+    public static final boolean EXCLUSIVE_DEFAULT = false;
+
+    /** Holds the name of the property to set the immediate flag from. */
+    public static final String IMMEDIATE_PROPNAME = "immediate";
+
+    /** Defines the default value of the immediate flag to use when sending messages. */
+    public static final boolean IMMEDIATE_DEFAULT = false;
+
+    /** Holds the name of the property to set the mandatory flag from. */
+    public static final String MANDATORY_PROPNAME = "mandatory";
+
+    /** Defines the default value of the mandatory flag to use when sending messages. */
+    public static final boolean MANDATORY_DEFAULT = false;
+
+    /** Holds the name of the property to get the durable destinations flag from. */
+    public static final String DURABLE_DESTS_PROPNAME = "durableDests";
+
+    /** Default value for the durable destinations flag. */
+    public static final boolean DURABLE_DESTS_DEFAULT = false;
+
+    /** Holds the name of the proeprty to set the prefetch size from. */
+    public static final String PREFETCH_PROPNAME = "prefetch";
+
+    /** Defines the default prefetch size to use when consuming messages. */
+    public static final int PREFETCH_DEFAULT = 100;
+
+    // ======================  Common Test Parameters ================================
+
+    /** Holds the name of the property to get the test message size from. */
+    public static final String MESSAGE_SIZE_PROPNAME = "messageSize";
+
+    /** Used to set up a default message size. */
+    public static final int MESSAGE_SIZE_DEAFULT = 0;
+
+    /** Holds the name of the property to get the message rate from. */
+    public static final String RATE_PROPNAME = "rate";
+
+    /** Defines the default rate (in pings per second) to send pings at. 0 means as fast as possible, no restriction. */
+    public static final int RATE_DEFAULT = 0;
+
+    /** Holds the name of the proeprty to get the. */
+    public static final String SELECTOR_PROPNAME = "selector";
+
+    /** Holds the default message selector. */
+    public static final String SELECTOR_DEFAULT = "";
+
+    /** Holds the name of the property to get the waiting timeout for response messages. */
+    public static final String TIMEOUT_PROPNAME = "timeout";
+
+    /** Default time to wait before assuming that a ping has timed out. */
+    public static final long TIMEOUT_DEFAULT = 30000;
+
+    /** Holds the name of the property to get the commit batch size from. */
+    public static final String TX_BATCH_SIZE_PROPNAME = "commitBatchSize";
+
+    /** Defines the default number of pings to send in each transaction when running transactionally. */
+    public static final int TX_BATCH_SIZE_DEFAULT = 1;
+
+    /** Holds the name of the property to set the maximum amount of pending message data for a producer to hold. */
+    public static final String MAX_PENDING_PROPNAME = "maxPending";
+
+    /** Defines the default maximum quantity of pending message data to allow producers to hold. */
+    public static final int MAX_PENDING_DEFAULT = 0;
+
+    /** Holds the name of the property to get the verbose mode proeprty from. */
+    public static final String VERBOSE_PROPNAME = "verbose";
+
+    /** Holds the default verbose mode. */
+    public static final boolean VERBOSE_DEFAULT = false;
+
+    /** Holds the default configuration properties. */
+    public static ParsedProperties defaults = new ParsedProperties();
+
+    static
+    {
+        defaults.setPropertyIfNull(INITIAL_CONTEXT_FACTORY_PROPNAME, INITIAL_CONTEXT_FACTORY_DEFAULT);
+        // defaults.setPropertyIfNull(CONNECTION_PROPNAME, CONNECTION_DEFAULT);
+        defaults.setPropertyIfNull(MESSAGE_SIZE_PROPNAME, MESSAGE_SIZE_DEAFULT);
+        defaults.setPropertyIfNull(PUBLISHER_PRODUCER_BIND_PROPNAME, PUBLISHER_PRODUCER_BIND_DEFAULT);
+        defaults.setPropertyIfNull(PUBLISHER_CONSUMER_BIND_PROPNAME, PUBLISHER_CONSUMER_BIND_DEFAULT);
+        defaults.setPropertyIfNull(RECEIVER_PRODUCER_BIND_PROPNAME, RECEIVER_PRODUCER_BIND_DEFAULT);
+        defaults.setPropertyIfNull(RECEIVER_CONSUMER_BIND_PROPNAME, RECEIVER_CONSUMER_BIND_DEFAULT);
+        defaults.setPropertyIfNull(PUBLISHER_CONSUMER_ACTIVE_PROPNAME, PUBLISHER_CONSUMER_ACTIVE_DEFAULT);
+        defaults.setPropertyIfNull(RECEIVER_CONSUMER_ACTIVE_PROPNAME, RECEIVER_CONSUMER_ACTIVE_DEFAULT);
+        defaults.setPropertyIfNull(SEND_DESTINATION_NAME_ROOT_PROPNAME, SEND_DESTINATION_NAME_ROOT_DEFAULT);
+        defaults.setPropertyIfNull(RECEIVE_DESTINATION_NAME_ROOT_PROPNAME, RECEIVE_DESTINATION_NAME_ROOT_DEFAULT);
+        defaults.setPropertyIfNull(PERSISTENT_MODE_PROPNAME, PERSISTENT_MODE_DEFAULT);
+        defaults.setPropertyIfNull(TRANSACTED_PROPNAME, TRANSACTED_DEFAULT);
+        defaults.setPropertyIfNull(BROKER_PROPNAME, BROKER_DEFAULT);
+        defaults.setPropertyIfNull(VIRTUAL_HOST_PROPNAME, VIRTUAL_HOST_DEFAULT);
+        defaults.setPropertyIfNull(RATE_PROPNAME, RATE_DEFAULT);
+        defaults.setPropertyIfNull(VERBOSE_PROPNAME, VERBOSE_DEFAULT);
+        defaults.setPropertyIfNull(PUBSUB_PROPNAME, PUBSUB_DEFAULT);
+        defaults.setPropertyIfNull(USERNAME_PROPNAME, USERNAME_DEFAULT);
+        defaults.setPropertyIfNull(PASSWORD_PROPNAME, PASSWORD_DEFAULT);
+        defaults.setPropertyIfNull(SELECTOR_PROPNAME, SELECTOR_DEFAULT);
+        defaults.setPropertyIfNull(DESTINATION_COUNT_PROPNAME, DESTINATION_COUNT_DEFAULT);
+        defaults.setPropertyIfNull(TIMEOUT_PROPNAME, TIMEOUT_DEFAULT);
+        defaults.setPropertyIfNull(TX_BATCH_SIZE_PROPNAME, TX_BATCH_SIZE_DEFAULT);
+        defaults.setPropertyIfNull(DURABLE_DESTS_PROPNAME, DURABLE_DESTS_DEFAULT);
+        defaults.setPropertyIfNull(ACK_MODE_PROPNAME, ACK_MODE_DEFAULT);
+        defaults.setPropertyIfNull(DURABLE_SUBSCRIPTION_PROPNAME, DURABLE_SUBSCRIPTION_DEFAULT);
+        defaults.setPropertyIfNull(MAX_PENDING_PROPNAME, MAX_PENDING_DEFAULT);
+        defaults.setPropertyIfNull(PREFETCH_PROPNAME, PREFETCH_DEFAULT);
+        defaults.setPropertyIfNull(NO_LOCAL_PROPNAME, NO_LOCAL_DEFAULT);
+        defaults.setPropertyIfNull(EXCLUSIVE_PROPNAME, EXCLUSIVE_DEFAULT);
+        defaults.setPropertyIfNull(IMMEDIATE_PROPNAME, IMMEDIATE_DEFAULT);
+        defaults.setPropertyIfNull(MANDATORY_PROPNAME, MANDATORY_DEFAULT);
+    }
+
+    /**
+     * Creates a test configuration based on the defaults.
+     */
+    public MessagingTestConfigProperties()
+    {
+        super(defaults);
+    }
+
+    /**
+     * Creates a test configuration based on the supplied properties.
+     *
+     * @param properties The test configuration.
+     */
+    public MessagingTestConfigProperties(Properties properties)
+    {
+        super(properties);
+    }
+
+    public int getMessageSize()
+    {
+        return getPropertyAsInteger(MESSAGE_SIZE_PROPNAME);
+    }
+
+    public boolean getPublisherProducerBind()
+    {
+        return getPropertyAsBoolean(PUBLISHER_PRODUCER_BIND_PROPNAME);
+    }
+
+    public boolean getPublisherConsumerBind()
+    {
+        return getPropertyAsBoolean(PUBLISHER_CONSUMER_BIND_PROPNAME);
+    }
+
+    public boolean getReceiverProducerBind()
+    {
+        return getPropertyAsBoolean(RECEIVER_PRODUCER_BIND_PROPNAME);
+    }
+
+    public boolean getReceiverConsumerBind()
+    {
+        return getPropertyAsBoolean(RECEIVER_CONSUMER_BIND_PROPNAME);
+    }
+
+    public boolean getPublisherConsumerActive()
+    {
+        return getPropertyAsBoolean(PUBLISHER_CONSUMER_ACTIVE_PROPNAME);
+    }
+
+    public boolean getReceiverConsumerActive()
+    {
+        return getPropertyAsBoolean(RECEIVER_CONSUMER_ACTIVE_PROPNAME);
+    }
+
+    public String getSendDestinationNameRoot()
+    {
+        return getProperty(SEND_DESTINATION_NAME_ROOT_PROPNAME);
+    }
+
+    public String getReceiveDestinationNameRoot()
+    {
+        return getProperty(RECEIVE_DESTINATION_NAME_ROOT_PROPNAME);
+    }
+
+    public boolean getPersistentMode()
+    {
+        return getPropertyAsBoolean(PERSISTENT_MODE_PROPNAME);
+    }
+
+    public boolean getTransacted()
+    {
+        return getPropertyAsBoolean(TRANSACTED_PROPNAME);
+    }
+
+    public String getBroker()
+    {
+        return getProperty(BROKER_PROPNAME);
+    }
+
+    public String getVirtualHost()
+    {
+        return getProperty(VIRTUAL_HOST_PROPNAME);
+    }
+
+    public String getRate()
+    {
+        return getProperty(RATE_PROPNAME);
+    }
+
+    public boolean getPubsub()
+    {
+        return getPropertyAsBoolean(PUBSUB_PROPNAME);
+    }
+
+    public String getUsername()
+    {
+        return getProperty(USERNAME_PROPNAME);
+    }
+
+    public String getPassword()
+    {
+        return getProperty(PASSWORD_PROPNAME);
+    }
+
+    public int getDestinationCount()
+    {
+        return getPropertyAsInteger(DESTINATION_COUNT_PROPNAME);
+    }
+
+    public long getTimeout()
+    {
+        return getPropertyAsLong(TIMEOUT_PROPNAME);
+    }
+
+    public int getTxBatchSize()
+    {
+        return getPropertyAsInteger(TX_BATCH_SIZE_PROPNAME);
+    }
+
+    public boolean getDurableDests()
+    {
+        return getPropertyAsBoolean(DURABLE_DESTS_PROPNAME);
+    }
+
+    public int getAckMode()
+    {
+        return getPropertyAsInteger(ACK_MODE_PROPNAME);
+    }
+
+    public boolean getDurableSubscription()
+    {
+        return getPropertyAsBoolean(DURABLE_SUBSCRIPTION_PROPNAME);
+    }
+
+    public int getMaxPending()
+    {
+        return getPropertyAsInteger(MAX_PENDING_PROPNAME);
+    }
+
+    public int getPrefecth()
+    {
+        return getPropertyAsInteger(PREFETCH_PROPNAME);
+    }
+
+    public boolean getNoLocal()
+    {
+        return getPropertyAsBoolean(NO_LOCAL_PROPNAME);
+    }
+
+    public boolean getExclusive()
+    {
+        return getPropertyAsBoolean(EXCLUSIVE_PROPNAME);
+    }
+
+    public boolean getImmediate()
+    {
+        return getPropertyAsBoolean(IMMEDIATE_PROPNAME);
+    }
+
+    public boolean getMandatory()
+    {
+        return getPropertyAsBoolean(MANDATORY_PROPNAME);
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
new file mode 100644
index 0000000000..8e61deedcf
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
@@ -0,0 +1,56 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+/**
+ * A Publisher is a {@link CircuitEnd} that represents the status of the publishing side of a test circuit. Its main
+ * purpose is to provide assertions that can be applied to test the behaviour of the publishers.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Provide assertion that the publishers received no exceptions.
+ * <tr><td> Provide assertion that the publishers received a no consumers error code on every message.
+ * <tr><td> Provide assertion that the publishers received a no route error code on every message.
+ * </table>
+ */
+public interface Publisher
+{
+    /**
+     * Provides an assertion that the publisher encountered no exceptions.
+     *
+     * @return An assertion that the publisher encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion();
+
+    /**
+     * Provides an assertion that the publisher got a no consumers exception on every message.
+     *
+     * @return An assertion that the publisher got a no consumers exception on every message.
+     */
+    public Assertion noConsumersAssertion();
+
+    /**
+     * Provides an assertion that the publisher got a no rout exception on every message.
+     *
+     * @return An assertion that the publisher got a no rout exception on every message.
+     */
+    public Assertion noRouteAssertion();
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java b/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
new file mode 100644
index 0000000000..f1343b9997
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
@@ -0,0 +1,48 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+/**
+ * A Receiver is a {@link CircuitEnd} that represents the status of the receiving side of a test circuit. Its main
+ * purpose is to provide assertions that can be applied to check the behaviour of the receivers.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Provide assertion that the receivers received no exceptions.
+ * <tr><td> Provide assertion that the receivers received all test messages sent to it.
+ * </table>
+ */
+public interface Receiver
+{
+    /**
+     * Provides an assertion that the receivers encountered no exceptions.
+     *
+     * @return An assertion that the receivers encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion();
+
+    /**
+     * Provides an assertion that the receivers got all messages that were sent to it.
+     *
+     * @return An assertion that the receivers got all messages that were sent to it.
+     */
+    public Assertion allMessagesAssertion();
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java b/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
new file mode 100644
index 0000000000..7498f2b6b5
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
@@ -0,0 +1,86 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+/**
+ * TestClientDetails is used to encapsulate information about an interop test client. It pairs together the unique
+ * name of the client, and the route on which it listens to its control messages.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Record test clients control addresses together with their names.
+ * </table>
+ */
+public class TestClientDetails
+{
+    /** The test clients name. */
+    public String clientName;
+
+    /* The test clients unique sequence number. Not currently used. */
+
+    /** The routing key of the test clients control topic. */
+    public String privateControlKey;
+
+    /**
+     * Two TestClientDetails are considered to be equal, iff they have the same client name.
+     *
+     * @param o The object to compare to.
+     *
+     * @return <tt>If the object to compare to is a TestClientDetails equal to this one, <tt>false</tt> otherwise.
+     */
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+
+        if (!(o instanceof TestClientDetails))
+        {
+            return false;
+        }
+
+        final TestClientDetails testClientDetails = (TestClientDetails) o;
+
+        return !((clientName != null) ? (!clientName.equals(testClientDetails.clientName))
+                                      : (testClientDetails.clientName != null));
+    }
+
+    /**
+     * Computes a hash code compatible with the equals method; based on the client name alone.
+     *
+     * @return A hash code for this.
+     */
+    public int hashCode()
+    {
+        return ((clientName != null) ? clientName.hashCode() : 0);
+    }
+
+    /**
+     * Outputs the client name and address details. Mostly used for debugging purposes.
+     *
+     * @return The client name and address.
+     */
+    public String toString()
+    {
+        return "TestClientDetails: [ clientName = " + clientName + ", privateControlKey = " + privateControlKey + " ]";
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java b/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
new file mode 100644
index 0000000000..7219d0c2da
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
@@ -0,0 +1,156 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework;
+
+import org.apache.log4j.Logger;
+
+import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import java.util.Properties;
+import java.util.Map;
+
+/**
+ * TestUtils provides static helper methods that are usefull for writing tests against QPid.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Create connections from test properties. <td> {@link MessagingTestConfigProperties}
+ * <tr><td> Inject a short pause in a test.
+ * </table>
+ */
+public class TestUtils
+{
+    /** Used for debugging. */
+    private static Logger log = Logger.getLogger(TestUtils.class);
+
+    /**
+     * Establishes a JMS connection using a set of properties and qpids built in JNDI implementation. This is a simple
+     * convenience method for code that does not anticipate handling connection failures. All exceptions that indicate
+     * that the connection has failed, are wrapped as rutime exceptions, presumably handled by a top level failure
+     * handler.
+     *
+     * <p/>This utility makes use of the following test parameters from {@link MessagingTestConfigProperties} to control
+     * the connection creation:
+     *
+     * <p/><table>
+     * <tr><td> {@link MessagingTestConfigProperties#USERNAME_PROPNAME} <td> The username.
+     * <tr><td> {@link MessagingTestConfigProperties#PASSWORD_PROPNAME} <td> The password.
+     * <tr><td> {@link MessagingTestConfigProperties#VIRTUAL_HOST_PROPNAME} <td> The virtual host name.
+     * <tr><td> {@link MessagingTestConfigProperties#BROKER_PROPNAME} <td> The broker URL.
+     * <tr><td> {@link MessagingTestConfigProperties#CONNECTION_NAME} <td> The broker name in the initial context.
+     *
+     * @param messagingProps Connection properties as defined in {@link MessagingTestConfigProperties}.
+     *
+     * @return A JMS conneciton.
+     */
+    public static Connection createConnection(ParsedProperties messagingProps)
+    {
+        log.debug("public static Connection createConnection(ParsedProperties messagingProps = " + messagingProps
+            + "): called");
+
+        try
+        {
+            // Extract the configured connection properties from the test configuration.
+            String conUsername = messagingProps.getProperty(USERNAME_PROPNAME);
+            String conPassword = messagingProps.getProperty(PASSWORD_PROPNAME);
+            String virtualHost = messagingProps.getProperty(VIRTUAL_HOST_PROPNAME);
+            String brokerUrl = messagingProps.getProperty(BROKER_PROPNAME);
+
+            // Create the broker connection url.
+            String connectionString =
+                "amqp://" + conUsername + ":" + conPassword + "@clientid/" + ((virtualHost != null) ? virtualHost : "")
+                + "?brokerlist='" + brokerUrl + "'";
+
+            // Create properties to create the initial context from, and inject the connection factory configuration
+            // for the defined connection name into it.
+            messagingProps.setProperty("connectionfactory." + CONNECTION_NAME, connectionString);
+
+            Context ctx = new InitialContext(messagingProps);
+
+            ConnectionFactory cf = (ConnectionFactory) ctx.lookup(CONNECTION_NAME);
+            Connection connection = cf.createConnection();
+
+            return connection;
+        }
+        catch (NamingException e)
+        {
+            throw new RuntimeException("Got JNDI NamingException whilst looking up the connection factory.", e);
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Could not establish connection due to JMSException.", e);
+        }
+    }
+
+    /**
+     * Pauses for the specified length of time. In the event of failing to pause for at least that length of time
+     * due to interuption of the thread, a RutimeException is raised to indicate the failure. The interupted status
+     * of the thread is restores in that case. This method should only be used when it is expected that the pause
+     * will be succesfull, for example in test code that relies on inejecting a pause.
+     *
+     * @param t The minimum time to pause for in milliseconds.
+     */
+    public static void pause(long t)
+    {
+        try
+        {
+            Thread.sleep(t);
+        }
+        catch (InterruptedException e)
+        {
+            // Restore the interrupted status
+            Thread.currentThread().interrupt();
+
+            throw new RuntimeException("Failed to generate the requested pause length.", e);
+        }
+    }
+
+    /**
+     * Sets properties of different types on a JMS Message.
+     *
+     * @param message    The message to set properties on.
+     * @param properties The property name/value pairs to set.
+     *
+     * @throws javax.jms.JMSException All underlying JMSExceptions are allowed to fall through.
+     *
+     * @todo Move this helper method somewhere else. For example, TestUtils.
+     */
+    public static void setPropertiesOnMessage(Message message, Map<Object, Object> properties) throws JMSException
+    {
+        for (Map.Entry<Object, Object> entry : properties.entrySet())
+        {
+            String name = entry.getKey().toString();
+            Object value = entry.getValue();
+
+            message.setObjectProperty(name, value);
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
new file mode 100644
index 0000000000..51b839d51e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
@@ -0,0 +1,45 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+/**
+ * ClockSynchFailureException represents failure of a {@link ClockSynchronizer} to achieve synchronization. This could
+ * be because a reference signal is not available, or because a desired accurracy cannot be attained, for example.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Represent failure to achieve synchronization.
+ * </table>
+ */
+public class ClockSynchFailureException extends Exception
+{
+    /**
+     * Creates a clock synch failure exception.
+     *
+     * @param message The detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+     * @param cause   The cause (which is saved for later retrieval by the {@link #getCause()} method).  (A <tt>null</tt>
+     *                value is permitted, and indicates that the cause is nonexistent or unknown.)
+     */
+    public ClockSynchFailureException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
new file mode 100644
index 0000000000..88f0043067
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
@@ -0,0 +1,123 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+import org.apache.log4j.Logger;
+
+import uk.co.thebadgerset.junit.extensions.ShutdownHookable;
+import uk.co.thebadgerset.junit.extensions.Throttle;
+
+/**
+ * ClockSynchThread is a convenient utility for running a thread that periodically synchronizes the clock against
+ * a reference. Supply it with a {@link ClockSynchronizer} and a {@link Throttle} and it will continually keep the
+ * clock up-to-date at a rate determined by the throttle.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Continually sychronize the clock at a throttled rate.
+ * </table>
+ */
+public class ClockSynchThread extends Thread implements ShutdownHookable
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(ClockSynchThread.class);
+
+    /** Holds the clock syncher for the synch thread. */
+    private ClockSynchronizer clockSyncher;
+
+    /** Holds the throttle to limit the synch rate. */
+    private Throttle throttle;
+
+    /** Flag to indicate that the periodic clock syncher should keep running. */
+    boolean doSynch = true;
+
+    /**
+     * Creates a clock synchronizer thread from a clock synchronizer and a throttle.
+     *
+     * @param syncher  The clock synchronizer.
+     * @param throttle The throttle.
+     */
+    public ClockSynchThread(ClockSynchronizer syncher, Throttle throttle)
+    {
+        this.clockSyncher = syncher;
+        this.throttle = throttle;
+    }
+
+    /**
+     * Terminates the synchronization thread.
+     */
+    public void terminate()
+    {
+        doSynch = false;
+    }
+
+    /**
+     * Continually updates the clock, until {@link #terminate()} is called.
+     */
+    public void run()
+    {
+        while (doSynch)
+        {
+            // Perform a clock clockSynch.
+            try
+            {
+                // Wait controlled by the throttle before doing the next synch.
+                throttle.throttle();
+
+                clockSyncher.synch();
+                log.debug("Clock synched, delta = " + clockSyncher.getDelta() + ", epsilon = " + clockSyncher.getEpsilon()
+                    + ".");
+            }
+            // Terminate the synch thread if the synchronization cannot be achieved.
+            catch (ClockSynchFailureException e)
+            {
+                log.debug("Cannot synchronize the clock (reference service may be down). Terminating the synch thread.");
+                doSynch = false;
+            }
+        }
+    }
+
+    /**
+     * Gets the clock synchronizer that is kept continually up to date.
+     *
+     * @return The clock synchronizer that is kept continually up to date.
+     */
+    public ClockSynchronizer getClockSyncher()
+    {
+        return clockSyncher;
+    }
+
+    /**
+     * Supplies a shutdown hook, that terminates the synching thread.
+     *
+     * @return The shut down hook.
+     */
+    public Thread getShutdownHook()
+    {
+        return new Thread(new Runnable()
+                {
+                    public void run()
+                    {
+                        doSynch = false;
+                    }
+                });
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
new file mode 100644
index 0000000000..96485edbea
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
@@ -0,0 +1,69 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+/**
+ * ClockSynchronizer provides an interface through which two nodes may synchronize their clocks. It is expected that one
+ * node will act as the reference clock, to which no delta need be applied, and the other node will act as the slave,
+ * and which must apply a delta to its local clock to get a clock synchronized with the reference.
+ *
+ * <p/>The slave side will initiate the computation of a clock delta by calling the {@link #synch} method. This method
+ * will not return until the delta has been computed, at which point there is a method to return its value, as well as
+ * an estimate of the likely error (usually one standard deviation), in the synchronization. For convenience there is a
+ * {@link #nanoTime} method to return the value of System.nanoTime() with the delta added in.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Trigger a clock synchronziation.
+ * <tr><td> Compute a clock delta to apply to the local clock.
+ * <tr><td> Estimate the error in the synchronzation.
+ * </table>
+ */
+public interface ClockSynchronizer
+{
+    /**
+     * The slave side should call this to copute a clock delta with the reference.
+     *
+     * @throws ClockSynchFailureException If synchronization cannot be achieved.
+     */
+    public void synch() throws ClockSynchFailureException;
+
+    /**
+     * Gets the clock delta in nano seconds.
+     *
+     * @return The clock delta in nano seconds.
+     */
+    public long getDelta();
+
+    /**
+     * Gets an estimate of the clock error in nan seconds.
+     *
+     * @return An estimate of the clock error in nan seconds.
+     */
+    public long getEpsilon();
+
+    /**
+     * Gets the local clock time with any computed delta added in.
+     *
+     * @return The local clock time with any computed delta added in.
+     */
+    public long nanoTime();
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
new file mode 100644
index 0000000000..f448d5f23c
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
@@ -0,0 +1,73 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+/**
+ * LocalClockSynchronizer is a fake {@link ClockSynchronizer} that simply calls System.nanoTime(). It exists so that
+ * the same tests can be run distributed or locally, taking timings against the ClockSynchronizer interface without
+ * being aware of how they are being run.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Supply the local clock with no delta.
+ * </table>
+ */
+public class LocalClockSynchronizer implements ClockSynchronizer
+{
+    /**
+     * The slave side should call this to copute a clock delta with the reference.
+     *
+     * @throws org.apache.qpid.test.framework.clocksynch.ClockSynchFailureException
+     *          If synchronization cannot be achieved.
+     */
+    public void synch() throws ClockSynchFailureException
+    { }
+
+    /**
+     * Gets the clock delta in nano seconds.
+     *
+     * @return The clock delta in nano seconds.
+     */
+    public long getDelta()
+    {
+        return 0L;
+    }
+
+    /**
+     * Gets an estimate of the clock error in nan seconds.
+     *
+     * @return An estimate of the clock error in nan seconds.
+     */
+    public long getEpsilon()
+    {
+        return 0L;
+    }
+
+    /**
+     * Gets the local clock time with any computed delta added in.
+     *
+     * @return The local clock time with any computed delta added in.
+     */
+    public long nanoTime()
+    {
+        return System.nanoTime();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
new file mode 100644
index 0000000000..8b68097158
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
@@ -0,0 +1,166 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.net.*;
+import java.nio.ByteBuffer;
+
+import uk.co.thebadgerset.junit.extensions.ShutdownHookable;
+
+/**
+ * UDPClockReference supplies a refernce clock signal (generated from System.nanoTime()).
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Supply a reference clock signal.
+ * </table>
+ *
+ * @todo Port hard coded. Make configurable.
+ *
+ * @todo Errors rethrown as runtimes, or silently terminate the service. Could add better error handling if needed.
+ */
+public class UDPClockReference implements Runnable, ShutdownHookable
+{
+    /** Used for debugging. */
+    // private static final Logger log = Logger.getLogger(UDPClockReference.class);
+
+    /** Defines the timeout to use when polling the socket for time requests. */
+    private static final int TIMEOUT = 200;
+
+    /** Defines the port to run the clock reference on. */
+    public static final int REFERENCE_PORT = 4445;
+
+    /** Holds the socket to receive clock reference requests on. */
+    protected DatagramSocket socket = null;
+
+    /** Flag used to indicate that the time server should keep running. Set to false to terminate. */
+    protected boolean publish = true;
+
+    /**
+     * Creates a clock reference service on the standard port.
+     */
+    public UDPClockReference()
+    {
+        try
+        {
+            socket = new DatagramSocket(REFERENCE_PORT);
+            socket.setSoTimeout(TIMEOUT);
+        }
+        catch (SocketException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Implements the run loop for this reference time server. This waits for incoming time requests, and replies to
+     * any, with a message with the local time stamp in it. Periodically (controlled by {@link #TIMEOUT}), the run
+     * loop will check if the {@link #publish} flag has been cleared, and terminate the reference time service if so.
+     */
+    public void run()
+    {
+        byte[] buf = new byte[256];
+        ByteBuffer bbuf = ByteBuffer.wrap(buf);
+
+        while (publish)
+        {
+            try
+            {
+                // Wait for a reference time request.
+                DatagramPacket packet = new DatagramPacket(buf, buf.length);
+                boolean timedOut = false;
+
+                try
+                {
+                    socket.receive(packet);
+                }
+                catch (SocketTimeoutException e)
+                {
+                    timedOut = true;
+                }
+
+                if (!timedOut)
+                {
+                    // Work out from the received packet, where to reply to.
+                    InetAddress address = packet.getAddress();
+                    int port = packet.getPort();
+
+                    // Respond to the time request by sending back the local clock as the reference time.
+                    bbuf.putLong(System.nanoTime());
+                    bbuf.flip();
+                    packet = new DatagramPacket(bbuf.array(), bbuf.capacity(), address, port);
+
+                    socket.send(packet);
+                }
+            }
+            catch (IOException e)
+            {
+                publish = false;
+            }
+        }
+
+        socket.close();
+    }
+
+    /**
+     * Supplies a shutdown hook.
+     *
+     * @return The shut down hook.
+     */
+    public Thread getShutdownHook()
+    {
+        return new Thread(new Runnable()
+                {
+                    public void run()
+                    {
+                        publish = false;
+                    }
+                });
+    }
+
+    /**
+     * For testing purposes. Runs a reference clock on the default port.
+     *
+     * @param args None.
+     */
+    public static void main(String[] args)
+    {
+        try
+        {
+            // Create the clock reference service.
+            UDPClockReference clock = new UDPClockReference();
+
+            // Set up a shutdown hook for it.
+            Runtime.getRuntime().addShutdownHook(clock.getShutdownHook());
+
+            // Start the service.
+            clock.run();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
new file mode 100644
index 0000000000..a5ae0a0db6
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
@@ -0,0 +1,464 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.clocksynch;
+
+import org.apache.log4j.Logger;
+
+import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import java.io.IOException;
+import java.net.*;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+/**
+ * UDPClockSynchronizer is a {@link ClockSynchronizer} that sends pings as UDP datagrams, and uses the following simple
+ * algorithm to perform clock synchronization:
+ *
+ * <ol>
+ * <li>Slave initiates synchronization with a Reference clock.</li>
+ * <li>Slave stamps current local time on a "time request" message and sends to the Reference.</li>
+ * <li>Upon receipt by Reference, Reference stamps Reference-time and returns.</li>
+ * <li>Upon receipt by Slave, Slave subtracts current time from sent time and divides by two to compute latency. It
+ *     subtracts current time from Reference time to determine Slave-Reference time delta and adds in the
+ *     half-latency to get the correct clock delta.</li>
+ * <li>The first result is immediately used to update the clock since it will get the local clock into at least
+ *     the right ballpark.</li>
+ * <li>The Slave repeats steps 2 through 4, 15 more times.</li>
+ * <li>The results of the packet receipts are accumulated and sorted in lowest-latency to highest-latency order. The
+ *     median latency is determined by picking the mid-point sample from this ordered list.</li>
+ * <li>All samples outside 1 standard-deviation from the median are discarded and the remaining samples
+ *     are averaged using an arithmetic mean.</li>
+ * </ol>
+ *
+ * <p/>The use of UDP datagrams, instead of TCP based communication eliminates the hidden delays that TCP can introduce,
+ * as it can transparently re-order or re-send packets, or introduce delays as packets are naggled.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Trigger a clock synchronziation.
+ * <tr><td> Compute a clock delta to apply to the local clock.
+ * <tr><td> Estimate the error in the synchronzation.
+ * </table>
+ */
+public class UDPClockSynchronizer implements ClockSynchronizer
+{
+    /** Used for debugging. */
+    // private static final Logger log = Logger.getLogger(UDPClockSynchronizer.class);
+
+    /** Defines the timeout to use when waiting for responses to time requests. */
+    private static final int TIMEOUT = 50;
+
+    /** The clock delta. */
+    private long delta = 0L;
+
+    /** Holds an estimate of the clock error relative to the reference clock. */
+    private long epsilon = 0L;
+
+    /** Holds the address of the reference clock. */
+    private InetAddress referenceAddress;
+
+    /** Holds the socket to communicate with the reference service over. */
+    private DatagramSocket socket;
+
+    /** Used to control the shutdown in the main test loop. */
+    private static boolean doSynch = true;
+
+    /**
+     * Creates a clock synchronizer against the specified address for the reference.
+     *
+     * @param address The address of the reference service.
+     */
+    public UDPClockSynchronizer(String address)
+    {
+        try
+        {
+            referenceAddress = InetAddress.getByName(address);
+        }
+        catch (UnknownHostException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * The slave side should call this to compute a clock delta with the reference.
+     *
+     * @throws ClockSynchFailureException If synchronization cannot be achieved, due to unavailability of the reference
+     *                                    time service.
+     */
+    public void synch() throws ClockSynchFailureException
+    {
+        try
+        {
+            socket = new DatagramSocket();
+            socket.setSoTimeout(TIMEOUT);
+
+            // Synchronize on a single ping, to get the clock into the right ball-park.
+            synch(1);
+
+            // Synchronize on 15 pings.
+            synch(15);
+
+            // And again, for greater accuracy, on 31.
+            synch(31);
+
+            socket.close();
+        }
+        catch (SocketException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Updates the synchronization delta by performing the specified number of reference clock requests.
+     *
+     * @param n The number of reference clock request cycles to perform.
+     *
+     * @throws ClockSynchFailureException If synchronization cannot be achieved, due to unavailability of the reference
+     *                                    time service.
+     */
+    protected void synch(int n) throws ClockSynchFailureException
+    {
+        // log.debug("protected void synch(int n = " + n + "): called");
+
+        // Create an array of deltas by performing n reference pings.
+        long[] delta = new long[n];
+
+        for (int i = 0; i < n; i++)
+        {
+            delta[i] = ping();
+        }
+
+        // Reject any deltas that are larger than 1 s.d. above the median.
+        long median = median(delta);
+        long sd = standardDeviation(delta);
+
+        // log.debug("median = " + median);
+        // log.debug("sd = " + sd);
+
+        long[] tempDeltas = new long[n];
+        int count = 0;
+
+        for (int i = 0; i < n; i++)
+        {
+            if ((delta[i] <= (median + sd)) && (delta[i] >= (median - sd)))
+            {
+                tempDeltas[count] = delta[i];
+                count++;
+            }
+            else
+            {
+                // log.debug("Rejected: " + delta[i]);
+            }
+        }
+
+        System.arraycopy(tempDeltas, 0, delta, 0, count);
+
+        // Estimate the delta as the mean of the remaining deltas.
+        this.delta += mean(delta);
+
+        // Estimate the error as the standard deviation of the remaining deltas.
+        this.epsilon = standardDeviation(delta);
+
+        // log.debug("this.delta = " + this.delta);
+        // log.debug("this.epsilon = " + this.epsilon);
+    }
+
+    /**
+     * Performs a single reference clock request cycle and returns the estimated delta relative to the local clock.
+     * This is computed as the half-latency of the requst cycle, plus the reference clock, minus the local clock.
+     *
+     * @return The estimated clock delta.
+     *
+     * @throws ClockSynchFailureException If the reference service is not responding.
+     */
+    protected long ping() throws ClockSynchFailureException
+    {
+        // log.debug("protected long ping(): called");
+
+        try
+        {
+            byte[] buf = new byte[256];
+
+            boolean timedOut = false;
+            long start = 0L;
+            long refTime = 0L;
+            long localTime = 0L;
+            long latency = 0L;
+            int failCount = 0;
+
+            // Keep trying the ping until it gets a response, or 10 tries in a row all time out.
+            do
+            {
+                // Start timing the request latency.
+                start = nanoTime();
+
+                // Get the reference time.
+                DatagramPacket packet =
+                    new DatagramPacket(buf, buf.length, referenceAddress, UDPClockReference.REFERENCE_PORT);
+                socket.send(packet);
+                packet = new DatagramPacket(buf, buf.length);
+
+                timedOut = false;
+
+                try
+                {
+                    socket.receive(packet);
+                }
+                catch (SocketTimeoutException e)
+                {
+                    timedOut = true;
+                    failCount++;
+
+                    continue;
+                }
+
+                ByteBuffer bbuf = ByteBuffer.wrap(packet.getData());
+                refTime = bbuf.getLong();
+
+                // Stop timing the request latency.
+                localTime = nanoTime();
+                latency = localTime - start;
+
+                // log.debug("refTime = " + refTime);
+                // log.debug("localTime = " + localTime);
+                // log.debug("start = " + start);
+                // log.debug("latency = " + latency);
+                // log.debug("delta = " + ((latency / 2) + (refTime - localTime)));
+
+            }
+            while (timedOut && (failCount < 10));
+
+            // Fail completely if the fail count is too high.
+            if (failCount >= 10)
+            {
+                throw new ClockSynchFailureException("Clock reference not responding.", null);
+            }
+
+            // Estimate delta as (ref clock + half-latency) - local clock.
+            return (latency / 2) + (refTime - localTime);
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Gets the clock delta in nano seconds.
+     *
+     * @return The clock delta in nano seconds.
+     */
+    public long getDelta()
+    {
+        return delta;
+    }
+
+    /**
+     * Gets an estimate of the clock error in nan seconds.
+     *
+     * @return An estimate of the clock error in nan seconds.
+     */
+    public long getEpsilon()
+    {
+        return epsilon;
+    }
+
+    /**
+     * Gets the local clock time with any computed delta added in.
+     *
+     * @return The local clock time with any computed delta added in.
+     */
+    public long nanoTime()
+    {
+        return System.nanoTime() + delta;
+    }
+
+    /**
+     * Computes the median of a series of values.
+     *
+     * @param values The values.
+     *
+     * @return The median.
+     */
+    public static long median(long[] values)
+    {
+        // log.debug("public static long median(long[] values = " + Arrays.toString(values) + "): called");
+
+        long median;
+
+        // Order the list of values.
+        long[] orderedValues = new long[values.length];
+        System.arraycopy(values, 0, orderedValues, 0, values.length);
+        Arrays.sort(orderedValues);
+
+        // Check if the median is computed from a pair of middle value.
+        if ((orderedValues.length % 2) == 0)
+        {
+            int middle = orderedValues.length / 2;
+
+            median = (orderedValues[middle] + orderedValues[middle - 1]) / 2;
+        }
+        // The median is computed from a single middle value.
+        else
+        {
+            median = orderedValues[orderedValues.length / 2];
+        }
+
+        // log.debug("median = " + median);
+
+        return median;
+    }
+
+    /**
+     * Computes the mean of a series of values.
+     *
+     * @param values The values.
+     *
+     * @return The mean.
+     */
+    public static long mean(long[] values)
+    {
+        // log.debug("public static long mean(long[] values = " + Arrays.toString(values) + "): called");
+
+        long total = 0L;
+
+        for (long value : values)
+        {
+            total += value;
+        }
+
+        long mean = total / values.length;
+
+        // log.debug("mean = " + mean);
+
+        return mean;
+    }
+
+    /**
+     * Computes the variance of series of values.
+     *
+     * @param values The values.
+     *
+     * @return The variance of the values.
+     */
+    public static long variance(long[] values)
+    {
+        // log.debug("public static long variance(long[] values = " + Arrays.toString(values) + "): called");
+
+        long mean = mean(values);
+
+        long totalVariance = 0;
+
+        for (long value : values)
+        {
+            long diff = (value - mean);
+            totalVariance += diff * diff;
+        }
+
+        long variance = totalVariance / values.length;
+
+        // log.debug("variance = " + variance);
+
+        return variance;
+    }
+
+    /**
+     * Computes the standard deviation of a series of values.
+     *
+     * @param values The values.
+     *
+     * @return The standard deviation.
+     */
+    public static long standardDeviation(long[] values)
+    {
+        // log.debug("public static long standardDeviation(long[] values = " + Arrays.toString(values) + "): called");
+
+        long sd = Double.valueOf(Math.sqrt(variance(values))).longValue();
+
+        // log.debug("sd = " + sd);
+
+        return sd;
+    }
+
+    /**
+     * For testing purposes. Supply address of reference clock as arg 1.
+     *
+     * @param args Address of reference clock as arg 1.
+     */
+    public static void main(String[] args)
+    {
+        ParsedProperties options =
+            new ParsedProperties(CommandLineParser.processCommandLine(args,
+                    new CommandLineParser(
+                        new String[][]
+                        {
+                            { "1", "Address of clock reference service.", "address", "true" }
+                        }), System.getProperties()));
+
+        String address = options.getProperty("1");
+
+        // Create a clock synchronizer.
+        UDPClockSynchronizer clockSyncher = new UDPClockSynchronizer(address);
+
+        // Set up a shutdown hook for it.
+        Runtime.getRuntime().addShutdownHook(new Thread(new Runnable()
+                {
+                    public void run()
+                    {
+                        doSynch = false;
+                    }
+                }));
+
+        // Repeat the clock synching until the user kills the progam.
+        while (doSynch)
+        {
+            // Perform a clock clockSynch.
+            try
+            {
+                clockSyncher.synch();
+
+                // Print out the clock delta and estimate of the error.
+                System.out.println("Delta = " + clockSyncher.getDelta());
+                System.out.println("Epsilon = " + clockSyncher.getEpsilon());
+
+                try
+                {
+                    Thread.sleep(250);
+                }
+                catch (InterruptedException e)
+                {
+                    // Restore the interrupted status and terminate the loop.
+                    Thread.currentThread().interrupt();
+                    doSynch = false;
+                }
+            }
+            // Terminate if the reference time service is unavailable.
+            catch (ClockSynchFailureException e)
+            {
+                doSynch = false;
+            }
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
new file mode 100644
index 0000000000..159f364825
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
@@ -0,0 +1,469 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedcircuit;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.*;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.TimingController;
+import uk.co.thebadgerset.junit.extensions.TimingControllerAware;
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * DistributedCircuitImpl is a distributed implementation of the test {@link Circuit}. Many publishers and receivers
+ * accross multiple machines may be combined to form a single test circuit. The test circuit extracts reports from
+ * all of its publishers and receivers, and applies its assertions to these reports.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Supply the publishing and receiving ends of a test messaging circuit.
+ * <tr><td> Start the circuit running.
+ * <tr><td> Close the circuit down.
+ * <tr><td> Take a reading of the circuits state.
+ * <tr><td> Apply assertions against the circuits state.
+ * <tr><td> Send test messages over the circuit.
+ * <tr><td> Perform the default test procedue on the circuit.
+ * </table>
+ *
+ * @todo There is a short pause after receiving sender reports before asking for receiver reports, because receivers may
+ *       not have finished receiving all their test messages before the report request arrives. This is going to be a
+ *       problem for taking test timings and needs to be eliminiated. Suggested solution: have receiver send back reports
+ *       asynchronously, on test batch size boundaries, and do so automatically rather than having to have the report
+ *       request sent to them. Number each test run, or otherwise uniquely identify it, when a receiver does not get
+ *       any more messages on a test run for more than a timeout, it can assume the test is complete and send a final
+ *       report. On the coordinator end a future will need to be created to wait for all final reports to come in, and
+ *       to register results and timings for the test. This must work in such a way that a new test cycle can be started
+ *       without waiting for the results of the old one to come in.
+ *
+ * @todo Add in setting of timing controller, from timing aware test cases.
+ */
+public class DistributedCircuitImpl implements Circuit, TimingControllerAware
+{
+    /** Used for debugging purposes. */
+    private static final Logger log = Logger.getLogger(DistributedCircuitImpl.class);
+
+    /** Holds the conversation factory over which to coordinate the test. */
+    protected ConversationFactory conversationFactory;
+
+    /** Holds the controlSession over which to hold the control conversation. */
+    protected Session controlSession;
+
+    /** Holds the sender nodes in the test circuit. */
+    protected List<TestClientDetails> senders;
+
+    /** Holds the receiver nodes in the test circuit. */
+    protected List<TestClientDetails> receivers;
+
+    /** Holds the sender control conversations. */
+    protected ConversationFactory.Conversation[] senderConversation;
+
+    /** Holds the receiver control conversations. */
+    protected ConversationFactory.Conversation[] receiverConversation;
+
+    /** Holds the control topics for the senders in the test circuit. */
+    protected Destination[] senderControlTopic;
+
+    /** Holds the control topics for the receivers in the test circuit. */
+    protected Destination[] receiverControlTopic;
+
+    /** Holds the number of messages to send per test run. */
+    protected int numMessages;
+
+    /**
+     * Holds the timing controller for the circuit. This is used to log test times asynchronously, when reciever nodes
+     * return their reports after senders have completed a test case.
+     */
+    TimingController timingController;
+
+    /**
+     * Creates a distributed test circuit on the specified senders and receivers.
+     *
+     * @param session              The controlSession for all control conversations.
+     * @param senders              The senders.
+     * @param receivers            The receivers.
+     * @param senderConversation   A control conversation with the senders.
+     * @param receiverConversation A control conversation with the receivers.
+     * @param senderControlTopic   The senders control topic.
+     * @param receiverControlTopic The receivers control topic.
+     */
+    protected DistributedCircuitImpl(Session session, List<TestClientDetails> senders, List<TestClientDetails> receivers,
+        ConversationFactory.Conversation[] senderConversation, ConversationFactory.Conversation[] receiverConversation,
+        Destination[] senderControlTopic, Destination[] receiverControlTopic)
+    {
+        this.controlSession = session;
+        this.senders = senders;
+        this.receivers = receivers;
+        this.senderConversation = senderConversation;
+        this.receiverConversation = receiverConversation;
+        this.senderControlTopic = senderControlTopic;
+        this.receiverControlTopic = receiverControlTopic;
+    }
+
+    /**
+     * Creates a distributed test circuit from the specified test parameters, on the senders and receivers
+     * given.
+     *
+     * @param testProps           The test parameters.
+     * @param senders             The sender ends in the test circuit.
+     * @param receivers           The receiver ends in the test circuit.
+     * @param conversationFactory A conversation factory for creating the control conversations with senders and receivers.
+     *
+     * @return A connected and ready to start, test circuit.
+     */
+    public static Circuit createCircuit(ParsedProperties testProps, List<TestClientDetails> senders,
+        List<TestClientDetails> receivers, ConversationFactory conversationFactory)
+    {
+        log.debug("public static Circuit createCircuit(ParsedProperties testProps, List<TestClientDetails> senders, "
+            + " List<TestClientDetails> receivers, ConversationFactory conversationFactory)");
+
+        try
+        {
+            Session session = conversationFactory.getSession();
+
+            // Create control conversations with each of the senders.
+            ConversationFactory.Conversation[] senderConversation = new ConversationFactory.Conversation[senders.size()];
+            Destination[] senderControlTopic = new Destination[senders.size()];
+
+            for (int i = 0; i < senders.size(); i++)
+            {
+                TestClientDetails sender = senders.get(i);
+
+                senderControlTopic[i] = session.createTopic(sender.privateControlKey);
+                senderConversation[i] = conversationFactory.startConversation();
+            }
+
+            log.debug("Sender conversations created.");
+
+            // Create control conversations with each of the receivers.
+            ConversationFactory.Conversation[] receiverConversation = new ConversationFactory.Conversation[receivers.size()];
+            Destination[] receiverControlTopic = new Destination[receivers.size()];
+
+            for (int i = 0; i < receivers.size(); i++)
+            {
+                TestClientDetails receiver = receivers.get(i);
+
+                receiverControlTopic[i] = session.createTopic(receiver.privateControlKey);
+                receiverConversation[i] = conversationFactory.startConversation();
+            }
+
+            log.debug("Receiver conversations created.");
+
+            // Assign the sender role to each of the sending test clients.
+            for (int i = 0; i < senders.size(); i++)
+            {
+                TestClientDetails sender = senders.get(i);
+
+                Message assignSender = conversationFactory.getSession().createMessage();
+                TestUtils.setPropertiesOnMessage(assignSender, testProps);
+                assignSender.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+                assignSender.setStringProperty("ROLE", "SENDER");
+
+                senderConversation[i].send(senderControlTopic[i], assignSender);
+            }
+
+            log.debug("Sender role assignments sent.");
+
+            // Assign the receivers role to each of the receiving test clients.
+            for (int i = 0; i < receivers.size(); i++)
+            {
+                TestClientDetails receiver = receivers.get(i);
+
+                Message assignReceiver = session.createMessage();
+                TestUtils.setPropertiesOnMessage(assignReceiver, testProps);
+                assignReceiver.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+                assignReceiver.setStringProperty("ROLE", "RECEIVER");
+
+                receiverConversation[i].send(receiverControlTopic[i], assignReceiver);
+            }
+
+            log.debug("Receiver role assignments sent.");
+
+            // Wait for the senders and receivers to confirm their roles.
+            for (int i = 0; i < senders.size(); i++)
+            {
+                senderConversation[i].receive();
+            }
+
+            log.debug("Got all sender role confirmations");
+
+            for (int i = 0; i < receivers.size(); i++)
+            {
+                receiverConversation[i].receive();
+            }
+
+            log.debug("Got all receiver role confirmations");
+
+            // Package everything up as a circuit.
+            return new DistributedCircuitImpl(session, senders, receivers, senderConversation, receiverConversation,
+                    senderControlTopic, receiverControlTopic);
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("JMSException not handled.");
+        }
+    }
+
+    /**
+     * Used by tests cases that can supply a {@link uk.co.thebadgerset.junit.extensions.TimingController} to set the
+     * controller on an aware test.
+     *
+     * @param controller The timing controller.
+     */
+    public void setTimingController(TimingController controller)
+    {
+        this.timingController = controller;
+    }
+
+    /**
+     * Gets the interface on the publishing end of the circuit.
+     *
+     * @return The publishing end of the circuit.
+     */
+    public Publisher getPublisher()
+    {
+        throw new RuntimeException("Not Implemented.");
+    }
+
+    /**
+     * Gets the interface on the receiving end of the circuit.
+     *
+     * @return The receiving end of the circuit.
+     */
+    public Receiver getReceiver()
+    {
+        throw new RuntimeException("Not Implemented.");
+    }
+
+    /**
+     * Connects and starts the circuit. After this method is called the circuit is ready to send messages.
+     */
+    public void start()
+    {
+        log.debug("public void start(): called");
+
+        try
+        {
+            // Start the test on each of the senders.
+            Message start = controlSession.createMessage();
+            start.setStringProperty("CONTROL_TYPE", "START");
+            start.setIntProperty("MESSAGE_COUNT", numMessages);
+
+            for (int i = 0; i < senders.size(); i++)
+            {
+                senderConversation[i].send(senderControlTopic[i], start);
+            }
+
+            log.debug("All senders told to start their tests.");
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Unhandled JMSException.", e);
+        }
+    }
+
+    /**
+     * Checks the test circuit. The effect of this is to gather the circuits state, for both ends of the circuit,
+     * into a report, against which assertions may be checked.
+     *
+     * @todo Replace the asynch receiver report thread with a choice of direct or asynch executor, so that asynch
+     *       or synch logging of test timings is optional. Also need to provide an onMessage method that is capable
+     *       of receiving timing reports that receivers will generate during an ongoing test, on the test sample
+     *       size boundaries. The message timing logging code should be factored out as a common method that can
+     *       be called in response to the final report responses, or the onMessage method. Another alternative is
+     *       to abandon the final report request altogether and just use the onMessage method? I think the two
+     *       differ though, as the final report is used to apply assertions, and the ongoing report is just for
+     *       periodic timing results... In which case, maybe there needs to be a way for the onMessage method
+     *       to process just some of the incoming messages, and forward the rest on to the conversion helper, as
+     *       a sort of pre-conversation helper filter? Make conversation expose its onMessage method (it should
+     *       already) and allow another delivery thread to filter the incoming messages to the conversation.
+     */
+    public void check()
+    {
+        log.debug("public void check(): called");
+
+        try
+        {
+            // Wait for all the test senders to return their reports.
+            for (int i = 0; i < senders.size(); i++)
+            {
+                Message senderReport = senderConversation[i].receive();
+                log.debug("Sender " + senderReport.getStringProperty("CLIENT_NAME") + " reports message count: "
+                    + senderReport.getIntProperty("MESSAGE_COUNT"));
+                log.debug("Sender " + senderReport.getStringProperty("CLIENT_NAME") + " reports message time: "
+                    + senderReport.getLongProperty("TEST_TIME"));
+            }
+
+            log.debug("Got all sender test reports.");
+
+            // Apply sender assertions to pass/fail the tests.
+
+            // Inject a short pause to give the receivers time to finish receiving their test messages.
+            TestUtils.pause(500);
+
+            // Ask the receivers for their reports.
+            Message statusRequest = controlSession.createMessage();
+            statusRequest.setStringProperty("CONTROL_TYPE", "STATUS_REQUEST");
+
+            for (int i = 0; i < receivers.size(); i++)
+            {
+                receiverConversation[i].send(receiverControlTopic[i], statusRequest);
+            }
+
+            log.debug("All receiver test reports requested.");
+
+            // Wait for all receiver reports to come in, but do so asynchronously.
+            Runnable gatherAllReceiverReports =
+                new Runnable()
+                {
+                    public void run()
+                    {
+                        try
+                        {
+                            // Wait for all the receivers to send their reports.
+                            for (int i = 0; i < receivers.size(); i++)
+                            {
+                                Message receiverReport = receiverConversation[i].receive();
+
+                                String clientName = receiverReport.getStringProperty("CLIENT_NAME");
+                                int messageCount = receiverReport.getIntProperty("MESSAGE_COUNT");
+                                long testTime = receiverReport.getLongProperty("TEST_TIME");
+
+                                log.debug("Receiver " + clientName + " reports message count: " + messageCount);
+                                log.debug("Receiver " + receiverReport.getStringProperty("CLIENT_NAME")
+                                    + " reports message time: " + testTime);
+
+                                // Apply receiver assertions to pass/fail the tests.
+
+                                // Log the test timings on the asynchronous test timing controller.
+                                /*try
+                                {
+                                    timingController.completeTest(true, messageCount, testTime);
+                                }
+                                // The timing controll can throw InterruptedException is the current test is to be
+                                // interrupted.
+                                catch (InterruptedException e)
+                                {
+                                    e.printStackTrace();
+                                }*/
+                            }
+
+                            log.debug("All receiver test reports received.");
+                        }
+                        catch (JMSException e)
+                        {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                };
+
+            Thread receiverReportsThread = new Thread(gatherAllReceiverReports);
+            receiverReportsThread.start();
+
+            // return new Message[] { senderReport, receiverReport };
+
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Unhandled JMSException.", e);
+        }
+    }
+
+    /**
+     * Closes the circuit. All associated resources are closed.
+     */
+    public void close()
+    {
+        log.debug("public void close(): called");
+
+        // End the current test on all senders and receivers.
+    }
+
+    /**
+     * Applies a list of assertions against the test circuit. The {@link #check()} method should be called before doing
+     * this, to ensure that the circuit has gathered its state into a report to assert against.
+     *
+     * @param assertions The list of assertions to apply.
+     *
+     * @return Any assertions that failed.
+     */
+    public List<Assertion> applyAssertions(List<Assertion> assertions)
+    {
+        log.debug("public List<Assertion> applyAssertions(List<Assertion> assertions = " + assertions + "): called");
+
+        List<Assertion> failures = new LinkedList<Assertion>();
+
+        for (Assertion assertion : assertions)
+        {
+            if (!assertion.apply())
+            {
+                failures.add(assertion);
+            }
+        }
+
+        return failures;
+    }
+
+    /**
+     * Runs the default test procedure against the circuit, and checks that all of the specified assertions hold.
+     *
+     * @param numMessages The number of messages to send using the default test procedure.
+     * @param assertions  The list of assertions to apply.
+     *
+     * @return Any assertions that failed.
+     *
+     * @todo From check onwards needs to be handled as a future. The future must call back onto the test case to
+     *       report results asynchronously.
+     */
+    public List<Assertion> test(int numMessages, List<Assertion> assertions)
+    {
+        log.debug("public List<Assertion> test(int numMessages = " + numMessages + ", List<Assertion> assertions = "
+            + assertions + "): called");
+
+        // Keep the number of messages to send per test run, where the send method can reference it.
+        this.numMessages = numMessages;
+
+        // Start the test running on all sender circuit ends.
+        start();
+
+        // Request status reports to be handed in.
+        check();
+
+        // Assert conditions on the publishing end of the circuit.
+        // Assert conditions on the receiving end of the circuit.
+        List<Assertion> failures = applyAssertions(assertions);
+
+        // Close the circuit ending the current test case.
+        close();
+
+        // Pass with no failed assertions or fail with a list of failed assertions.
+        return failures;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
new file mode 100644
index 0000000000..810e1ae685
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
@@ -0,0 +1,63 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedcircuit;
+
+import org.apache.qpid.test.framework.Assertion;
+import org.apache.qpid.test.framework.Publisher;
+
+/**
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public class DistributedPublisherImpl implements Publisher
+{
+    /**
+     * Provides an assertion that the publisher encountered no exceptions.
+     *
+     * @return An assertion that the publisher encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion()
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the publisher got a no consumers exception on every message.
+     *
+     * @return An assertion that the publisher got a no consumers exception on every message.
+     */
+    public Assertion noConsumersAssertion()
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the publisher got a no rout exception on every message.
+     *
+     * @return An assertion that the publisher got a no rout exception on every message.
+     */
+    public Assertion noRouteAssertion()
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
new file mode 100644
index 0000000000..db85921b85
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
@@ -0,0 +1,53 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedcircuit;
+
+import org.apache.qpid.test.framework.Assertion;
+import org.apache.qpid.test.framework.Receiver;
+
+/**
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public class DistributedReceiverImpl implements Receiver
+{
+    /**
+     * Provides an assertion that the receivers encountered no exceptions.
+     *
+     * @return An assertion that the receivers encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion()
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the receivers got all messages that were sent to it.
+     *
+     * @return An assertion that the receivers got all messages that were sent to it.
+     */
+    public Assertion allMessagesAssertion()
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
new file mode 100644
index 0000000000..95f02aa70e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
@@ -0,0 +1,315 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedcircuit;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.*;
+import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;
+import org.apache.qpid.test.framework.localcircuit.LocalCircuitImpl;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
+
+import javax.jms.*;
+
+/**
+ * A TestClientCircuitEnd is a {@link CircuitEnd} that may be controlled from a
+ * {@link org.apache.qpid.test.framework.distributedtesting.TestClient}, and that forms a single publishing or
+ * receiving end point in a distributed test {@link org.apache.qpid.test.framework.Circuit}.
+ *
+ * <p/>When operating in the SENDER role, this circuit end is capable of acting as part of the default circuit test
+ * procedure (described in the class comment for {@link org.apache.qpid.test.framework.Circuit}). That is, it will
+ * send the number of test messages required, using the test configuration parameters given in the test invite, and
+ * return a report on its activities to the circuit controller.
+ *
+ * <p/>When operation in the RECEIVER role, this circuit end acts as part of the default circuit test procedure. It will
+ * receive test messages, on the setup specified in the test configuration parameters, and keep count of the messages
+ * received, and time taken to receive them. When requested by the circuit controller to provide a report, it will
+ * return this report of its activities.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public class TestClientCircuitEnd implements CircuitEnd, TestClientControlledTest
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(TestClientCircuitEnd.class);
+
+    /** Holds the test parameters. */
+    ParsedProperties testProps;
+
+    /** The number of test messages to send. */
+    private int numMessages;
+
+    /** The role to be played by the test. */
+    private Roles role;
+
+    /** The connection to send the test messages on. */
+    private Connection connection;
+
+    /** Holds the circuit end for this test. */
+    CircuitEnd circuitEnd;
+
+    /**
+     * Holds a message monitor for this circuit end, either the monitor on the consumer when in RECEIVER more, or
+     * a monitor updated on every message sent, when acting as a SENDER.
+     */
+    MessageMonitor messageMonitor;
+
+    /**
+     * Should provide the name of the test case that this class implements. The exact names are defined in the
+     * interop testing spec.
+     *
+     * @return The name of the test case that this implements.
+     */
+    public String getName()
+    {
+        return "DEFAULT_CIRCUIT_TEST";
+    }
+
+    /**
+     * Determines whether the test invite that matched this test case is acceptable.
+     *
+     * @param inviteMessage The invitation to accept or reject.
+     * @return <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     */
+    public boolean acceptInvite(Message inviteMessage) throws JMSException
+    {
+        log.debug("public boolean acceptInvite(Message inviteMessage): called");
+
+        // Populate the test parameters from the invitation.
+        testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);
+
+        for (Object key : testProps.keySet())
+        {
+            String propName = (String) key;
+
+            // If the test parameters is overridden by the invitation, use it instead.
+            String inviteValue = inviteMessage.getStringProperty(propName);
+
+            if (inviteValue != null)
+            {
+                testProps.setProperty(propName, inviteValue);
+                log.debug("Test invite supplied override to " + propName + " of " + inviteValue);
+            }
+
+        }
+
+        // Accept the invitation.
+        return true;
+    }
+
+    /**
+     * Assigns the role to be played by this test case. The test parameters are fully specified in the
+     * assignment message. When this method return the test case will be ready to execute.
+     *
+     * @param role              The role to be played; sender or receivers.
+     * @param assignRoleMessage The role assingment message, contains the full test parameters.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     */
+    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException
+    {
+        log.debug("public void assignRole(Roles role, Message assignRoleMessage): called");
+
+        // Take note of the role to be played.
+        this.role = role;
+
+        // Extract and retain the test parameters.
+        numMessages = 1; // assignRoleMessage.getIntProperty("NUM_MESSAGES");
+
+        // Connect using the test parameters.
+        connection = TestUtils.createConnection(testProps);
+
+        // Create a circuit end that matches the assigned role and test parameters.
+        switch (role)
+        {
+        // Check if the sender role is being assigned, and set up a message producer if so.
+        case SENDER:
+
+            // Set up the publisher.
+            circuitEnd = LocalCircuitImpl.createPublisherCircuitEnd(connection, testProps, 0L);
+
+            // Create a custom message monitor that will be updated on every message sent.
+            messageMonitor = new MessageMonitor();
+
+            break;
+
+        // Otherwise the receivers role is being assigned, so set this up to listen for messages.
+        case RECEIVER:
+
+            // Set up the receiver.
+            circuitEnd = LocalCircuitImpl.createReceiverCircuitEnd(connection, testProps, 0L);
+
+            // Use the message monitor from the consumer for stats.
+            messageMonitor = getMessageMonitor();
+
+            break;
+        }
+
+        // Reset all messaging stats for the report.
+        messageMonitor.reset();
+
+        connection.start();
+    }
+
+    /**
+     * Performs the test case actions. Returning from here, indicates that the sending role has completed its test.
+     *
+     * @param numMessages The number of test messages to send.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     *
+     * @todo Add round robin on destinations where multiple destinations being used.
+     *
+     * @todo Add rate limiting when rate limit specified on publishers.
+     *
+     * @todo Add Max pending message size protection. The receiver will have to send back some acks once in a while,
+     *       to notify the publisher that its messages are being consumed. This makes the safety valve harder to
+     *       implement than in the single VM case. For example, if the limit is 1000 messages, might want to get back
+     *       an ack every 500, to notify the publisher that it can keep sending. What about pub/sub tests? Will it be
+     *       necessary to wait for an ack from every receiver? This will have the effect of rate limiting to slow
+     *       consumers too.
+     *
+     * @todo Add commits on every commit batch size boundary.
+     */
+    public void start(int numMessages) throws JMSException
+    {
+        log.debug("public void start(): called");
+
+        // If in the SENDER role, send the specified number of test messages to the circuit destinations.
+        if (role.equals(Roles.SENDER))
+        {
+            Message testMessage = getSession().createMessage();
+
+            for (int i = 0; i < numMessages; i++)
+            {
+                getProducer().send(testMessage);
+
+                // Increment the message count and timings.
+                messageMonitor.onMessage(testMessage);
+            }
+        }
+    }
+
+    /**
+     * Gets a report on the actions performed by the test case in its assigned role.
+     *
+     * @param session The controlSession to create the report message in.
+     * @return The report message.
+     *
+     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
+     */
+    public Message getReport(Session session) throws JMSException
+    {
+        Message report = session.createMessage();
+        report.setStringProperty("CONTROL_TYPE", "REPORT");
+
+        // Add the count of messages sent/received to the report.
+        report.setIntProperty("MESSAGE_COUNT", messageMonitor.getNumMessage());
+
+        // Add the time to send/receive messages to the report.
+        report.setLongProperty("TEST_TIME", messageMonitor.getTime());
+
+        // Add any exceptions detected to the report.
+
+        return report;
+    }
+
+    /**
+     * Gets the message producer at this circuit end point.
+     *
+     * @return The message producer at with this circuit end point.
+     */
+    public MessageProducer getProducer()
+    {
+        return circuitEnd.getProducer();
+    }
+
+    /**
+     * Gets the message consumer at this circuit end point.
+     *
+     * @return The message consumer at this circuit end point.
+     */
+    public MessageConsumer getConsumer()
+    {
+        return circuitEnd.getConsumer();
+    }
+
+    /**
+     * Send the specified message over the producer at this end point.
+     *
+     * @param message The message to send.
+     *
+     * @throws JMSException Any JMS exception occuring during the send is allowed to fall through.
+     */
+    public void send(Message message) throws JMSException
+    {
+        // Send the message on the circuit ends producer.
+        circuitEnd.send(message);
+    }
+
+    /**
+     * Gets the JMS Session associated with this circuit end point.
+     *
+     * @return The JMS Session associated with this circuit end point.
+     */
+    public Session getSession()
+    {
+        return circuitEnd.getSession();
+    }
+
+    /**
+     * Closes the message producers and consumers and the sessions, associated with this circuit end point.
+     *
+     * @throws JMSException Any JMSExceptions occurring during the close are allowed to fall through.
+     */
+    public void close() throws JMSException
+    {
+        // Close the producer and consumer.
+        circuitEnd.close();
+    }
+
+    /**
+     * Returns the message monitor for reporting on received messages on this circuit end.
+     *
+     * @return The message monitor for this circuit end.
+     */
+    public MessageMonitor getMessageMonitor()
+    {
+        return circuitEnd.getMessageMonitor();
+    }
+
+    /**
+     * Returns the exception monitor for reporting on exceptions received on this circuit end.
+     *
+     * @return The exception monitor for this circuit end.
+     */
+    public ExceptionMonitor getExceptionMonitor()
+    {
+        return circuitEnd.getExceptionMonitor();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
new file mode 100644
index 0000000000..cf0b92783e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
@@ -0,0 +1,633 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
+
+import org.apache.qpid.test.framework.FrameworkBaseCase;
+import org.apache.qpid.test.framework.MessagingTestConfigProperties;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.TestUtils;
+import org.apache.qpid.test.framework.clocksynch.UDPClockReference;
+import org.apache.qpid.test.framework.listeners.XMLTestListener;
+import org.apache.qpid.util.ConversationFactory;
+import org.apache.qpid.util.PrettyPrintingUtils;
+
+import uk.co.thebadgerset.junit.extensions.TKTestResult;
+import uk.co.thebadgerset.junit.extensions.TKTestRunner;
+import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;
+import uk.co.thebadgerset.junit.extensions.listeners.CSVTestListener;
+import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;
+import uk.co.thebadgerset.junit.extensions.util.MathUtils;
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
+
+import javax.jms.*;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * <p/>Implements the coordinator client described in the interop testing specification
+ * (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification). This coordinator is built on
+ * top of the JUnit testing framework.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Find out what test clients are available. <td> {@link ConversationFactory}
+ * <tr><td> Decorate available tests to run all available clients. <td> {@link DistributedTestDecorator}
+ * <tr><td> Attach XML test result logger.
+ * <tr><td> Terminate the interop testing framework.
+ * </table>
+ *
+ * @todo Should accumulate failures over all tests, and return with success or fail code based on all results. May need
+ *       to write a special TestResult to do this properly. At the moment only the last one used will be tested for
+ *       errors, as the start method creates a fresh one for each test case run.
+ *
+ * @todo Remove hard coding of test cases and put on command line instead.
+ */
+public class Coordinator extends TKTestRunner
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(Coordinator.class);
+
+    /** Used for reporting to the console. */
+    private static final Logger console = Logger.getLogger("CONSOLE");
+
+    /** Defines the possible distributed test engines available to run coordinated test cases with. */
+    public enum TestEngine
+    {
+        /** Specifies the interop test engine. This tests all available clients in pairs. */
+        INTEROP,
+
+        /** Specifies the fanout test engine. This sets up one publisher role, and many reciever roles. */
+        FANOUT
+    }
+
+    /**
+     * Holds the test context properties that provides the default test parameters, plus command line overrides.
+     * This is initialized with the default test parameters, to which command line overrides may be applied.
+     */
+    protected static ParsedProperties testContextProperties =
+        TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);
+
+    /** Holds the URL of the broker to coordinate the tests on. */
+    protected String brokerUrl;
+
+    /** Holds the virtual host to coordinate the tests on. If <tt>null</tt>, then the default virtual host is used. */
+    protected String virtualHost;
+
+    /** Holds the list of all clients that enlisted, when the compulsory invite was issued. */
+    protected Set<TestClientDetails> enlistedClients = new HashSet<TestClientDetails>();
+
+    /** Holds the conversation helper for the control conversation. */
+    protected ConversationFactory conversationFactory;
+
+    /** Holds the connection that the coordinating messages are sent over. */
+    protected Connection connection;
+
+    /**
+     * Holds the name of the class of the test currently being run. Ideally passed into the {@link #createTestResult}
+     * method, but as the signature is already fixed for this, the current value gets pushed here as a member variable.
+     */
+    protected String currentTestClassName;
+
+    /** Holds the path of the directory to output test results too, if one is defined. */
+    protected String reportDir;
+
+    /** Holds the coordinating test engine type to run the tests through. */
+    protected TestEngine engine;
+
+    /** Flag that indicates that all test clients should be terminated upon completion of the test cases. */
+    protected boolean terminate;
+
+    /** Flag that indicates the CSV results listener should be used to output results. */
+    protected boolean csvResults;
+
+    /** Flag that indiciates the XML results listener should be used to output results. */
+    protected boolean xmlResults;
+
+    /**
+     * Creates an interop test coordinator on the specified broker and virtual host.
+     *
+     * @param repetitions   The number of times to repeat the test, or test batch size.
+     * @param duration      The length of time to run the tests for. -1 means no duration has been set.
+     * @param threads       The concurrency levels to ramp up to.
+     * @param delay         A delay in milliseconds between test runs.
+     * @param params        The sets of 'size' parameters to pass to test.
+     * @param testCaseName  The name of the test case to run.
+     * @param reportDir     The directory to output the test results to.
+     * @param runName       The name of the test run; used to name the output file.
+     * @param verbose       Whether to print comments during test run.
+     * @param brokerUrl     The URL of the broker to connect to.
+     * @param virtualHost   The virtual host to run all tests on. Optional, may be <tt>null</tt>.
+     * @param engine        The distributed test engine type to run the tests with.
+     * @param terminate     <tt>true</tt> if test client nodes should be terminated at the end of the tests.
+     * @param csv           <tt>true</tt> if the CSV results listener should be attached.
+     * @param xml           <tt>true</tt> if the XML results listener should be attached.
+     */
+    public Coordinator(Integer repetitions, Long duration, int[] threads, int delay, int[] params, String testCaseName,
+        String reportDir, String runName, boolean verbose, String brokerUrl, String virtualHost, TestEngine engine,
+        boolean terminate, boolean csv, boolean xml)
+    {
+        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, verbose);
+
+        log.debug("public Coordinator(Integer repetitions = " + repetitions + " , Long duration = " + duration
+            + ", int[] threads = " + Arrays.toString(threads) + ", int delay = " + delay + ", int[] params = "
+            + Arrays.toString(params) + ", String testCaseName = " + testCaseName + ", String reportDir = " + reportDir
+            + ", String runName = " + runName + ", boolean verbose = " + verbose + ", String brokerUrl = " + brokerUrl
+            + ", String virtualHost =" + virtualHost + ", TestEngine engine = " + engine + ", boolean terminate = "
+            + terminate + ", boolean csv = " + csv + ", boolean xml = " + xml + "): called");
+
+        // Retain the connection parameters.
+        this.brokerUrl = brokerUrl;
+        this.virtualHost = virtualHost;
+        this.reportDir = reportDir;
+        this.engine = engine;
+        this.terminate = terminate;
+        this.csvResults = csv;
+        this.xmlResults = xml;
+    }
+
+    /**
+     * The entry point for the interop test coordinator. This client accepts the following command line arguments:
+     *
+     * <p/><table>
+     * <tr><td> -b         <td> The broker URL.   <td> Mandatory.
+     * <tr><td> -h         <td> The virtual host. <td> Optional.
+     * <tr><td> -o         <td> The directory to output test results to. <td> Optional.
+     * <tr><td> -e         <td> The type of test distribution engine to use. <td> Optional. One of: interop, fanout.
+     * <tr><td> ...        <td> Free arguments. The distributed test cases to run.
+     *                     <td> Mandatory. At least one must be defined.
+     * <tr><td> name=value <td> Trailing argument define name/value pairs. Added to the test contenxt properties.
+     *                     <td> Optional.
+     * </table>
+     *
+     * @param args The command line arguments.
+     */
+    public static void main(String[] args)
+    {
+        NDC.push("coordinator");
+        log.debug("public static void main(String[] args = " + Arrays.toString(args) + "): called");
+        console.info("Qpid Distributed Test Coordinator.");
+
+        // Override the default broker url to be localhost:5672.
+        testContextProperties.setProperty(MessagingTestConfigProperties.BROKER_PROPNAME, "tcp://localhost:5672");
+
+        try
+        {
+            // Use the command line parser to evaluate the command line with standard handling behaviour (print errors
+            // and usage then exist if there are errors).
+            // Any options and trailing name=value pairs are also injected into the test context properties object,
+            // to override any defaults that may have been set up.
+            ParsedProperties options =
+                new ParsedProperties(CommandLineParser.processCommandLine(args,
+                        new CommandLineParser(
+                            new String[][]
+                            {
+                                { "b", "The broker URL.", "broker", "false" },
+                                { "h", "The virtual host to use.", "virtual host", "false" },
+                                { "o", "The name of the directory to output test timings to.", "dir", "false" },
+                                {
+                                    "e", "The test execution engine to use. Default is interop.", "engine", "interop",
+                                    "^interop$|^fanout$", "true"
+                                },
+                                { "t", "Terminate test clients on completion of tests.", null, "false" },
+                                { "-csv", "Output test results in CSV format.", null, "false" },
+                                { "-xml", "Output test results in XML format.", null, "false" },
+                                {
+                                    "-trefaddr", "To specify an alternative to hostname for time singal reference.",
+                                    "address", "false"
+                                },
+                                {
+                                    "c", "The number of tests to run concurrently.", "num", "false",
+                                    MathUtils.SEQUENCE_REGEXP
+                                },
+                                { "r", "The number of times to repeat each test.", "num", "false" },
+                                {
+                                    "d", "The length of time to run the tests for.", "duration", "false",
+                                    MathUtils.DURATION_REGEXP
+                                },
+                                {
+                                    "f", "The maximum rate to call the tests at.", "frequency", "false",
+                                    "^([1-9][0-9]*)/([1-9][0-9]*)$"
+                                },
+                                { "s", "The size parameter to run tests with.", "size", "false", MathUtils.SEQUENCE_REGEXP },
+                                { "v", "Verbose mode.", null, "false" },
+                                { "n", "A name for this test run, used to name the output file.", "name", "true" }
+                            }), testContextProperties));
+
+            // Extract the command line options.
+            String brokerUrl = options.getProperty("b");
+            String virtualHost = options.getProperty("h");
+            String reportDir = options.getProperty("o");
+            reportDir = (reportDir == null) ? "." : reportDir;
+            String testEngine = options.getProperty("e");
+            TestEngine engine = "fanout".equals(testEngine) ? TestEngine.FANOUT : TestEngine.INTEROP;
+            boolean terminate = options.getPropertyAsBoolean("t");
+            boolean csvResults = options.getPropertyAsBoolean("-csv");
+            boolean xmlResults = options.getPropertyAsBoolean("-xml");
+
+            String threadsString = options.getProperty("c");
+            Integer repetitions = options.getPropertyAsInteger("r");
+            String durationString = options.getProperty("d");
+            String paramsString = options.getProperty("s");
+            boolean verbose = options.getPropertyAsBoolean("v");
+            String testRunName = options.getProperty("n");
+
+            int[] threads = (threadsString == null) ? null : MathUtils.parseSequence(threadsString);
+            int[] params = (paramsString == null) ? null : MathUtils.parseSequence(paramsString);
+            Long duration = (durationString == null) ? null : MathUtils.parseDuration(durationString);
+
+            // If broker or virtual host settings were specified as command line options, override the defaults in the
+            // test context properties with them.
+
+            // Collection all of the test cases to be run.
+            Collection<Class<? extends FrameworkBaseCase>> testCaseClasses =
+                new ArrayList<Class<? extends FrameworkBaseCase>>();
+
+            // Scan for available test cases using a classpath scanner.
+            // ClasspathScanner.getMatches(DistributedTestCase.class, "^Test.*", true);
+
+            // Hard code the test classes till the classpath scanner is fixed.
+            // Collections.addAll(testCaseClasses, InteropTestCase1DummyRun.class, InteropTestCase2BasicP2P.class,
+            // InteropTestCase3BasicPubSub.class);
+
+            // Parse all of the free arguments as test cases to run.
+            for (int i = 1; true; i++)
+            {
+                String nextFreeArg = options.getProperty(Integer.toString(i));
+
+                // Terminate the loop once all free arguments have been consumed.
+                if (nextFreeArg == null)
+                {
+                    break;
+                }
+
+                try
+                {
+                    Class nextClass = Class.forName(nextFreeArg);
+
+                    if (FrameworkBaseCase.class.isAssignableFrom(nextClass))
+                    {
+                        testCaseClasses.add(nextClass);
+                        console.info("Found distributed test case: " + nextFreeArg);
+                    }
+                }
+                catch (ClassNotFoundException e)
+                {
+                    console.info("Unable to instantiate the test case: " + nextFreeArg + ".");
+                }
+            }
+
+            // Check that some test classes were actually found.
+            if (testCaseClasses.isEmpty())
+            {
+                throw new RuntimeException(
+                    "No test cases implementing FrameworkBaseCase were specified on the command line.");
+            }
+
+            // Extract the names of all the test classes, to pass to the start method.
+            int i = 0;
+            String[] testClassNames = new String[testCaseClasses.size()];
+
+            for (Class testClass : testCaseClasses)
+            {
+                testClassNames[i++] = testClass.getName();
+            }
+
+            // Create a coordinator and begin its test procedure.
+            Coordinator coordinator =
+                new Coordinator(repetitions, duration, threads, 0, params, null, reportDir, testRunName, verbose, brokerUrl,
+                    virtualHost, engine, terminate, csvResults, xmlResults);
+
+            TestResult testResult = coordinator.start(testClassNames);
+
+            // Return different error codes, depending on whether or not there were test failures.
+            if (testResult.failureCount() > 0)
+            {
+                System.exit(FAILURE_EXIT);
+            }
+            else
+            {
+                System.exit(SUCCESS_EXIT);
+            }
+        }
+        catch (Exception e)
+        {
+            log.debug("Top level handler caught execption.", e);
+            console.info(e.getMessage());
+            System.exit(EXCEPTION_EXIT);
+        }
+    }
+
+    /**
+     * Starts all of the test classes to be run by this coordinator.
+     *
+     * @param testClassNames An array of all the coordinating test case implementations.
+     *
+     * @return A JUnit TestResult to run the tests with.
+     *
+     * @throws Exception Any underlying exceptions are allowed to fall through, and fail the test process.
+     */
+    public TestResult start(String[] testClassNames) throws Exception
+    {
+        log.debug("public TestResult start(String[] testClassNames = " + PrettyPrintingUtils.printArray(testClassNames)
+            + ": called");
+
+        // Connect to the broker.
+        connection = TestUtils.createConnection(TestContextProperties.getInstance());
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Destination controlTopic = session.createTopic("iop.control");
+        Destination responseQueue = session.createQueue("coordinator");
+
+        conversationFactory = new ConversationFactory(connection, responseQueue, LinkedBlockingQueue.class);
+        ConversationFactory.Conversation conversation = conversationFactory.startConversation();
+
+        connection.start();
+
+        // Broadcast the compulsory invitation to find out what clients are available to test.
+        Message invite = session.createMessage();
+        invite.setStringProperty("CONTROL_TYPE", "INVITE");
+        invite.setJMSReplyTo(responseQueue);
+
+        conversation.send(controlTopic, invite);
+
+        // Wait for a short time, to give test clients an opportunity to reply to the invitation.
+        Collection<Message> enlists = conversation.receiveAll(0, 500);
+        enlistedClients = extractEnlists(enlists);
+
+        for (TestClientDetails client : enlistedClients)
+        {
+            log.debug("Got enlisted test client: " + client);
+            console.info("Test node " + client.clientName + " available.");
+        }
+
+        // Start the clock reference service running.
+        UDPClockReference clockReference = new UDPClockReference();
+        Thread clockRefThread = new Thread(clockReference);
+        registerShutdownHook(clockReference);
+        clockRefThread.start();
+
+        // Broadcast to all clients to synchronize their clocks against the coordinators clock reference.
+        Message clockSynchRequest = session.createMessage();
+        clockSynchRequest.setStringProperty("CONTROL_TYPE", "CLOCK_SYNCH");
+
+        String localAddress = InetAddress.getByName(InetAddress.getLocalHost().getHostName()).getHostAddress();
+        clockSynchRequest.setStringProperty("ADDRESS", localAddress);
+
+        conversation.send(controlTopic, clockSynchRequest);
+
+        // Run the test in the suite using JUnit.
+        TestResult result = null;
+
+        for (String testClassName : testClassNames)
+        {
+            // Record the current test class, so that the test results can be output to a file incorporating this name.
+            this.currentTestClassName = testClassName;
+
+            result = super.start(new String[] { testClassName });
+        }
+
+        // At this point in time, all tests have completed. Broadcast the shutdown message, if the termination option
+        // was set on the command line.
+        if (terminate)
+        {
+            Message terminate = session.createMessage();
+            terminate.setStringProperty("CONTROL_TYPE", "TERMINATE");
+
+            conversation.send(controlTopic, terminate);
+        }
+
+        return result;
+    }
+
+    /**
+     * For a collection of enlist messages, this method pulls out of the client details for the enlisting clients.
+     *
+     * @param enlists The enlist messages.
+     *
+     * @return A set of enlisting clients, extracted from the enlist messages.
+     *
+     * @throws JMSException Any underlying JMSException is allowed to fall through.
+     */
+    public static Set<TestClientDetails> extractEnlists(Collection<Message> enlists) throws JMSException
+    {
+        log.debug("public static Set<TestClientDetails> extractEnlists(Collection<Message> enlists = " + enlists
+            + "): called");
+
+        Set<TestClientDetails> enlistedClients = new HashSet<TestClientDetails>();
+
+        // Retain the list of all available clients.
+        for (Message enlist : enlists)
+        {
+            TestClientDetails clientDetails = new TestClientDetails();
+            clientDetails.clientName = enlist.getStringProperty("CLIENT_NAME");
+            clientDetails.privateControlKey = enlist.getStringProperty("CLIENT_PRIVATE_CONTROL_KEY");
+
+            String replyType = enlist.getStringProperty("CONTROL_TYPE");
+
+            if ("ENLIST".equals(replyType))
+            {
+                enlistedClients.add(clientDetails);
+            }
+            else if ("DECLINE".equals(replyType))
+            {
+                log.debug("Test client " + clientDetails.clientName + " declined the invite.");
+            }
+            else
+            {
+                log.warn("Got an unknown reply type, " + replyType + ", to the invite.");
+            }
+        }
+
+        return enlistedClients;
+    }
+
+    /**
+     * Runs a test or suite of tests, using the super class implemenation. This method wraps the test to be run
+     * in any test decorators needed to add in the coordinators ability to invite test clients to participate in
+     * tests.
+     *
+     * @param test The test to run.
+     * @param wait Undocumented. Nothing in the JUnit javadocs to say what this is for.
+     *
+     * @return The results of the test run.
+     */
+    public TestResult doRun(Test test, boolean wait)
+    {
+        log.debug("public TestResult doRun(Test \"" + test + "\", boolean " + wait + "): called");
+
+        // Wrap all tests in the test suite with WrappedSuiteTestDecorators. This is quite ugly and a bit baffling,
+        // but the reason it is done is because the JUnit implementation of TestDecorator has some bugs in it.
+        WrappedSuiteTestDecorator targetTest = null;
+
+        if (test instanceof TestSuite)
+        {
+            log.debug("targetTest is a TestSuite");
+
+            TestSuite suite = (TestSuite) test;
+
+            int numTests = suite.countTestCases();
+            log.debug("There are " + numTests + " in the suite.");
+
+            for (int i = 0; i < numTests; i++)
+            {
+                Test nextTest = suite.testAt(i);
+                log.debug("suite.testAt(" + i + ") = " + nextTest);
+
+                if (nextTest instanceof FrameworkBaseCase)
+                {
+                    log.debug("nextTest is a FrameworkBaseCase");
+                }
+            }
+
+            targetTest = new WrappedSuiteTestDecorator(suite);
+            log.debug("Wrapped with a WrappedSuiteTestDecorator.");
+        }
+
+        // Wrap the tests in a suitable distributed test decorator, to perform the invite/test cycle.
+        targetTest = newTestDecorator(targetTest, enlistedClients, conversationFactory, connection);
+
+        // TestSuite suite = new TestSuite();
+        // suite.addTest(targetTest);
+
+        // Wrap the tests in a scaled test decorator to them them as a 'batch' in one thread.
+        // targetTest = new ScaledTestDecorator(targetTest, new int[] { 1 });
+
+        return super.doRun(targetTest, wait);
+    }
+
+    /**
+     * Creates a wrapped test decorator, that is capable of inviting enlisted clients to participate in a specified
+     * test. This is the test engine that sets up the roles and sequences a distributed test case.
+     *
+     * @param targetTest          The test decorator to wrap.
+     * @param enlistedClients     The enlisted clients available to run the test.
+     * @param conversationFactory The conversation factory used to build conversation helper over the specified connection.
+     * @param connection          The connection to talk to the enlisted clients over.
+     *
+     * @return An invititing test decorator, that invites all the enlisted clients to participate in tests, in pairs.
+     */
+    protected DistributedTestDecorator newTestDecorator(WrappedSuiteTestDecorator targetTest,
+        Set<TestClientDetails> enlistedClients, ConversationFactory conversationFactory, Connection connection)
+    {
+        switch (engine)
+        {
+        case FANOUT:
+            return new FanOutTestDecorator(targetTest, enlistedClients, conversationFactory, connection);
+        case INTEROP:
+        default:
+            return new InteropTestDecorator(targetTest, enlistedClients, conversationFactory, connection);
+        }
+    }
+
+    /**
+     * Creates the TestResult object to be used for test runs.
+     *
+     * @return An instance of the test result object.
+     */
+    protected TestResult createTestResult()
+    {
+        log.debug("protected TestResult createTestResult(): called");
+
+        TKTestResult result = new TKTestResult(fPrinter.getWriter(), delay, verbose, testCaseName);
+
+        // Check if a directory to output reports to has been specified and attach test listeners if so.
+        if (reportDir != null)
+        {
+            // Create the report directory if it does not already exist.
+            File reportDirFile = new File(reportDir);
+
+            if (!reportDirFile.exists())
+            {
+                reportDirFile.mkdir();
+            }
+
+            // Create the results file (make the name of this configurable as a command line parameter).
+            Writer timingsWriter;
+
+            // Set up an XML results listener to output the timings to the results file, if requested on the command line.
+            if (xmlResults)
+            {
+                try
+                {
+                    File timingsFile = new File(reportDirFile, "TEST." + currentTestClassName + ".xml");
+                    timingsWriter = new BufferedWriter(new FileWriter(timingsFile), 20000);
+                }
+                catch (IOException e)
+                {
+                    throw new RuntimeException("Unable to create the log file to write test results to: " + e, e);
+                }
+
+                XMLTestListener listener = new XMLTestListener(timingsWriter, currentTestClassName);
+                result.addListener(listener);
+                result.addTKTestListener(listener);
+
+                registerShutdownHook(listener);
+            }
+
+            // Set up an CSV results listener to output the timings to the results file, if requested on the command line.
+            if (csvResults)
+            {
+                try
+                {
+                    File timingsFile =
+                        new File(reportDirFile, testRunName + "-" + TIME_STAMP_FORMAT.format(new Date()) + "-timings.csv");
+                    timingsWriter = new BufferedWriter(new FileWriter(timingsFile), 20000);
+                }
+                catch (IOException e)
+                {
+                    throw new RuntimeException("Unable to create the log file to write test results to: " + e, e);
+                }
+
+                CSVTestListener listener = new CSVTestListener(timingsWriter);
+                result.addListener(listener);
+                result.addTKTestListener(listener);
+
+                // Register the results listeners shutdown hook to flush its data if the test framework is shutdown
+                // prematurely.
+                registerShutdownHook(listener);
+            }
+
+            // Register the results listeners shutdown hook to flush its data if the test framework is shutdown
+            // prematurely.
+            // registerShutdownHook(listener);
+
+            // Record the start time of the batch.
+            // result.notifyStartBatch();
+
+            // At this point in time the test class has been instantiated, giving it an opportunity to read its parameters.
+            // Inform any test listers of the test properties.
+            result.notifyTestProperties(TestContextProperties.getAccessedProps());
+        }
+
+        return result;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
new file mode 100644
index 0000000000..d11348cbad
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
@@ -0,0 +1,166 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import junit.framework.TestResult;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.FrameworkBaseCase;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.sequencers.CircuitFactory;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import java.util.*;
+
+/**
+ * DistributedTestDecorator is a base class for writing test decorators that invite test clients to participate in
+ * distributed test cases. It provides a helper method, {@link #signupClients}, that broadcasts an invitation and
+ * returns the set of test clients that are available to particiapte in the test.
+ *
+ * <p/>When used to wrap a {@link FrameworkBaseCase} test, it replaces the default {@link CircuitFactory} implementations
+ * with a suitable circuit factory for distributed tests. Concrete implementations can use this to configure the sending
+ * and receiving roles on the test.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Broadcast test invitations and collect enlists. <td> {@link ConversationFactory}.
+ * </table>
+ */
+public abstract class DistributedTestDecorator extends WrappedSuiteTestDecorator
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(DistributedTestDecorator.class);
+
+    /** Holds the contact information for all test clients that are available and that may take part in the test. */
+    Set<TestClientDetails> allClients;
+
+    /** Holds the conversation helper for the control level conversation for coordinating the test through. */
+    ConversationFactory conversationFactory;
+
+    /** Holds the connection that the control conversation is held over. */
+    Connection connection;
+
+    /** Holds the underlying test suite that this decorator wraps. */
+    WrappedSuiteTestDecorator testSuite;
+
+    /** Holds the control topic, on which test invitations are broadcast. */
+    protected Destination controlTopic;
+
+    /**
+     * Creates a wrapped suite test decorator from another one.
+     *
+     * @param suite               The test suite.
+     * @param availableClients    The list of all clients that responded to the compulsory invite.
+     * @param controlConversation The conversation helper for the control level, test coordination conversation.
+     * @param controlConnection   The connection that the coordination messages are sent over.
+     */
+    public DistributedTestDecorator(WrappedSuiteTestDecorator suite, Set<TestClientDetails> availableClients,
+        ConversationFactory controlConversation, Connection controlConnection)
+    {
+        super(suite);
+
+        log.debug("public DistributedTestDecorator(WrappedSuiteTestDecorator suite, Set<TestClientDetails> allClients = "
+            + availableClients + ", ConversationHelper controlConversation = " + controlConversation + "): called");
+
+        testSuite = suite;
+        allClients = availableClients;
+        conversationFactory = controlConversation;
+        connection = controlConnection;
+
+        // Set up the test control topic.
+        try
+        {
+            controlTopic = conversationFactory.getSession().createTopic("iop.control");
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Unable to create the coordinating control topic to broadcast test invites on.", e);
+        }
+    }
+
+    /**
+     * Should run all of the tests in the wrapped test suite.
+     *
+     * @param testResult The the results object to monitor the test results with.
+     */
+    public abstract void run(TestResult testResult);
+
+    /**
+     * Should provide the distributed test sequencer to pass to {@link org.apache.qpid.test.framework.FrameworkBaseCase}
+     * tests.
+     *
+     * @return A distributed test sequencer.
+     */
+    public abstract CircuitFactory getTestSequencer();
+
+    /**
+     * Broadcasts an invitation to participate in a coordinating test case to find out what clients are available to
+     * run the test case.
+     *
+     * @param coordTest The coordinating test case to broadcast an inviate for.
+     *
+     * @return A set of test clients that accepted the invitation.
+     */
+    protected Set<TestClientDetails> signupClients(FrameworkBaseCase coordTest)
+    {
+        // Broadcast the invitation to find out what clients are available to test.
+        Set<TestClientDetails> enlists;
+        try
+        {
+            Message invite = conversationFactory.getSession().createMessage();
+
+            ConversationFactory.Conversation conversation = conversationFactory.startConversation();
+
+            invite.setStringProperty("CONTROL_TYPE", "INVITE");
+            invite.setStringProperty("TEST_NAME", coordTest.getTestCaseNameForTestMethod(coordTest.getName()));
+
+            conversation.send(controlTopic, invite);
+
+            // Wait for a short time, to give test clients an opportunity to reply to the invitation.
+            Collection<Message> replies = conversation.receiveAll(allClients.size(), 500);
+            enlists = Coordinator.extractEnlists(replies);
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("There was a JMSException during the invite/enlist conversation.", e);
+        }
+
+        return enlists;
+    }
+
+    /**
+     * Prints a string summarizing this test decorator, mainly for debugging purposes.
+     *
+     * @return String representation for debugging purposes.
+     */
+    public String toString()
+    {
+        return "DistributedTestDecorator: [ testSuite = " + testSuite + " ]";
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
new file mode 100644
index 0000000000..6fc3b2937e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
@@ -0,0 +1,245 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.DropInTest;
+import org.apache.qpid.test.framework.FrameworkBaseCase;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.sequencers.CircuitFactory;
+import org.apache.qpid.test.framework.sequencers.FanOutCircuitFactory;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * FanOutTestDecorator is an {@link DistributedTestDecorator} that runs one test client in the sender role, and the remainder
+ * in the receivers role. It also has the capability to listen for new test cases joining the test beyond the initial start
+ * point. This feature can be usefull when experimenting with adding more load, in the form of more test clients, to assess
+ * its impact on a running test.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Execute coordinated test cases. <td> {@link FrameworkBaseCase}
+ * <tr><td> Accept test clients joining a running test.
+ * </table>
+ */
+public class FanOutTestDecorator extends DistributedTestDecorator implements MessageListener
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(FanOutTestDecorator.class);
+
+    /** Holds the currently running test case. */
+    FrameworkBaseCase currentTest = null;
+
+    /**
+     * Creates a wrapped suite test decorator from another one.
+     *
+     * @param suite               The test suite.
+     * @param availableClients    The list of all clients that responded to the compulsory invite.
+     * @param controlConversation The conversation helper for the control level, test coordination conversation.
+     * @param controlConnection   The connection that the coordination messages are sent over.
+     */
+    public FanOutTestDecorator(WrappedSuiteTestDecorator suite, Set<TestClientDetails> availableClients,
+        ConversationFactory controlConversation, Connection controlConnection)
+    {
+        super(suite, availableClients, controlConversation, controlConnection);
+
+        log.debug("public DistributedTestDecorator(WrappedSuiteTestDecorator suite, Set<TestClientDetails> allClients = "
+            + availableClients + ", ConversationHelper controlConversation = " + controlConversation + "): called");
+
+        testSuite = suite;
+        allClients = availableClients;
+        conversationFactory = controlConversation;
+        connection = controlConnection;
+
+        // Sign available clients up to the test.
+        for (Test test : getAllUnderlyingTests())
+        {
+            FrameworkBaseCase coordTest = (FrameworkBaseCase) test;
+
+            // Get all of the clients able to participate in the test.
+            Set<TestClientDetails> enlists = signupClients(coordTest);
+
+            // Check that there were some clients available.
+            if (enlists.size() == 0)
+            {
+                throw new RuntimeException("No clients to test with");
+            }
+
+            // Create a distributed test circuit factory for the test.
+            CircuitFactory circuitFactory = getTestSequencer();
+
+            // Set up the first client in the sender role, and the remainder in the receivers role.
+            Iterator<TestClientDetails> clients = enlists.iterator();
+            circuitFactory.setSender(clients.next());
+
+            while (clients.hasNext())
+            {
+                // Set the sending and receiving client details on the test case.
+                circuitFactory.setReceiver(clients.next());
+            }
+
+            // Pass down the connection to hold the coordinating conversation over.
+            circuitFactory.setConversationFactory(conversationFactory);
+
+            // If the current test case is a drop-in test, set it up as the currently running test for late joiners to
+            // add in to. Otherwise the current test field is set to null, to indicate that late joiners are not allowed.
+            currentTest = (coordTest instanceof DropInTest) ? coordTest : null;
+
+            // Execute the test case.
+            coordTest.setCircuitFactory(circuitFactory);
+        }
+    }
+
+    /**
+     * Broadcasts a test invitation and accepts enlists from participating clients. The wrapped test cases are run
+     * with one test client in the sender role, and the remaining test clients in the receiving role.
+     *
+     * <p/>Any JMSExceptions during the invite/enlist conversation will be allowed to fall through as runtime
+     * exceptions, resulting in the non-completion of the test run.
+     *
+     * @param testResult The the results object to monitor the test results with.
+     *
+     * @todo Better error recovery for failure of the invite/enlist conversation could be added.
+     */
+    public void run(TestResult testResult)
+    {
+        log.debug("public void run(TestResult testResult): called");
+
+        // Listen for late joiners on the control topic.
+        try
+        {
+            conversationFactory.getSession().createConsumer(controlTopic).setMessageListener(this);
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Unable to set up the message listener on the control topic.", e);
+        }
+
+        // Run all of the test cases in the test suite.
+        /*for (Test test : getAllUnderlyingTests())
+        {
+            FrameworkBaseCase coordTest = (FrameworkBaseCase) test;
+
+            // Get all of the clients able to participate in the test.
+            Set<TestClientDetails> enlists = signupClients(coordTest);
+
+            // Check that there were some clients available.
+            if (enlists.size() == 0)
+            {
+                throw new RuntimeException("No clients to test with");
+            }
+
+            // Create a distributed test circuit factory for the test.
+            CircuitFactory circuitFactory = getTestSequencer();
+
+            // Set up the first client in the sender role, and the remainder in the receivers role.
+            Iterator<TestClientDetails> clients = enlists.iterator();
+            circuitFactory.setSender(clients.next());
+
+            while (clients.hasNext())
+            {
+                // Set the sending and receiving client details on the test case.
+                circuitFactory.setReceiver(clients.next());
+            }
+
+            // Pass down the connection to hold the coordinating conversation over.
+            circuitFactory.setConversationFactory(conversationFactory);
+
+            // If the current test case is a drop-in test, set it up as the currently running test for late joiners to
+            // add in to. Otherwise the current test field is set to null, to indicate that late joiners are not allowed.
+            currentTest = (coordTest instanceof DropInTest) ? coordTest : null;
+
+            // Execute the test case.
+            coordTest.setCircuitFactory(circuitFactory);
+        }*/
+
+        // Run all of the test cases in the test suite.
+        for (Test test : getAllUnderlyingTests())
+        {
+            FrameworkBaseCase coordTest = (FrameworkBaseCase) test;
+
+            coordTest.run(testResult);
+
+            currentTest = null;
+        }
+    }
+
+    /**
+     * Should provide the distributed test sequencer to pass to {@link org.apache.qpid.test.framework.FrameworkBaseCase}
+     * tests.
+     *
+     * @return A distributed test sequencer.
+     */
+    public CircuitFactory getTestSequencer()
+    {
+        return new FanOutCircuitFactory();
+    }
+
+    /**
+     * Listens to incoming messages on the control topic. If the messages are 'join' messages, signalling a new
+     * test client wishing to join the current test, then the new client will be added to the current test in the
+     * receivers role.
+     *
+     * @param message The incoming control message.
+     */
+    public void onMessage(Message message)
+    {
+        try
+        {
+            // Check if the message is from a test client attempting to join a running test, and join it to the current
+            // test case if so.
+            if (message.getStringProperty("CONTROL_TYPE").equals("JOIN") && (currentTest != null))
+            {
+                ((DropInTest) currentTest).lateJoin(message);
+            }
+        }
+        // There is not a lot can be done with this error, so it is deliberately ignored.
+        catch (JMSException e)
+        {
+            log.debug("Unable to process message:" + message);
+        }
+    }
+
+    /**
+     * Prints a string summarizing this test decorator, mainly for debugging purposes.
+     *
+     * @return String representation for debugging purposes.
+     */
+    public String toString()
+    {
+        return "FanOutTestDecorator: [ testSuite = " + testSuite + " ]";
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
new file mode 100644
index 0000000000..130173cc96
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
@@ -0,0 +1,208 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.FrameworkBaseCase;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.sequencers.CircuitFactory;
+import org.apache.qpid.test.framework.sequencers.InteropCircuitFactory;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;
+
+import javax.jms.Connection;
+
+import java.util.*;
+
+/**
+ * DistributedTestDecorator is a test decorator, written to implement the interop test specification. Given a list
+ * of enlisted test clients, that are available to run interop tests, this decorator invites them to participate
+ * in each test in the wrapped test suite. Amongst all the clients that respond to the invite, all pairs are formed,
+ * and each pairing (in both directions, but excluding the reflexive pairings) is split into a sender and receivers
+ * role and a test case run between them. Any enlisted combinations that do not accept a test invite are automatically
+ * failed.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Broadcast test invitations and collect enlists. <td> {@link org.apache.qpid.util.ConversationFactory}.
+ * <tr><td> Output test failures for clients unwilling to run the test case. <td> {@link Coordinator}
+ * <tr><td> Execute distributed test cases. <td> {@link FrameworkBaseCase}
+ * <tr><td> Fail non participating pairings. <td> {@link OptOutTestCase}
+ * </table>
+ */
+public class InteropTestDecorator extends DistributedTestDecorator
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(InteropTestDecorator.class);
+
+    /**
+     * Creates a wrapped suite test decorator from another one.
+     *
+     * @param suite               The test suite.
+     * @param availableClients    The list of all clients that responded to the compulsory invite.
+     * @param controlConversation The conversation helper for the control level, test coordination conversation.
+     * @param controlConnection   The connection that the coordination messages are sent over.
+     */
+    public InteropTestDecorator(WrappedSuiteTestDecorator suite, Set<TestClientDetails> availableClients,
+        ConversationFactory controlConversation, Connection controlConnection)
+    {
+        super(suite, availableClients, controlConversation, controlConnection);
+    }
+
+    /**
+     * Broadcasts a test invitation and accetps enlisting from participating clients. The wrapped test case is
+     * then repeated for every combination of test clients (provided the wrapped test case extends
+     * {@link FrameworkBaseCase}.
+     *
+     * <p/>Any JMSExceptions during the invite/enlist conversation will be allowed to fall through as runtime exceptions,
+     * resulting in the non-completion of the test run.
+     *
+     * @todo Better error recovery for failure of the invite/enlist conversation could be added.
+     *
+     * @param testResult The the results object to monitor the test results with.
+     */
+    public void run(TestResult testResult)
+    {
+        log.debug("public void run(TestResult testResult): called");
+
+        Collection<Test> tests = testSuite.getAllUnderlyingTests();
+
+        for (Test test : getAllUnderlyingTests())
+        {
+            FrameworkBaseCase coordTest = (FrameworkBaseCase) test;
+
+            // Broadcast the invitation to find out what clients are available to test.
+            Set<TestClientDetails> enlists = signupClients(coordTest);
+
+            // Compare the list of willing clients to the list of all available.
+            Set<TestClientDetails> optOuts = new HashSet<TestClientDetails>(allClients);
+            optOuts.removeAll(enlists);
+
+            // Output test failures for clients that will not particpate in the test.
+            Set<List<TestClientDetails>> failPairs = allPairs(optOuts, allClients);
+
+            for (List<TestClientDetails> failPair : failPairs)
+            {
+                // Create a distributed test circuit factory for the test.
+                CircuitFactory circuitFactory = getTestSequencer();
+
+                // Create an automatic failure test for the opted out test pair.
+                FrameworkBaseCase failTest = new OptOutTestCase("testOptOut");
+                circuitFactory.setSender(failPair.get(0));
+                circuitFactory.setReceiver(failPair.get(1));
+                failTest.setCircuitFactory(circuitFactory);
+
+                failTest.run(testResult);
+            }
+
+            // Loop over all combinations of clients, willing to run the test.
+            Set<List<TestClientDetails>> enlistedPairs = allPairs(enlists, enlists);
+
+            for (List<TestClientDetails> enlistedPair : enlistedPairs)
+            {
+                // Create a distributed test circuit factory for the test.
+                CircuitFactory circuitFactory = getTestSequencer();
+
+                // Set the sending and receiving client details on the test circuitFactory.
+                circuitFactory.setSender(enlistedPair.get(0));
+                circuitFactory.setReceiver(enlistedPair.get(1));
+
+                // Pass down the connection to hold the coordination conversation over.
+                circuitFactory.setConversationFactory(conversationFactory);
+
+                // Execute the test case.
+                coordTest.setCircuitFactory(circuitFactory);
+                coordTest.run(testResult);
+            }
+        }
+    }
+
+    /**
+     * Should provide the distributed test sequencer to pass to {@link org.apache.qpid.test.framework.FrameworkBaseCase}
+     * tests.
+     *
+     * @return A distributed test sequencer.
+     */
+    public CircuitFactory getTestSequencer()
+    {
+        return new InteropCircuitFactory();
+    }
+
+    /**
+     * Produces all pairs of combinations of elements from two sets. The ordering of the elements in the pair is
+     * important, that is the pair <l, r> is distinct from <r, l>; both pairs are generated. For any element, i, in
+     * both the left and right sets, the reflexive pair <i, i> is not generated.
+     *
+     * @param left  The left set.
+     * @param right The right set.
+     * @param <E>   The type of the content of the pairs.
+     *
+     * @return All pairs formed from the permutations of all elements of the left and right sets.
+     */
+    private <E> Set<List<E>> allPairs(Set<E> left, Set<E> right)
+    {
+        log.debug("private <E> Set<List<E>> allPairs(Set<E> left = " + left + ", Set<E> right = " + right + "): called");
+
+        Set<List<E>> results = new HashSet<List<E>>();
+
+        // Form all pairs from left to right.
+        // Form all pairs from right to left.
+        for (E le : left)
+        {
+            for (E re : right)
+            {
+                if (!le.equals(re))
+                {
+                    results.add(new Pair<E>(le, re));
+                    results.add(new Pair<E>(re, le));
+                }
+            }
+        }
+
+        log.debug("results = " + results);
+
+        return results;
+    }
+
+    /**
+     * A simple implementation of a pair, using a list.
+     */
+    private class Pair<T> extends ArrayList<T>
+    {
+        /**
+         * Creates a new pair of elements.
+         *
+         * @param first  The first element.
+         * @param second The second element.
+         */
+        public Pair(T first, T second)
+        {
+            super();
+            super.add(first);
+            super.add(second);
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
new file mode 100644
index 0000000000..008b89a981
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
@@ -0,0 +1,69 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import org.apache.qpid.test.framework.sequencers.CircuitFactory;
+import org.apache.qpid.test.framework.FrameworkBaseCase;
+
+/**
+ * An OptOutTestCase is a test case that automatically fails. It is used when a list of test clients has been generated
+ * from a compulsory invite, but only some of those clients have responded to a specific test case invite. The clients
+ * that did not respond, may automatically be given a fail for some tests.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Fail the test with a suitable reason.
+ * </table>
+ */
+public class OptOutTestCase extends FrameworkBaseCase
+{
+    /**
+     * Creates a new coordinating test case with the specified name.
+     *
+     * @param name The test case name.
+     */
+    public OptOutTestCase(String name)
+    {
+        super(name);
+    }
+
+    /** Generates an appropriate test failure assertion. */
+    public void testOptOut()
+    {
+        CircuitFactory circuitFactory = getCircuitFactory();
+
+        fail("One of " + circuitFactory.getSender() + " and " + getCircuitFactory().getReceivers()
+            + " opted out of the test.");
+    }
+
+    /**
+     * Should provide a translation from the junit method name of a test to its test case name as defined in the
+     * interop testing specification. For example the method "testP2P" might map onto the interop test case name
+     * "TC2_BasicP2P".
+     *
+     * @param methodName The name of the JUnit test method.
+     * @return The name of the corresponding interop test case.
+     */
+    public String getTestCaseNameForTestMethod(String methodName)
+    {
+        return "OptOutTest";
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
new file mode 100644
index 0000000000..30fd382333
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
@@ -0,0 +1,108 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.distributedtesting;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Session;
+
+/**
+ * TestClientControlledTest provides an interface that classes implementing test cases to run on a {@link TestClient}
+ * node can use. Implementations must be Java beans, that is, to provide a default constructor and to implement the
+ * {@link #getName} method.
+ *
+ * <p/>The methods specified in this interface are called when the {@link TestClient} receives control instructions to
+ * apply to the test. There are control instructions to present the test case with the test invite, so that it may
+ * choose whether or not to participate in the test, assign the test to play the sender or receiver role, start the
+ * test and obtain the test status report.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Supply the name of the test case that this implements.
+ * <tr><td> Accept/Reject invites based on test parameters.
+ * <tr><td> Adapt to assigned roles.
+ * <tr><td> Perform test case actions.
+ * <tr><td> Generate test reports.
+ * </table>
+ */
+public interface TestClientControlledTest
+{
+    /** Defines the possible test case roles that an interop test case can take on. */
+    public enum Roles
+    {
+        /** Specifies the sender role. */
+        SENDER,
+
+        /** Specifies the receivers role. */
+        RECEIVER
+    }
+
+    /**
+     * Should provide the name of the test case that this class implements. The exact names are defined in the
+     * interop testing spec.
+     *
+     * @return The name of the test case that this implements.
+     */
+    public String getName();
+
+    /**
+     * Determines whether the test invite that matched this test case is acceptable.
+     *
+     * @param inviteMessage The invitation to accept or reject.
+     *
+     * @return <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     */
+    public boolean acceptInvite(Message inviteMessage) throws JMSException;
+
+    /**
+     * Assigns the role to be played by this test case. The test parameters are fully specified in the
+     * assignment message. When this method return the test case will be ready to execute.
+     *
+     * @param role              The role to be played; sender or receivers.
+     * @param assignRoleMessage The role assingment message, contains the full test parameters.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     */
+    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException;
+
+    /**
+     * Performs the test case actions. Returning from here, indicates that the sending role has completed its test.
+     *
+     * @param numMessages The number of test messages to send.
+     *
+     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
+     */
+    public void start(int numMessages) throws JMSException;
+
+    /**
+     * Gets a report on the actions performed by the test case in its assigned role.
+     *
+     * @param session The controlSession to create the report message in.
+     *
+     * @return The report message.
+     *
+     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
+     */
+    public Message getReport(Session session) throws JMSException;
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
new file mode 100644
index 0000000000..3752888a9e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
@@ -0,0 +1,399 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.listeners;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+
+import uk.co.thebadgerset.junit.extensions.ShutdownHookable;
+import uk.co.thebadgerset.junit.extensions.listeners.TKTestListener;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.*;
+
+/**
+ * Listens for test results for a named test and outputs these in the standard JUnit XML format to the specified
+ * writer.
+ *
+ * <p/>The API for this listener accepts notifications about different aspects of a tests results through different
+ * methods, so some assumption needs to be made as to which test result a notification refers to. For example
+ * {@link #startTest} will be called, then possibly {@link #timing} will be called, even though the test instance is
+ * passed in both cases, it is not enough to distinguish a particular run of the test, as the test case instance may
+ * be being shared between multiple threads, or being run a repeated number of times, and can therfore be re-used
+ * between calls. The listeners make the assumption that, for every test, a unique thread will call {@link #startTest}
+ * and {@link #endTest} to delimit each test. All calls to set test parameters, timings, state and so on, will occur
+ * between the start and end and will be given with the same thread id as the start and end, so the thread id provides
+ * a unqiue value to identify a particular test run against.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Listen to test lifecycle notifications.
+ * <tr><td> Listen to test errors and failures.
+ * <tr><td> Listen to test timings.
+ * <tr><td> Listen to test memory usages.
+ * <tr><td> Listen to parameterized test parameters.
+ * <tr><th> Responsibilities
+ * </table>
+ *
+ * @todo Merge this class with CSV test listener, making the collection of results common to both, and only factoring
+ *       out the results printing code into sub-classes. Provide a simple XML results formatter with the same format as
+ *       the ant XML formatter, and a more structured one for outputing results with timings and summaries from
+ *       performance tests.
+ */
+public class XMLTestListener implements TKTestListener, ShutdownHookable
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(XMLTestListener.class);
+
+    /** The results file writer. */
+    protected Writer writer;
+
+    /** Holds the results for individual tests. */
+    // protected Map<Result, Result> results = new LinkedHashMap<Result, Result>();
+    // protected List<Result> results = new ArrayList<Result>();
+
+    /**
+     * Map for holding results on a per thread basis as they come in. A ThreadLocal is not used as sometimes an
+     * explicit thread id must be used, where notifications come from different threads than the ones that called
+     * the test method.
+     */
+    Map<Long, Result> threadLocalResults = Collections.synchronizedMap(new LinkedHashMap<Long, Result>());
+
+    /**
+     * Holds results for tests that have ended. Transferring these results here from the per-thread results map, means
+     * that the thread id is freed for the thread to generate more results.
+     */
+    List<Result> results = new ArrayList<Result>();
+
+    /** Holds the overall error count. */
+    protected int errors = 0;
+
+    /** Holds the overall failure count. */
+    protected int failures = 0;
+
+    /** Holds the overall tests run count. */
+    protected int runs = 0;
+
+    /** Holds the name of the class that tests are being run for. */
+    String testClassName;
+
+    /**
+     * Creates a new XML results output listener that writes to the specified location.
+     *
+     * @param writer        The location to write results to.
+     * @param testClassName The name of the test class to include in the test results.
+     */
+    public XMLTestListener(Writer writer, String testClassName)
+    {
+        log.debug("public XMLTestListener(Writer writer, String testClassName = " + testClassName + "): called");
+
+        this.writer = writer;
+        this.testClassName = testClassName;
+    }
+
+    /**
+     * Resets the test results to the default state of time zero, memory usage zero, parameter zero, test passed.
+     *
+     * @param test     The test to resest any results for.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void reset(Test test, Long threadId)
+    {
+        log.debug("public void reset(Test test = " + test + ", Long threadId = " + threadId + "): called");
+
+        XMLTestListener.Result r =
+            (threadId == null) ? threadLocalResults.get(Thread.currentThread().getId()) : threadLocalResults.get(threadId);
+
+        r.error = null;
+        r.failure = null;
+
+    }
+
+    /**
+     * Notification that a test started.
+     *
+     * @param test The test that started.
+     */
+    public void startTest(Test test)
+    {
+        log.debug("public void startTest(Test test = " + test + "): called");
+
+        Result newResult = new Result(test.getClass().getName(), ((TestCase) test).getName());
+
+        // Initialize the thread local test results.
+        threadLocalResults.put(Thread.currentThread().getId(), newResult);
+        runs++;
+    }
+
+    /**
+     * Should be called every time a test completes with the run time of that test.
+     *
+     * @param test     The name of the test.
+     * @param nanos    The run time of the test in nanoseconds.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void timing(Test test, long nanos, Long threadId)
+    { }
+
+    /**
+     * Should be called every time a test completed with the amount of memory used before and after the test was run.
+     *
+     * @param test     The test which memory was measured for.
+     * @param memStart The total JVM memory used before the test was run.
+     * @param memEnd   The total JVM memory used after the test was run.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void memoryUsed(Test test, long memStart, long memEnd, Long threadId)
+    { }
+
+    /**
+     * Should be called every time a parameterized test completed with the int value of its test parameter.
+     *
+     * @param test      The test which memory was measured for.
+     * @param parameter The int parameter value.
+     * @param threadId  Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void parameterValue(Test test, int parameter, Long threadId)
+    { }
+
+    /**
+     * Should be called every time a test completes with the current number of test threads running.
+     *
+     * @param test     The test for which the measurement is being generated.
+     * @param threads  The number of tests being run concurrently.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void concurrencyLevel(Test test, int threads, Long threadId)
+    { }
+
+    /**
+     * Notifies listeners of the tests read/set properties.
+     *
+     * @param properties The tests read/set properties.
+     */
+    public void properties(Properties properties)
+    { }
+
+    /**
+     * Notification that a test ended.
+     *
+     * @param test The test that ended.
+     */
+    public void endTest(Test test)
+    {
+        log.debug("public void endTest(Test test = " + test + "): called");
+
+        // Move complete test results into the completed tests list.
+        Result r = threadLocalResults.get(Thread.currentThread().getId());
+        results.add(r);
+
+        // Clear all the test results for the thread.
+        threadLocalResults.remove(Thread.currentThread().getId());
+    }
+
+    /**
+     * Called when a test completes. Success, failure and errors. This method should be used when registering an
+     * end test from a different thread than the one that started the test.
+     *
+     * @param test     The test which completed.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void endTest(Test test, Long threadId)
+    {
+        log.debug("public void endTest(Test test = " + test + ", Long threadId = " + threadId + "): called");
+
+        // Move complete test results into the completed tests list.
+        Result r =
+            (threadId == null) ? threadLocalResults.get(Thread.currentThread().getId()) : threadLocalResults.get(threadId);
+        results.add(r);
+
+        // Clear all the test results for the thread.
+        threadLocalResults.remove(Thread.currentThread().getId());
+    }
+
+    /**
+     * An error occurred.
+     *
+     * @param test The test in which the error occurred.
+     * @param t    The throwable that resulted from the error.
+     */
+    public void addError(Test test, Throwable t)
+    {
+        log.debug("public void addError(Test test = " + test + ", Throwable t = " + t + "): called");
+
+        Result r = threadLocalResults.get(Thread.currentThread().getId());
+        r.error = t;
+        errors++;
+    }
+
+    /**
+     * A failure occurred.
+     *
+     * @param test The test in which the failure occurred.
+     * @param t    The JUnit assertions that led to the failure.
+     */
+    public void addFailure(Test test, AssertionFailedError t)
+    {
+        log.debug("public void addFailure(Test test = " + test + ", AssertionFailedError t = " + t + "): called");
+
+        Result r = threadLocalResults.get(Thread.currentThread().getId());
+        r.failure = t;
+        failures++;
+    }
+
+    /**
+     * Called when a test completes to mark it as a test fail. This method should be used when registering a
+     * failure from a different thread than the one that started the test.
+     *
+     * @param test     The test which failed.
+     * @param e        The assertion that failed the test.
+     * @param threadId Optional thread id if not calling from thread that started the test method. May be null.
+     */
+    public void addFailure(Test test, AssertionFailedError e, Long threadId)
+    {
+        log.debug("public void addFailure(Test test, AssertionFailedError e, Long threadId): called");
+
+        Result r =
+            (threadId == null) ? threadLocalResults.get(Thread.currentThread().getId()) : threadLocalResults.get(threadId);
+        r.failure = e;
+        failures++;
+    }
+
+    /**
+     * Notifies listeners of the start of a complete run of tests.
+     */
+    public void startBatch()
+    {
+        log.debug("public void startBatch(): called");
+
+        // Reset all results counts.
+        threadLocalResults = Collections.synchronizedMap(new HashMap<Long, Result>());
+        errors = 0;
+        failures = 0;
+        runs = 0;
+
+        // Write out the file header.
+        try
+        {
+            writer.write("<?xml version=\"1.0\" ?>\n");
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Unable to write the test results.", e);
+        }
+    }
+
+    /**
+     * Notifies listeners of the end of a complete run of tests.
+     *
+     * @param parameters The optional test parameters to log out with the batch results.
+     */
+    public void endBatch(Properties parameters)
+    {
+        log.debug("public void endBatch(Properties parameters = " + parameters + "): called");
+
+        // Write out the results.
+        try
+        {
+            // writer.write("<?xml version=\"1.0\" ?>\n");
+            writer.write("<testsuite errors=\"" + errors + "\" failures=\"" + failures + "\" tests=\"" + runs + "\" name=\""
+                + testClassName + "\">\n");
+
+            for (Result result : results)
+            {
+                writer.write("  <testcase classname=\"" + result.testClass + "\" name=\"" + result.testName + "\">\n");
+
+                if (result.error != null)
+                {
+                    writer.write("    <error type=\"" + result.error.getClass() + "\">");
+                    result.error.printStackTrace(new PrintWriter(writer));
+                    writer.write("    </error>");
+                }
+                else if (result.failure != null)
+                {
+                    writer.write("    <failure type=\"" + result.failure.getClass() + "\">");
+                    result.failure.printStackTrace(new PrintWriter(writer));
+                    writer.write("    </failure>");
+                }
+
+                writer.write("  </testcase>\n");
+            }
+
+            writer.write("</testsuite>\n");
+            writer.flush();
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Unable to write the test results.", e);
+        }
+    }
+
+    /**
+     * Supplies the shutdown hook.
+     *
+     * @return The shut down hook.
+     */
+    public Thread getShutdownHook()
+    {
+        return new Thread(new Runnable()
+                {
+                    public void run()
+                    {
+                        log.debug("XMLTestListener::ShutdownHook: called");
+                    }
+                });
+    }
+
+    /**
+     * Used to capture the results of a particular test run.
+     */
+    protected static class Result
+    {
+        /** Holds the name of the test class. */
+        public String testClass;
+
+        /** Holds the name of the test method. */
+        public String testName;
+
+        /** Holds the exception that caused error in this test. */
+        public Throwable error;
+
+        /** Holds the assertion exception that caused failure in this test. */
+        public AssertionFailedError failure;
+
+        /**
+         * Creates a placeholder for the results of a test.
+         *
+         * @param testClass The test class.
+         * @param testName  The name of the test that was run.
+         */
+        public Result(String testClass, String testName)
+        {
+            this.testClass = testClass;
+            this.testName = testName;
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
new file mode 100644
index 0000000000..2900b7b02d
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
@@ -0,0 +1,452 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.localcircuit;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.framework.*;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.*;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * LocalCircuitImpl provides an implementation of the test circuit. This is a local only circuit implementation that
+ * supports a single producer/consumer on each end of the circuit, with both ends of the circuit on the same JVM.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Supply the publishing and receiving ends of a test messaging circuit.
+ *     <td> {@link LocalPublisherImpl}, {@link LocalReceiverImpl}
+ * <tr><td> Start the circuit running.
+ * <tr><td> Close the circuit down.
+ * <tr><td> Take a reading of the circuits state.
+ * <tr><td> Apply assertions against the circuits state. <td> {@link Assertion}
+ * <tr><td> Send test messages over the circuit.
+ * <tr><td> Perform the default test procedure on the circuit.
+ * <tr><td> Provide access to connection and controlSession exception monitors <td> {@link ExceptionMonitor}
+ * </table>
+ */
+public class LocalCircuitImpl implements Circuit
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(LocalCircuitImpl.class);
+
+    /** Used to create unique destination names for each test. */
+    private static AtomicLong uniqueDestsId = new AtomicLong();
+
+    /** Holds the test configuration for the circuit. */
+    private ParsedProperties testProps;
+
+    /** Holds the publishing end of the circuit. */
+    private LocalPublisherImpl publisher;
+
+    /** Holds the receiving end of the circuit. */
+    private LocalReceiverImpl receiver;
+
+    /** Holds the connection for the publishing end of the circuit. */
+    private Connection connection;
+
+    /** Holds the exception listener for the connection on the publishing end of the circuit. */
+    private ExceptionMonitor connectionExceptionMonitor;
+
+    /** Holds the exception listener for the controlSession on the publishing end of the circuit. */
+    private ExceptionMonitor exceptionMonitor;
+
+    /**
+     * Creates a test circuit using the specified test parameters. The publisher, receivers, connection and
+     * connection monitor must already have been created, to assemble the circuit.
+     *
+     * @param testProps                  The test parameters.
+     * @param publisher                  The test publisher.
+     * @param receiver                   The test receivers.
+     * @param connection                 The connection.
+     * @param connectionExceptionMonitor The connection exception monitor.
+     */
+    protected LocalCircuitImpl(ParsedProperties testProps, LocalPublisherImpl publisher, LocalReceiverImpl receiver,
+        Connection connection, ExceptionMonitor connectionExceptionMonitor)
+    {
+        this.testProps = testProps;
+        this.publisher = publisher;
+        this.receiver = receiver;
+        this.connection = connection;
+        this.connectionExceptionMonitor = connectionExceptionMonitor;
+        this.exceptionMonitor = new ExceptionMonitor();
+
+        // Set this as the parent circuit on the publisher and receivers.
+        publisher.setCircuit(this);
+        receiver.setCircuit(this);
+    }
+
+    /**
+     * Creates a local test circuit from the specified test parameters.
+     *
+     * @param testProps The test parameters.
+     *
+     * @return A connected and ready to start, test circuit.
+     */
+    public static Circuit createCircuit(ParsedProperties testProps)
+    {
+        // Create a standard publisher/receivers test client pair on a shared connection, individual sessions.
+        try
+        {
+            // Cast the test properties into a typed interface for convenience.
+            MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProps);
+
+            // Get a unique offset to append to destination names to make them unique to the connection.
+            long uniqueId = uniqueDestsId.incrementAndGet();
+
+            // Set up the connection.
+            Connection connection = TestUtils.createConnection(testProps);
+
+            // Add the connection exception listener to assert on exception conditions with.
+            // ExceptionMonitor exceptionMonitor = new ExceptionMonitor();
+            // connection.setExceptionListener(exceptionMonitor);
+
+            // Set up the publisher.
+            CircuitEndBase publisherEnd = createPublisherCircuitEnd(connection, props, uniqueId);
+
+            // Set up the receiver.
+            CircuitEndBase receiverEnd = createReceiverCircuitEnd(connection, props, uniqueId);
+
+            // Start listening for incoming messages.
+            connection.start();
+
+            // Package everything up.
+            LocalPublisherImpl publisher = new LocalPublisherImpl(publisherEnd);
+            LocalReceiverImpl receiver = new LocalReceiverImpl(receiverEnd);
+
+            return new LocalCircuitImpl(testProps, publisher, receiver, connection, publisher.getExceptionMonitor());
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Could not create publisher/receivers pair due to a JMSException.", e);
+        }
+    }
+
+    /**
+     * Builds a circuit end suitable for the publishing side of a test circuit, from standard test parameters.
+     *
+     * @param connection The connection to build the circuit end on.
+     * @param testProps  The test parameters to configure the circuit end construction.
+     * @param uniqueId   A unique number to being numbering destinations from, to make this circuit unique.
+     *
+     * @return A circuit end suitable for the publishing side of a test circuit.
+     *
+     * @throws JMSException Any underlying JMSExceptions are allowed to fall through and fail the creation.
+     */
+    public static CircuitEndBase createPublisherCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)
+        throws JMSException
+    {
+        log.debug(
+            "public static CircuitEndBase createPublisherCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId = "
+            + uniqueId + "): called");
+
+        // Cast the test properties into a typed interface for convenience.
+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProps);
+
+        Session session = connection.createSession(props.getTransacted(), props.getAckMode());
+
+        Destination destination =
+            props.getPubsub() ? session.createTopic(props.getSendDestinationNameRoot() + "_" + uniqueId)
+                              : session.createQueue(props.getSendDestinationNameRoot() + "_" + uniqueId);
+
+        MessageProducer producer =
+            props.getPublisherProducerBind()
+            ? ((props.getImmediate() | props.getMandatory())
+                ? ((AMQSession) session).createProducer(destination, props.getMandatory(), props.getImmediate())
+                : session.createProducer(destination)) : null;
+
+        MessageConsumer consumer =
+            props.getPublisherConsumerBind()
+            ? session.createConsumer(session.createQueue(props.getReceiveDestinationNameRoot() + "_" + uniqueId)) : null;
+
+        MessageMonitor messageMonitor = new MessageMonitor();
+
+        if (consumer != null)
+        {
+            consumer.setMessageListener(messageMonitor);
+        }
+
+        ExceptionMonitor exceptionMonitor = new ExceptionMonitor();
+        connection.setExceptionListener(exceptionMonitor);
+
+        if (!props.getPublisherConsumerActive() && (consumer != null))
+        {
+            consumer.close();
+        }
+
+        return new CircuitEndBase(producer, consumer, session, messageMonitor, exceptionMonitor);
+    }
+
+    /**
+     * Builds a circuit end suitable for the receiving side of a test circuit, from standard test parameters.
+     *
+     * @param connection The connection to build the circuit end on.
+     * @param testProps  The test parameters to configure the circuit end construction.
+     * @param uniqueId   A unique number to being numbering destinations from, to make this circuit unique.
+     *
+     * @return A circuit end suitable for the receiving side of a test circuit.
+     *
+     * @throws JMSException Any underlying JMSExceptions are allowed to fall through and fail the creation.
+     */
+    public static CircuitEndBase createReceiverCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)
+        throws JMSException
+    {
+        log.debug(
+            "public static CircuitEndBase createReceiverCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId = "
+            + uniqueId + "): called");
+
+        // Cast the test properties into a typed interface for convenience.
+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProps);
+
+        Session session = connection.createSession(props.getTransacted(), props.getAckMode());
+
+        MessageProducer producer =
+            props.getReceiverProducerBind()
+            ? session.createProducer(session.createQueue(props.getReceiveDestinationNameRoot() + "_" + uniqueId)) : null;
+
+        Destination destination =
+            props.getPubsub() ? session.createTopic(props.getSendDestinationNameRoot() + "_" + uniqueId)
+                              : session.createQueue(props.getSendDestinationNameRoot() + "_" + uniqueId);
+
+        MessageConsumer consumer =
+            props.getReceiverConsumerBind()
+            ? ((props.getDurableSubscription() && props.getPubsub())
+                ? session.createDurableSubscriber((Topic) destination, "testsub") : session.createConsumer(destination))
+            : null;
+
+        MessageMonitor messageMonitor = new MessageMonitor();
+
+        if (consumer != null)
+        {
+            consumer.setMessageListener(messageMonitor);
+        }
+
+        if (!props.getReceiverConsumerActive() && (consumer != null))
+        {
+            consumer.close();
+        }
+
+        return new CircuitEndBase(producer, consumer, session, messageMonitor, null);
+    }
+
+    /**
+     * Gets the interface on the publishing end of the circuit.
+     *
+     * @return The publishing end of the circuit.
+     */
+    public Publisher getPublisher()
+    {
+        return publisher;
+    }
+
+    /**
+     * Gets the local publishing circuit end, for direct manipulation.
+     *
+     * @return The local publishing circuit end.
+     */
+    public CircuitEnd getLocalPublisherCircuitEnd()
+    {
+        return publisher;
+    }
+
+    /**
+     * Gets the interface on the receiving end of the circuit.
+     *
+     * @return The receiving end of the circuit.
+     */
+    public Receiver getReceiver()
+    {
+        return receiver;
+    }
+
+    /**
+     * Gets the local receiving circuit end, for direct manipulation.
+     *
+     * @return The local receiving circuit end.
+     */
+    public CircuitEnd getLocalReceiverCircuitEnd()
+    {
+        return receiver;
+    }
+
+    /**
+     * Checks the test circuit. The effect of this is to gather the circuits state, for both ends of the circuit,
+     * into a report, against which assertions may be checked.
+     */
+    public void check()
+    { }
+
+    /**
+     * Applied a list of assertions against the test circuit. The {@link #check()} method should be called before doing
+     * this, to ensure that the circuit has gathered its state into a report to assert against.
+     *
+     * @param assertions The list of assertions to apply.
+     * @return Any assertions that failed.
+     */
+    public List<Assertion> applyAssertions(List<Assertion> assertions)
+    {
+        List<Assertion> failures = new LinkedList<Assertion>();
+
+        for (Assertion assertion : assertions)
+        {
+            if (!assertion.apply())
+            {
+                failures.add(assertion);
+            }
+        }
+
+        return failures;
+    }
+
+    /**
+     * Connects and starts the circuit. After this method is called the circuit is ready to send messages.
+     */
+    public void start()
+    { }
+
+    /**
+     * Closes the circuit. All associated resources are closed.
+     */
+    public void close()
+    {
+        try
+        {
+            publisher.close();
+            receiver.close();
+            connection.close();
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Got JMSException during close.", e);
+        }
+    }
+
+    /**
+     * Sends a message on the test circuit. The exact nature of the message sent is controlled by the test parameters.
+     */
+    protected void send()
+    {
+        boolean transactional = testProps.getPropertyAsBoolean(MessagingTestConfigProperties.TRANSACTED_PROPNAME);
+
+        // Send an immediate message through the publisher and ensure that it results in a JMSException.
+        try
+        {
+            CircuitEnd end = getLocalPublisherCircuitEnd();
+
+            end.send(createTestMessage(end));
+
+            if (transactional)
+            {
+                end.getSession().commit();
+            }
+        }
+        catch (JMSException e)
+        {
+            exceptionMonitor.onException(e);
+        }
+    }
+
+    /**
+     * Runs the default test procedure against the circuit, and checks that all of the specified assertions hold. The
+     * outline of the default test procedure is:
+     *
+     * <p/><pre>
+     * Start the circuit.
+     * Send test messages.
+     * Request a status report.
+     * Assert conditions on the publishing end of the circuit.
+     * Assert conditions on the receiving end of the circuit.
+     * Close the circuit.
+     * Pass with no failed assertions or fail with a list of failed assertions.
+     * </pre>
+     *
+     * @param numMessages The number of messages to send using the default test procedure.
+     * @param assertions  The list of assertions to apply.
+     * @return Any assertions that failed.
+     */
+    public List<Assertion> test(int numMessages, List<Assertion> assertions)
+    {
+        // Start the test circuit.
+        start();
+
+        // Send the requested number of test messages.
+        for (int i = 0; i < numMessages; i++)
+        {
+            send();
+        }
+
+        // Inject a short pause to allow time for exceptions to come back asynchronously.
+        TestUtils.pause(100L);
+
+        // Request a status report.
+        check();
+
+        // Apply all of the requested assertions, keeping record of any that fail.
+        List<Assertion> failures = applyAssertions(assertions);
+
+        // Clean up the publisher/receivers/controlSession/connections.
+        close();
+
+        // Return any failed assertions to the caller.
+        return failures;
+    }
+
+    /**
+     * Creates a message with the properties defined as per the test parameters.
+     *
+     * @param client The circuit end to create the message on.
+     *
+     * @return The test message.
+     *
+     * @throws JMSException Any JMSException occurring during creation of the message is allowed to fall through.
+     */
+    private Message createTestMessage(CircuitEnd client) throws JMSException
+    {
+        return client.getSession().createTextMessage("Hello");
+    }
+
+    /**
+     * Gets the exception monitor for the publishing ends connection.
+     *
+     * @return The exception monitor for the publishing ends connection.
+     */
+    public ExceptionMonitor getConnectionExceptionMonitor()
+    {
+        return connectionExceptionMonitor;
+    }
+
+    /**
+     * Gets the exception monitor for the publishing ends controlSession.
+     *
+     * @return The exception monitor for the publishing ends controlSession.
+     */
+    public ExceptionMonitor getExceptionMonitor()
+    {
+        return exceptionMonitor;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
new file mode 100644
index 0000000000..5c5807dcd9
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
@@ -0,0 +1,180 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.localcircuit;
+
+import org.apache.qpid.client.AMQNoConsumersException;
+import org.apache.qpid.client.AMQNoRouteException;
+import org.apache.qpid.test.framework.*;
+
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+/**
+ * Provides an implementation of the {@link Publisher} interface and wraps a single message producer and consumer on
+ * a single controlSession, as a {@link CircuitEnd}. A local publisher also acts as a circuit end, because for a locally
+ * located circuit the assertions may be applied directly, there does not need to be any inter process messaging
+ * between the publisher and its single circuit end, in order to ascertain its status.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Provide a message producer for sending messages.
+ * <tr><td> Provide a message consumer for receiving messages.
+ * <tr><td> Provide assertion that the publisher received no exceptions.
+ * <tr><td> Provide assertion that the publisher received a no consumers error code.
+ * <tr><td> Provide assertion that the publisher received a no route error code.
+ * </table>
+ */
+public class LocalPublisherImpl extends CircuitEndBase implements Publisher
+{
+    /** Holds a reference to the containing circuit. */
+    private LocalCircuitImpl circuit;
+
+    /**
+     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     *
+     * @param producer The message producer for the circuit end point.
+     * @param consumer The message consumer for the circuit end point.
+     * @param session  The controlSession for the circuit end point.
+     */
+    public LocalPublisherImpl(MessageProducer producer, MessageConsumer consumer, Session session,
+        MessageMonitor messageMonitor, ExceptionMonitor exceptionMonitor)
+    {
+        super(producer, consumer, session, messageMonitor, exceptionMonitor);
+    }
+
+    /**
+     * Creates a circuit end point from the producer, consumer and controlSession in a circuit end base implementation.
+     *
+     * @param end The circuit end base implementation to take producers and consumers from.
+     */
+    public LocalPublisherImpl(CircuitEndBase end)
+    {
+        super(end.getProducer(), end.getConsumer(), end.getSession(), end.getMessageMonitor(), end.getExceptionMonitor());
+    }
+
+    /**
+     * Provides an assertion that the publisher encountered no exceptions.
+     *
+     * @return An assertion that the publisher encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion()
+    {
+        return new AssertionBase()
+            {
+                public boolean apply()
+                {
+                    boolean passed = true;
+                    ExceptionMonitor sessionExceptionMonitor = circuit.getExceptionMonitor();
+                    ExceptionMonitor connectionExceptionMonitor = circuit.getConnectionExceptionMonitor();
+
+                    if (!connectionExceptionMonitor.assertNoExceptions())
+                    {
+                        passed = false;
+
+                        addError("Was expecting no exceptions.\n");
+                        addError("Got the following exceptions on the connection, "
+                            + circuit.getConnectionExceptionMonitor());
+                    }
+
+                    if (!sessionExceptionMonitor.assertNoExceptions())
+                    {
+                        passed = false;
+
+                        addError("Was expecting no exceptions.\n");
+                        addError("Got the following exceptions on the producer, " + circuit.getExceptionMonitor());
+                    }
+
+                    return passed;
+                }
+            };
+    }
+
+    /**
+     * Provides an assertion that the publisher got a no consumers exception on every message.
+     *
+     * @return An assertion that the publisher got a no consumers exception on every message.
+     */
+    public Assertion noConsumersAssertion()
+    {
+        return new AssertionBase()
+            {
+                public boolean apply()
+                {
+                    boolean passed = true;
+                    ExceptionMonitor connectionExceptionMonitor = circuit.getConnectionExceptionMonitor();
+
+                    if (!connectionExceptionMonitor.assertOneJMSExceptionWithLinkedCause(AMQNoConsumersException.class))
+                    {
+                        passed = false;
+
+                        addError("Was expecting linked exception type " + AMQNoConsumersException.class.getName()
+                            + " on the connection.\n");
+                        addError((connectionExceptionMonitor.size() > 0)
+                            ? ("Actually got the following exceptions on the connection, " + connectionExceptionMonitor)
+                            : "Got no exceptions on the connection.");
+                    }
+
+                    return passed;
+                }
+            };
+    }
+
+    /**
+     * Provides an assertion that the publisher got a no rout exception on every message.
+     *
+     * @return An assertion that the publisher got a no rout exception on every message.
+     */
+    public Assertion noRouteAssertion()
+    {
+        return new AssertionBase()
+            {
+                public boolean apply()
+                {
+                    boolean passed = true;
+                    ExceptionMonitor connectionExceptionMonitor = circuit.getConnectionExceptionMonitor();
+
+                    if (!connectionExceptionMonitor.assertOneJMSExceptionWithLinkedCause(AMQNoRouteException.class))
+                    {
+                        passed = false;
+
+                        addError("Was expecting linked exception type " + AMQNoRouteException.class.getName()
+                            + " on the connection.\n");
+                        addError((connectionExceptionMonitor.size() > 0)
+                            ? ("Actually got the following exceptions on the connection, " + connectionExceptionMonitor)
+                            : "Got no exceptions on the connection.");
+                    }
+
+                    return passed;
+                }
+            };
+    }
+
+    /**
+     * Sets the contianing circuit.
+     *
+     * @param circuit The containing circuit.
+     */
+    public void setCircuit(LocalCircuitImpl circuit)
+    {
+        this.circuit = circuit;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
new file mode 100644
index 0000000000..0c5dae096e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
@@ -0,0 +1,100 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.localcircuit;
+
+import org.apache.qpid.test.framework.*;
+
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+/**
+ * Provides an implementation of the {@link Receiver} interface that wraps a single message producer and consumer on
+ * a single controlSession, as a {@link CircuitEnd}. A local receiver also acts as a circuit end, because for a locally
+ * located circuit the assertions may be applied directly, there does not need to be any inter process messaging
+ * between the publisher and its single circuit end, in order to ascertain its status.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Provide a message producer for sending messages.
+ * <tr><td> Provide a message consumer for receiving messages.
+ * <tr><td> Provide assertion that the receivers received no exceptions.
+ * <tr><td> Provide assertion that the receivers received all test messages sent to it.
+ * </table>
+ */
+public class LocalReceiverImpl extends CircuitEndBase implements Receiver
+{
+    /** Holds a reference to the containing circuit. */
+    private LocalCircuitImpl circuit;
+
+    /**
+     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     *
+     * @param producer The message producer for the circuit end point.
+     * @param consumer The message consumer for the circuit end point.
+     * @param session  The controlSession for the circuit end point.
+     */
+    public LocalReceiverImpl(MessageProducer producer, MessageConsumer consumer, Session session,
+        MessageMonitor messageMonitor, ExceptionMonitor exceptionMonitor)
+    {
+        super(producer, consumer, session, messageMonitor, exceptionMonitor);
+    }
+
+    /**
+     * Creates a circuit end point from the producer, consumer and controlSession in a circuit end base implementation.
+     *
+     * @param end The circuit end base implementation to take producers and consumers from.
+     */
+    public LocalReceiverImpl(CircuitEndBase end)
+    {
+        super(end.getProducer(), end.getConsumer(), end.getSession(), end.getMessageMonitor(), end.getExceptionMonitor());
+    }
+
+    /**
+     * Provides an assertion that the receivers encountered no exceptions.
+     *
+     * @return An assertion that the receivers encountered no exceptions.
+     */
+    public Assertion noExceptionsAssertion()
+    {
+        return null;
+    }
+
+    /**
+     * Provides an assertion that the receivers got all messages that were sent to it.
+     *
+     * @return An assertion that the receivers got all messages that were sent to it.
+     */
+    public Assertion allMessagesAssertion()
+    {
+        return null;
+    }
+
+    /**
+     * Sets the contianing circuit.
+     *
+     * @param circuit The containing circuit.
+     */
+    public void setCircuit(LocalCircuitImpl circuit)
+    {
+        this.circuit = circuit;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html b/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
new file mode 100644
index 0000000000..92fe40d529
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
@@ -0,0 +1,22 @@
+<html>
+<body>
+<p/>A framework for testing Qpid, built around a standard 'test circuit' design. The idea behind this framework is the
+use of a test circuit which is configured by a set of test parameters, that may be projected onto a topology of
+test nodes, with tests scripted to run over test circuits, making as few assumptions as possible about the underlying
+topology. The standardization of the design, whilst limiting in some respectes, allows a large variety of test 
+scenarios to be written with minimal amounts of coding.
+
+<p/>The standard consruction block for a test, is a test circuit. This consists of a publisher, and a receiver. The
+publisher and receiver may reside on the same machine, or may be distributed. Will use a standard set of properties to
+define the desired circuit topology.
+
+<p/>Tests are always to be controlled from the publishing side only. The receiving end of the circuit is to be exposed
+to the test code through an interface, that abstracts as much as possible the receiving end of the test. The interface
+exposes a set of 'assertions' that may be applied to the receiving end of the test circuit.
+
+<p/>In the case where the receiving end of the circuit resides on the same JVM, the assertions will call the receivers
+code locally. Where the receiving end is distributed accross one or more machines, the assertions will be applied to a
+test report gethered from all of the receivers. Test code will be written to the assertions making as few assumptions
+as possible about the exact test topology.
+</body>
+</html>
\ No newline at end of file
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
new file mode 100644
index 0000000000..4514fb836c
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
@@ -0,0 +1,128 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.sequencers;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.Circuit;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.util.ConversationFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public abstract class BaseCircuitFactory implements CircuitFactory
+{
+    /** Used for debugging. */
+    private final Logger log = Logger.getLogger(BaseCircuitFactory.class);
+
+    /** Holds the contact details for the sending test client. */
+    protected TestClientDetails sender;
+
+    /** Holds the contact details for the receving test client. */
+    protected List<TestClientDetails> receivers = new LinkedList<TestClientDetails>();
+
+    /** Holds the conversation factory over which to coordinate the test. */
+    protected ConversationFactory conversationFactory;
+
+    /**
+     * Creates a test circuit for the test, configered by the test parameters specified.
+     *
+     * @param testProperties The test parameters.
+     * @return A test circuit.
+     */
+    public Circuit createCircuit(Properties testProperties)
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+      * Sets the sender test client to coordinate the test with.
+      *
+      * @param sender The contact details of the sending client in the test.
+      */
+    public void setSender(TestClientDetails sender)
+    {
+        log.debug("public void setSender(TestClientDetails sender = " + sender + "): called");
+
+        this.sender = sender;
+    }
+
+    /**
+     * Sets the receiving test client to coordinate the test with.
+     *
+     * @param receiver The contact details of the sending client in the test.
+     */
+    public void setReceiver(TestClientDetails receiver)
+    {
+        log.debug("public void setReceiver(TestClientDetails receivers = " + receiver + "): called");
+
+        this.receivers.add(receiver);
+    }
+
+    /**
+     * Supplies the sending test client.
+     *
+     * @return The sending test client.
+     */
+    public TestClientDetails getSender()
+    {
+        return sender;
+    }
+
+    /**
+     * Supplies the receiving test client.
+     *
+     * @return The receiving test client.
+     */
+    public List<TestClientDetails> getReceivers()
+    {
+        return receivers;
+    }
+
+    /**
+     * Accepts the conversation factory over which to hold the test coordinating conversation.
+     *
+     * @param conversationFactory The conversation factory to coordinate the test over.
+     */
+    public void setConversationFactory(ConversationFactory conversationFactory)
+    {
+        this.conversationFactory = conversationFactory;
+    }
+
+    /**
+     * Provides the conversation factory for providing the distributed test sequencing conversations over the test
+     * connection.
+     *
+     * @return The conversation factory to create test sequencing conversations with.
+     */
+    public ConversationFactory getConversationFactory()
+    {
+        return conversationFactory;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
new file mode 100644
index 0000000000..bf7fedcffc
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
@@ -0,0 +1,111 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.sequencers;
+
+import org.apache.qpid.test.framework.Assertion;
+import org.apache.qpid.test.framework.Circuit;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * A TestCaseSequence is responsibile for creating test circuits appropriate to the context that a test case is
+ * running in, and providing an implementation of a standard test procedure over a test circuit.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities
+ * <tr><td> Provide a standard test procedure over a test circuit.
+ * <tr><td> Construct test circuits appropriate to a tests context.
+ * </table>
+ *
+ * @todo The sequence test method is deprecated, in favour of using test circuits instead. This interface might be
+ *       better renamed to somethign like CircuitFactory, also the split between this interface and
+ *       DistributedTestSequencer could be removed and DistributedTestCase functionality merged into FrameworkBaseCase.
+ *       This is so that any test case written on top of the framework base case can be distributed, without having
+ *       to extend a different base test class.
+ */
+public interface CircuitFactory
+{
+    /**
+     * Holds a test coordinating conversation with the test clients. This should consist of assigning the test roles,
+     * begining the test, gathering the test reports from the participants, and checking for assertion failures against
+     * the test reports.
+     *
+     * @param testCircuit    The test circuit.
+     * @param assertions     The list of assertions to apply to the test circuit.
+     * @param testProperties The test case definition.
+     *
+     * @deprecated Use test circuits and Circuit.test instead.
+     */
+    public void sequenceTest(Circuit testCircuit, List<Assertion> assertions, Properties testProperties);
+
+    /**
+     * Creates a test circuit for the test, configered by the test parameters specified.
+     *
+     * @param testProperties The test parameters.
+     *
+     * @return A test circuit.
+     */
+    public Circuit createCircuit(ParsedProperties testProperties);
+
+    /**
+     * Sets the sender test client to coordinate the test with.
+     *
+     * @param sender The contact details of the sending client in the test.
+     */
+    public void setSender(TestClientDetails sender);
+
+    /**
+     * Sets the receiving test client to coordinate the test with.
+     *
+     * @param receiver The contact details of the sending client in the test.
+     */
+    public void setReceiver(TestClientDetails receiver);
+
+    /**
+     * Supplies the sending test client.
+     *
+     * @return The sending test client.
+     */
+    public TestClientDetails getSender();
+
+    /**
+     * Supplies the receiving test client.
+     *
+     * @return The receiving test client.
+     */
+    public List<TestClientDetails> getReceivers();
+
+    /**
+     * Accepts the conversation factory over which to hold the test coordinating conversation.
+     *
+     * @param conversationFactory The conversation factory to coordinate the test over.
+     */
+    public void setConversationFactory(ConversationFactory conversationFactory);
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
new file mode 100644
index 0000000000..2ff6725365
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
@@ -0,0 +1,201 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.sequencers;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.Assertion;
+import org.apache.qpid.test.framework.Circuit;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.TestUtils;
+import org.apache.qpid.test.framework.distributedcircuit.DistributedCircuitImpl;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * FanOutCircuitFactory is a circuit factory that creates distributed test circuits. Given a set of participating
+ * test client nodes, it assigns one node to the SENDER role and the remainder to the RECEIVER role.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ *
+ * @todo Adapt this to be an n*m topology circuit factory. Need to add circuit topology definitions to the test
+ *       parameters. Place n senders onto the available test clients, and m receivers. Where n or m is larger than
+ *       the available nodes, start stacking multiple test clients on each node. There will also be an option that
+ *       indicates whether nodes can play both roles, and how many nodes out of all available may be assigned to
+ *       each role.
+ *
+ * @todo The createCircuit methods on this and InteropCircuitFactory are going to be identical. This is because the
+ *       partitioning into senders and receivers is already done by the test decorators. Either eliminate these factories
+ *       as unnesesary, or move the partitioning functionaility into the factories, in which case the test decorators
+ *       can probably be merged or eliminated. There is confusion over the placement of responsibilities between the
+ *       factories and the test decorators... although the test decorators may well do more than just circuit creation
+ *       in the future. For example, there may have to be a special decorator for test repetition that does one circuit
+ *       creation, but the runs many tests over it, in which case the handling of responsibilities becomes clearer.
+ */
+public class FanOutCircuitFactory extends BaseCircuitFactory
+{
+    /** Used for debugging. */
+    Logger log = Logger.getLogger(FanOutCircuitFactory.class);
+
+    /**
+     * Creates a test circuit for the test, configered by the test parameters specified.
+     *
+     * @param testProperties The test parameters.
+     * @return A test circuit.
+     */
+    public Circuit createCircuit(ParsedProperties testProperties)
+    {
+        log.debug("public Circuit createCircuit(ParsedProperties testProperties): called");
+
+        List<TestClientDetails> senders = new LinkedList<TestClientDetails>();
+        senders.add(getSender());
+        List<TestClientDetails> receivers = getReceivers();
+        ConversationFactory conversationFactory = getConversationFactory();
+
+        return DistributedCircuitImpl.createCircuit(testProperties, senders, receivers, conversationFactory);
+    }
+
+    /**
+     * Holds a test coordinating conversation with the test clients. This should consist of assigning the test roles,
+     * begining the test, gathering the test reports from the participants, and checking for assertion failures against
+     * the test reports.
+     *
+     * @param testCircuit    The test circuit.
+     * @param assertions     The list of assertions to apply to the test circuit.
+     * @param testProperties The test case definition.
+     *
+     * @deprecated Scheduled for removal once existing tests converted over to use test circuits.
+     */
+    public void sequenceTest(Circuit testCircuit, List<Assertion> assertions, Properties testProperties)
+    {
+        log.debug("protected Message[] sequenceTest(Object... testProperties = " + testProperties + "): called");
+
+        TestClientDetails sender = getSender();
+        List<TestClientDetails> receivers = getReceivers();
+        ConversationFactory conversationFactory = getConversationFactory();
+
+        try
+        {
+            // Create a conversation on the sender clients private control route.
+            Session session = conversationFactory.getSession();
+            Destination senderControlTopic = session.createTopic(sender.privateControlKey);
+            ConversationFactory.Conversation senderConversation = conversationFactory.startConversation();
+
+            // Assign the sender role to the sending test client.
+            Message assignSender = conversationFactory.getSession().createMessage();
+            TestUtils.setPropertiesOnMessage(assignSender, testProperties);
+            assignSender.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+            assignSender.setStringProperty("ROLE", "SENDER");
+            assignSender.setStringProperty("CLIENT_NAME", "Sustained_SENDER");
+
+            senderConversation.send(senderControlTopic, assignSender);
+
+            // Wait for the sender to confirm its role.
+            senderConversation.receive();
+
+            // Assign the receivers roles.
+            for (TestClientDetails receiver : receivers)
+            {
+                assignReceiverRole(receiver, testProperties, true);
+            }
+
+            // Start the test on the sender.
+            Message start = session.createMessage();
+            start.setStringProperty("CONTROL_TYPE", "START");
+
+            senderConversation.send(senderControlTopic, start);
+
+            // Wait for the test sender to return its report.
+            Message senderReport = senderConversation.receive();
+            TestUtils.pause(500);
+
+            // Ask the receivers for their reports.
+            Message statusRequest = session.createMessage();
+            statusRequest.setStringProperty("CONTROL_TYPE", "STATUS_REQUEST");
+
+            // Gather the reports from all of the receiving clients.
+
+            // Return all of the test reports, the senders report first.
+            // return new Message[] { senderReport };
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("Unhandled JMSException.");
+        }
+    }
+
+    /**
+     * Assigns the receivers role to the specified test client that is to act as a receivers during the test. This method
+     * does not always wait for the receiving clients to confirm their role assignments. This is because this method
+     * may be called from an 'onMessage' method, when a client is joining the test at a later point in time, and it
+     * is not possible to do a synchronous receive during an 'onMessage' method. There is a flag to indicate whether
+     * or not to wait for role confirmations.
+     *
+     * @param receiver       The test client to assign the receivers role to.
+     * @param testProperties The test parameters.
+     * @param confirm        Indicates whether role confirmation should be waited for.
+     *
+     * @throws JMSException Any JMSExceptions occurring during the conversation are allowed to fall through.
+     *
+     * @deprecated Scheduled for removal once existing tests converted over to use test circuits.
+     */
+    protected void assignReceiverRole(TestClientDetails receiver, Properties testProperties, boolean confirm)
+        throws JMSException
+    {
+        log.info("assignReceiverRole(TestClientDetails receivers = " + receiver + ", Map<String, Object> testProperties = "
+            + testProperties + "): called");
+
+        ConversationFactory conversationFactory = getConversationFactory();
+
+        // Create a conversation with the receiving test client.
+        Session session = conversationFactory.getSession();
+        Destination receiverControlTopic = session.createTopic(receiver.privateControlKey);
+        ConversationFactory.Conversation receiverConversation = conversationFactory.startConversation();
+
+        // Assign the receivers role to the receiving client.
+        Message assignReceiver = session.createMessage();
+        TestUtils.setPropertiesOnMessage(assignReceiver, testProperties);
+        assignReceiver.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+        assignReceiver.setStringProperty("ROLE", "RECEIVER");
+        assignReceiver.setStringProperty("CLIENT_NAME", receiver.clientName);
+
+        receiverConversation.send(receiverControlTopic, assignReceiver);
+
+        // Wait for the role confirmation to come back.
+        if (confirm)
+        {
+            receiverConversation.receive();
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
new file mode 100644
index 0000000000..75df5c65ea
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
@@ -0,0 +1,145 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.framework.sequencers;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.test.framework.Assertion;
+import org.apache.qpid.test.framework.Circuit;
+import org.apache.qpid.test.framework.TestClientDetails;
+import org.apache.qpid.test.framework.TestUtils;
+import org.apache.qpid.test.framework.distributedcircuit.DistributedCircuitImpl;
+import org.apache.qpid.util.ConversationFactory;
+
+import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td>
+ * </table>
+ */
+public class InteropCircuitFactory extends BaseCircuitFactory
+{
+    /** Used for debugging. */
+    Logger log = Logger.getLogger(InteropCircuitFactory.class);
+
+    /**
+     * Creates a test circuit for the test, configered by the test parameters specified.
+     *
+     * @param testProperties The test parameters.
+     * @return A test circuit.
+     */
+    public Circuit createCircuit(ParsedProperties testProperties)
+    {
+        log.debug("public Circuit createCircuit(ParsedProperties testProperties): called");
+
+        List<TestClientDetails> senders = new LinkedList<TestClientDetails>();
+        senders.add(getSender());
+        List<TestClientDetails> receivers = getReceivers();
+        ConversationFactory conversationFactory = getConversationFactory();
+
+        return DistributedCircuitImpl.createCircuit(testProperties, senders, receivers, conversationFactory);
+    }
+
+    /**
+     * Holds a test coordinating conversation with the test clients. This should consist of assigning the test roles,
+     * begining the test, gathering the test reports from the participants, and checking for assertion failures against
+     * the test reports.
+     *
+     * @param testCircuit    The test circuit.
+     * @param assertions     The list of assertions to apply to the test circuit.
+     * @param testProperties The test case definition.
+     */
+    public void sequenceTest(Circuit testCircuit, List<Assertion> assertions, Properties testProperties)
+    {
+        log.debug("protected Message[] sequenceTest(Object... testProperties = " + testProperties + "): called");
+
+        TestClientDetails sender = getSender();
+        List<TestClientDetails> receivers = getReceivers();
+        ConversationFactory conversationFactory = getConversationFactory();
+
+        try
+        {
+            Session session = conversationFactory.getSession();
+            Destination senderControlTopic = session.createTopic(sender.privateControlKey);
+            Destination receiverControlTopic = session.createTopic(receivers.get(0).privateControlKey);
+
+            ConversationFactory.Conversation senderConversation = conversationFactory.startConversation();
+            ConversationFactory.Conversation receiverConversation = conversationFactory.startConversation();
+
+            Message assignSender = conversationFactory.getSession().createMessage();
+            TestUtils.setPropertiesOnMessage(assignSender, testProperties);
+            assignSender.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+            assignSender.setStringProperty("ROLE", "SENDER");
+
+            senderConversation.send(senderControlTopic, assignSender);
+
+            // Assign the receivers role the receiving client.
+            Message assignReceiver = session.createMessage();
+            TestUtils.setPropertiesOnMessage(assignReceiver, testProperties);
+            assignReceiver.setStringProperty("CONTROL_TYPE", "ASSIGN_ROLE");
+            assignReceiver.setStringProperty("ROLE", "RECEIVER");
+
+            receiverConversation.send(receiverControlTopic, assignReceiver);
+
+            // Wait for the senders and receivers to confirm their roles.
+            senderConversation.receive();
+            receiverConversation.receive();
+
+            // Start the test.
+            Message start = session.createMessage();
+            start.setStringProperty("CONTROL_TYPE", "START");
+
+            senderConversation.send(senderControlTopic, start);
+
+            // Wait for the test sender to return its report.
+            Message senderReport = senderConversation.receive();
+            TestUtils.pause(500);
+
+            // Ask the receivers for its report.
+            Message statusRequest = session.createMessage();
+            statusRequest.setStringProperty("CONTROL_TYPE", "STATUS_REQUEST");
+
+            receiverConversation.send(receiverControlTopic, statusRequest);
+
+            // Wait for the receivers to send its report.
+            Message receiverReport = receiverConversation.receive();
+
+            // return new Message[] { senderReport, receiverReport };
+
+            // Apply assertions.
+        }
+        catch (JMSException e)
+        {
+            throw new RuntimeException("JMSException not handled.");
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
new file mode 100644
index 0000000000..8cae846a39
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
@@ -0,0 +1,234 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.util;
+
+import java.io.File;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.log4j.Logger;
+
+/**
+ * An ClasspathScanner scans the classpath for classes that implement an interface or extend a base class and have names
+ * that match a regular expression.
+ *
+ * <p/>In order to test whether a class implements an interface or extends a class, the class must be loaded (unless
+ * the class files were to be scanned directly). Using this collector can cause problems when it scans the classpath,
+ * because loading classes will initialize their statics, which in turn may cause undesired side effects. For this
+ * reason, the collector should always be used with a regular expression, through which the class file names are
+ * filtered, and only those that pass this filter will be tested. For example, if you define tests in classes that
+ * end with the keyword "Test" then use the regular expression "Test$" to match this.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Find all classes matching type and name pattern on the classpath.
+ * </table>
+ *
+ * @todo Add logic to scan jars as well as directories.
+ */
+public class ClasspathScanner
+{
+    private static final Logger log = Logger.getLogger(ClasspathScanner.class);
+
+    /**
+     * Scans the classpath and returns all classes that extend a specified class and match a specified name.
+     * There is an flag that can be used to indicate that only Java Beans will be matched (that is, only those classes
+     * that have a default constructor).
+     *
+     * @param matchingClass  The class or interface to match.
+     * @param matchingRegexp The regular expression to match against the class name.
+     * @param beanOnly       Flag to indicate that onyl classes with default constructors should be matched.
+     *
+     * @return All the classes that match this collector.
+     */
+    public static <T> Collection<Class<? extends T>> getMatches(Class<T> matchingClass, String matchingRegexp,
+        boolean beanOnly)
+    {
+        log.debug("public static <T> Collection<Class<? extends T>> getMatches(Class<T> matchingClass = " + matchingClass
+            + ", String matchingRegexp = " + matchingRegexp + ", boolean beanOnly = " + beanOnly + "): called");
+
+        // Build a compiled regular expression from the pattern to match.
+        Pattern matchPattern = Pattern.compile(matchingRegexp);
+
+        String classPath = System.getProperty("java.class.path");
+        Map<String, Class<? extends T>> result = new HashMap<String, Class<? extends T>>();
+
+        log.debug("classPath = " + classPath);
+
+        // Find matching classes starting from all roots in the classpath.
+        for (String path : splitClassPath(classPath))
+        {
+            gatherFiles(new File(path), "", result, matchPattern, matchingClass);
+        }
+
+        return result.values();
+    }
+
+    /**
+     * Finds all matching classes rooted at a given location in the file system. If location is a directory it
+     * is recursively examined.
+     *
+     * @param classRoot     The root of the current point in the file system being examined.
+     * @param classFileName The name of the current file or directory to examine.
+     * @param result        The accumulated mapping from class names to classes that match the scan.
+     *
+     * @todo Recursion ok as file system depth is not likely to exhaust the stack. Might be better to replace with
+     *       iteration.
+     */
+    private static <T> void gatherFiles(File classRoot, String classFileName, Map<String, Class<? extends T>> result,
+        Pattern matchPattern, Class<? extends T> matchClass)
+    {
+        log.debug("private static <T> void gatherFiles(File classRoot = " + classRoot + ", String classFileName = "
+            + classFileName + ", Map<String, Class<? extends T>> result, Pattern matchPattern = " + matchPattern
+            + ", Class<? extends T> matchClass = " + matchClass + "): called");
+
+        File thisRoot = new File(classRoot, classFileName);
+
+        // If the current location is a file, check if it is a matching class.
+        if (thisRoot.isFile())
+        {
+            // Check that the file has a matching name.
+            if (matchesName(thisRoot.getName(), matchPattern))
+            {
+                String className = classNameFromFile(thisRoot.getName());
+
+                // Check that the class has matching type.
+                try
+                {
+                    Class<?> candidateClass = Class.forName(className);
+
+                    Class matchedClass = matchesClass(candidateClass, matchClass);
+
+                    if (matchedClass != null)
+                    {
+                        result.put(className, matchedClass);
+                    }
+                }
+                catch (ClassNotFoundException e)
+                {
+                    // Ignore this. The matching class could not be loaded.
+                    log.debug("Got ClassNotFoundException, ignoring.", e);
+                }
+            }
+
+            return;
+        }
+        // Otherwise the current location is a directory, so examine all of its contents.
+        else
+        {
+            String[] contents = thisRoot.list();
+
+            if (contents != null)
+            {
+                for (String content : contents)
+                {
+                    gatherFiles(classRoot, classFileName + File.separatorChar + content, result, matchPattern, matchClass);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if the specified class file name corresponds to a class with name matching the specified regular expression.
+     *
+     * @param classFileName The class file name.
+     * @param matchPattern  The regular expression pattern to match.
+     *
+     * @return <tt>true</tt> if the class name matches, <tt>false</tt> otherwise.
+     */
+    private static boolean matchesName(String classFileName, Pattern matchPattern)
+    {
+        String className = classNameFromFile(classFileName);
+        Matcher matcher = matchPattern.matcher(className);
+
+        return matcher.matches();
+    }
+
+    /**
+     * Checks if the specified class to compare extends the base class being scanned for.
+     *
+     * @param matchingClass The base class to match against.
+     * @param toMatch       The class to match against the base class.
+     *
+     * @return The class to check, cast as an instance of the class to match if the class extends the base class, or
+     *         <tt>null</tt> otherwise.
+     */
+    private static <T> Class<? extends T> matchesClass(Class<?> matchingClass, Class<? extends T> toMatch)
+    {
+        try
+        {
+            return matchingClass.asSubclass(toMatch);
+        }
+        catch (ClassCastException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * Takes a classpath (which is a series of paths) and splits it into its component paths.
+     *
+     * @param classPath The classpath to split.
+     *
+     * @return A list of the component paths that make up the class path.
+     */
+    private static List<String> splitClassPath(String classPath)
+    {
+        List<String> result = new LinkedList<String>();
+        String separator = System.getProperty("path.separator");
+        StringTokenizer tokenizer = new StringTokenizer(classPath, separator);
+
+        while (tokenizer.hasMoreTokens())
+        {
+            result.add(tokenizer.nextToken());
+        }
+
+        return result;
+    }
+
+    /**
+     * Translates from the filename of a class to its fully qualified classname. Files are named using forward slash
+     * seperators and end in ".class", whereas fully qualified class names use "." sperators and no ".class" ending.
+     *
+     * @param classFileName The filename of the class to translate to a class name.
+     *
+     * @return The fully qualified class name.
+     */
+    private static String classNameFromFile(String classFileName)
+    {
+        log.debug("private static String classNameFromFile(String classFileName = " + classFileName + "): called");
+
+        // Remove the .class ending.
+        String s = classFileName.substring(0, classFileName.length() - ".class".length());
+
+        // Turn / seperators in . seperators.
+        String s2 = s.replace(File.separatorChar, '.');
+
+        // Knock off any leading . caused by a leading /.
+        if (s2.startsWith("."))
+        {
+            return s2.substring(1);
+        }
+
+        return s2;
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java b/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
new file mode 100644
index 0000000000..352cb80211
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
@@ -0,0 +1,479 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.util;
+
+import org.apache.log4j.Logger;
+
+import javax.jms.*;
+
+import java.util.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A conversation helper, uses a message correlation id pattern to match up sent and received messages as a conversation
+ * over JMS messaging. Incoming message traffic is divided up by correlation id. Each id has a queue (behaviour dependant
+ * on the queue implementation). Clients of this de-multiplexer can wait on messages, defined by message correlation ids.
+ *
+ * <p/>One use of this is as a conversation synchronizer where multiple threads are carrying out conversations over a
+ * multiplexed messaging route. This can be usefull, as JMS sessions are not multi-threaded. Setting up the conversation
+ * with synchronous queues will allow these threads to be written in a synchronous style, but with their execution order
+ * governed by the asynchronous message flow. For example, something like the following code could run a multi-threaded
+ * conversation (the conversation methods can be called many times in parallel):
+ *
+ * <p/><pre>
+ * class Initiator
+ * {
+ * ConversationHelper conversation = new ConversationHelper(connection, null,
+ *                                                          java.util.concurrent.LinkedBlockingQueue.class);
+ *
+ * initiateConversation()
+ * {
+ *  try {
+ *   // Exchange greetings.
+ *   conversation.send(sendDestination, conversation.getSession().createTextMessage("Hello."));
+ *   Message greeting = conversation.receive();
+ *
+ *   // Exchange goodbyes.
+ *   conversation.send(conversation.getSession().createTextMessage("Goodbye."));
+ *   Message goodbye = conversation.receive();
+ *  } finally {
+ *   conversation.end();
+ *  }
+ * }
+ * }
+ *
+ * class Responder
+ * {
+ * ConversationHelper conversation = new ConversationHelper(connection, receiveDestination,
+ *                                                          java.util.concurrent.LinkedBlockingQueue.class);
+ *
+ * respondToConversation()
+ * {
+ *   try {
+ *   // Exchange greetings.
+ *   Message greeting = conversation.receive();
+ *   conversation.send(conversation.getSession().createTextMessage("Hello."));
+ *
+ *   // Exchange goodbyes.
+ *   Message goodbye = conversation.receive();
+ *   conversation.send(conversation.getSession().createTextMessage("Goodbye."));
+ *  } finally {
+ *   conversation.end();
+ *  }
+ * }
+ * }
+ * </pre>
+ *
+ * <p/>Conversation correlation id's are generated on a per thread basis.
+ *
+ * <p/>The same controlSession is shared amongst all conversations. Calls to send are therefore synchronized because JMS
+ * sessions are not multi-threaded.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><th> Associate messages to an ongoing conversation using correlation ids.
+ * <tr><td> Auto manage sessions for conversations.
+ * <tr><td> Store messages not in a conversation in dead letter box.
+ * </table>
+ */
+public class ConversationFactory
+{
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(ConversationFactory.class);
+
+    /** Holds a map from correlation id's to queues. */
+    private Map<Long, BlockingQueue<Message>> idsToQueues = new HashMap<Long, BlockingQueue<Message>>();
+
+    /** Holds the connection over which the conversation is conducted. */
+    private Connection connection;
+
+    /** Holds the controlSession over which the conversation is conduxted. */
+    private Session session;
+
+    /** The message consumer for incoming messages. */
+    MessageConsumer consumer;
+
+    /** The message producer for outgoing messages. */
+    MessageProducer producer;
+
+    /** The well-known or temporary destination to receive replies on. */
+    Destination receiveDestination;
+
+    /** Holds the queue implementation class for the reply queue. */
+    Class<? extends BlockingQueue> queueClass;
+
+    /** Used to hold any replies that are received outside of the context of a conversation. */
+    BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>();
+
+    /* Used to hold conversation state on a per thread basis. */
+    /*
+    ThreadLocal<Conversation> threadLocals =
+        new ThreadLocal<Conversation>()
+        {
+            protected Conversation initialValue()
+            {
+                Conversation settings = new Conversation();
+                settings.conversationId = conversationIdGenerator.getAndIncrement();
+
+                return settings;
+            }
+        };
+     */
+
+    /** Generates new coversation id's as needed. */
+    AtomicLong conversationIdGenerator = new AtomicLong();
+
+    /**
+     * Creates a conversation helper on the specified connection with the default sending destination, and listening
+     * to the specified receiving destination.
+     *
+     * @param connection         The connection to build the conversation helper on.
+     * @param receiveDestination The destination to listen to for incoming messages. This may be null to use a temporary
+     *                           queue.
+     * @param queueClass         The queue implementation class.
+     *
+     * @throws JMSException All underlying JMSExceptions are allowed to fall through.
+     */
+    public ConversationFactory(Connection connection, Destination receiveDestination,
+        Class<? extends BlockingQueue> queueClass) throws JMSException
+    {
+        log.debug("public ConversationFactory(Connection connection, Destination receiveDestination = " + receiveDestination
+            + ", Class<? extends BlockingQueue> queueClass = " + queueClass + "): called");
+
+        this.connection = connection;
+        this.queueClass = queueClass;
+
+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // Check if a well-known receive destination has been provided, or use a temporary queue if not.
+        this.receiveDestination = (receiveDestination != null) ? receiveDestination : session.createTemporaryQueue();
+
+        consumer = session.createConsumer(receiveDestination);
+        producer = session.createProducer(null);
+
+        consumer.setMessageListener(new Receiver());
+    }
+
+    /**
+     * Creates a new conversation context.
+     *
+     * @return A new conversation context.
+     */
+    public Conversation startConversation()
+    {
+        log.debug("public Conversation startConversation(): called");
+
+        Conversation conversation = new Conversation();
+        conversation.conversationId = conversationIdGenerator.getAndIncrement();
+
+        return conversation;
+    }
+
+    /**
+     * Ensures that the reply queue for a conversation exists.
+     *
+     * @param conversationId The conversation correlation id.
+     */
+    private void initQueueForId(long conversationId)
+    {
+        if (!idsToQueues.containsKey(conversationId))
+        {
+            idsToQueues.put(conversationId, ReflectionUtils.<BlockingQueue>newInstance(queueClass));
+        }
+    }
+
+    /**
+     * Clears the dead letter box, returning all messages that were in it.
+     *
+     * @return All messages in the dead letter box.
+     */
+    public Collection<Message> emptyDeadLetterBox()
+    {
+        log.debug("public Collection<Message> emptyDeadLetterBox(): called");
+
+        Collection<Message> result = new ArrayList<Message>();
+        deadLetterBox.drainTo(result);
+
+        return result;
+    }
+
+    /**
+     * Gets the controlSession over which the conversation is conducted.
+     *
+     * @return The controlSession over which the conversation is conducted.
+     */
+    public Session getSession()
+    {
+        // Conversation settings = threadLocals.get();
+
+        return session;
+    }
+
+    /**
+     * Used to hold a conversation context. This consists of a correlating id for the conversation, and a reply
+     * destination automatically updated to the last received reply-to destination.
+     */
+    public class Conversation
+    {
+        /** Holds the correlation id for the context. */
+        long conversationId;
+
+        /**
+         * Holds the send destination for the context. This will automatically be updated to the most recently received
+         * reply-to destination.
+         */
+        Destination sendDestination;
+
+        /**
+         * Sends a message to the default sending location. The correlation id of the message will be assigned by this
+         * method, overriding any previously set value.
+         *
+         * @param sendDestination The destination to send to. This may be null to use the last received reply-to
+         *                        destination.
+         * @param message         The message to send.
+         *
+         * @throws JMSException All undelying JMSExceptions are allowed to fall through. This will also be thrown if no
+         *                      send destination is specified and there is no most recent reply-to destination available
+         *                      to use.
+         */
+        public void send(Destination sendDestination, Message message) throws JMSException
+        {
+            log.debug("public void send(Destination sendDestination = " + sendDestination + ", Message message = " + message
+                + "): called");
+
+            // Conversation settings = threadLocals.get();
+            // long conversationId = conversationId;
+            message.setJMSCorrelationID(Long.toString(conversationId));
+            message.setJMSReplyTo(receiveDestination);
+
+            // Ensure that the reply queue for this conversation exists.
+            initQueueForId(conversationId);
+
+            // Check if an overriding send to destination has been set or use the last reply-to if not.
+            Destination sendTo = null;
+
+            if (sendDestination != null)
+            {
+                sendTo = sendDestination;
+            }
+            else if (sendDestination != null)
+            {
+                sendTo = sendDestination;
+            }
+            else
+            {
+                throw new JMSException("The send destination was specified, and no most recent reply-to available to use.");
+            }
+
+            // Send the message.
+            synchronized (this)
+            {
+                producer.send(sendTo, message);
+            }
+        }
+
+        /**
+         * Gets the next message in an ongoing conversation. This method may block until such a message is received.
+         *
+         * @return The next incoming message in the conversation.
+         *
+         * @throws JMSException All undelying JMSExceptions are allowed to fall through. Thrown if the received message
+         *                      did not have its reply-to destination set up.
+         */
+        public Message receive() throws JMSException
+        {
+            log.debug("public Message receive(): called");
+
+            // Conversation settings = threadLocals.get();
+            // long conversationId = settings.conversationId;
+
+            // Ensure that the reply queue for this conversation exists.
+            initQueueForId(conversationId);
+
+            BlockingQueue<Message> queue = idsToQueues.get(conversationId);
+
+            try
+            {
+                Message result = queue.take();
+
+                // Keep the reply-to destination to send replies to.
+                sendDestination = result.getJMSReplyTo();
+
+                return result;
+            }
+            catch (InterruptedException e)
+            {
+                return null;
+            }
+        }
+
+        /**
+         * Gets many messages in an ongoing conversation. If a limit is specified, then once that many messages are
+         * received they will be returned. If a timeout is specified, then all messages up to the limit, received within
+         * that timespan will be returned. At least one of the message count or timeout should be set to a value of
+         * 1 or greater.
+         *
+         * @param num     The number of messages to receive, or all if this is less than 1.
+         * @param timeout The timeout in milliseconds to receive the messages in, or forever if this is less than 1.
+         *
+         * @return All messages received within the count limit and the timeout.
+         *
+         * @throws JMSException All undelying JMSExceptions are allowed to fall through.
+         */
+        public Collection<Message> receiveAll(int num, long timeout) throws JMSException
+        {
+            log.debug("public Collection<Message> receiveAll(int num = " + num + ", long timeout = " + timeout
+                + "): called");
+
+            // Check that a timeout or message count was set.
+            if ((num < 1) && (timeout < 1))
+            {
+                throw new IllegalArgumentException("At least one of message count (num) or timeout must be set.");
+            }
+
+            // Ensure that the reply queue for this conversation exists.
+            initQueueForId(conversationId);
+            BlockingQueue<Message> queue = idsToQueues.get(conversationId);
+
+            // Used to collect the received messages in.
+            Collection<Message> result = new ArrayList<Message>();
+
+            // Used to indicate when the timeout or message count has expired.
+            boolean receiveMore = true;
+
+            int messageCount = 0;
+
+            // Receive messages until the timeout or message count expires.
+            do
+            {
+                try
+                {
+                    Message next = null;
+
+                    // Try to receive the message with a timeout if one has been set.
+                    if (timeout > 0)
+                    {
+                        next = queue.poll(timeout, TimeUnit.MILLISECONDS);
+
+                        // Check if the timeout expired, and stop receiving if so.
+                        if (next == null)
+                        {
+                            receiveMore = false;
+                        }
+                    }
+                    // Receive the message without a timeout.
+                    else
+                    {
+                        next = queue.take();
+                    }
+
+                    // Increment the message count if a message was received.
+                    messageCount += (next != null) ? 1 : 0;
+
+                    // Check if all the requested messages were received, and stop receiving if so.
+                    if ((num > 0) && (messageCount >= num))
+                    {
+                        receiveMore = false;
+                    }
+
+                    // Keep the reply-to destination to send replies to.
+                    sendDestination = (next != null) ? next.getJMSReplyTo() : sendDestination;
+
+                    if (next != null)
+                    {
+                        result.add(next);
+                    }
+                }
+                catch (InterruptedException e)
+                {
+                    // Restore the threads interrupted status.
+                    Thread.currentThread().interrupt();
+
+                    // Stop receiving but return the messages received so far.
+                    receiveMore = false;
+                }
+            }
+            while (receiveMore);
+
+            return result;
+        }
+
+        /**
+         * Completes the conversation. Any correlation id's pertaining to the conversation are no longer valid, and any
+         * incoming messages using them will go to the dead letter box.
+         */
+        public void end()
+        {
+            log.debug("public void end(): called");
+
+            // Ensure that the thread local for the current thread is cleaned up.
+            // Conversation settings = threadLocals.get();
+            // long conversationId = settings.conversationId;
+            // threadLocals.remove();
+
+            // Ensure that its queue is removed from the queue map.
+            BlockingQueue<Message> queue = idsToQueues.remove(conversationId);
+
+            // Move any outstanding messages on the threads conversation id into the dead letter box.
+            queue.drainTo(deadLetterBox);
+        }
+    }
+
+    /**
+     * Implements the message listener for this conversation handler.
+     */
+    protected class Receiver implements MessageListener
+    {
+        /**
+         * Handles all incoming messages in the ongoing conversations. These messages are split up by correaltion id
+         * and placed into queues.
+         *
+         * @param message The incoming message.
+         */
+        public void onMessage(Message message)
+        {
+            log.debug("public void onMessage(Message message = " + message + "): called");
+
+            try
+            {
+                Long conversationId = Long.parseLong(message.getJMSCorrelationID());
+
+                // Find the converstaion queue to place the message on. If there is no conversation for the message id,
+                // the the dead letter box queue is used.
+                BlockingQueue<Message> queue = idsToQueues.get(conversationId);
+                queue = (queue == null) ? deadLetterBox : queue;
+
+                queue.put(message);
+            }
+            catch (JMSException e)
+            {
+                throw new RuntimeException(e);
+            }
+            catch (InterruptedException e)
+            {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}