QPID-832 merge M2.x

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

82 files changed, 6632 insertions, 769 deletions

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 fd28c2f77e..7fd53a64fd 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
@@ -28,6 +28,8 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.txn.NonTransactionalContext;
@@ -101,8 +103,8 @@ public class TxAckTest extends TestCase
         {
             TransactionalContext txnContext = new NonTransactionalContext(new MemoryMessageStore(),
                                                                           _storeContext, null,
-                                                                          new LinkedList<RequiredDeliveryException>(),
-                                                                          new HashSet<Long>());
+                                                                          new LinkedList<RequiredDeliveryException>()
+            );
             for (int i = 0; i < messageCount; i++)
             {
                 long deliveryTag = i + 1;
@@ -115,6 +117,11 @@ public class TxAckTest extends TestCase
                         return null;
                     }
 
+                    public void setExchange(AMQShortString exchange)
+                    {
+                        //To change body of implemented methods use File | Settings | File Templates.
+                    }
+
                     public boolean isImmediate()
                     {
                         return false;
@@ -132,7 +139,7 @@ public class TxAckTest extends TestCase
                 };
 
                 TestMessage message = new TestMessage(deliveryTag, i, info, txnContext);
-                _map.add(deliveryTag, new UnacknowledgedMessage(null, message, null, deliveryTag));
+                _map.add(deliveryTag, new UnacknowledgedMessage(new QueueEntry(null,message), null, deliveryTag));
             }
             _acked = acked;
             _unacked = unacked;
@@ -149,7 +156,7 @@ public class TxAckTest extends TestCase
             {
                 UnacknowledgedMessage u = _map.get(tag);
                 assertTrue("Message not found for tag " + tag, u != null);
-                ((TestMessage) u.message).assertCountEquals(expected);
+                ((TestMessage) u.getMessage()).assertCountEquals(expected);
             }
         }
 
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 4419768416..0968f0c468 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
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 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.queue.QueueEntry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MemoryMessageStore;
@@ -250,9 +251,9 @@ public class AbstractHeadersExchangeTestBase extends TestCase
          * @param deliverFirst
          * @throws AMQException
          */
-        public void process(StoreContext context, AMQMessage msg, boolean deliverFirst) throws AMQException
+        public void process(StoreContext context, QueueEntry msg, boolean deliverFirst) throws AMQException
         {
-            messages.add(new HeadersExchangeTest.Message(msg));
+            messages.add(new HeadersExchangeTest.Message(msg.getMessage()));
         }
     }
 
@@ -267,8 +268,8 @@ public class AbstractHeadersExchangeTestBase extends TestCase
 
         private static TransactionalContext _txnContext = new NonTransactionalContext(_messageStore, _storeContext,
                                                                                       null,
-                                                                         new LinkedList<RequiredDeliveryException>(),
-                                                                         new HashSet<Long>());
+                                                                         new LinkedList<RequiredDeliveryException>()
+        );
 
         Message(String id, String... headers) throws AMQException
         {
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
index b584c8c80b..3a3b7f92dd 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
@@ -21,8 +21,7 @@
 package org.apache.qpid.server.exchange;

 

 import org.apache.qpid.jms.Session;

-

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

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

 

 /**

  * MessagingTestConfigProperties defines a set of property names and default values for specifying a messaging topology,

diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
new file mode 100644
index 0000000000..9b2a3a6e28
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
@@ -0,0 +1,136 @@
+/*
+ *
+ * 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.failover;
+
+import junit.framework.TestCase;
+import org.apache.qpid.AMQDisconnectedException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import java.util.concurrent.CountDownLatch;
+
+public class FailoverMethodTest extends TestCase implements ExceptionListener
+{
+    private CountDownLatch _failoverComplete = new CountDownLatch(1);
+
+    public void setUp() throws AMQVMBrokerCreationException
+    {
+        TransportConnection.createVMBroker(1);
+    }
+
+    public void tearDown() throws AMQVMBrokerCreationException
+    {
+        TransportConnection.killAllVMBrokers();
+    }
+
+    /**
+     * Test that the round robin method has the correct delays.
+     * The first connection to vm://:1 will work but the localhost connection should fail but the duration it takes
+     * to report the failure is what is being tested.
+     *
+     * @throws URLSyntaxException
+     * @throws InterruptedException
+     * @throws JMSException
+     */
+    public void testFailoverRoundRobinDelay() throws URLSyntaxException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1;tcp://localhost:5670?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+
+            long end = System.currentTimeMillis();
+
+            //Failover should take less that 10 seconds.
+            // This is calculated by vm://:1 two retries left after initial connection
+            // localhost get three retries so (6s) so 10s in total for connection dropping
+            assertTrue("Failover took less than 6 seconds:"+(end - start), (end - start) > 6000);
+            // The sleep method is not 100% accurate under windows so with 5 sleeps and a 10ms accuracy then there is
+            // the potential for the tests to finish in 500ms sooner than the predicted 10s.
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+    public void testFailoverSingleDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+
+            long end = System.currentTimeMillis();
+
+            //Failover should take less that 10 seconds.
+            // This is calculated by vm://:1 two retries left after initial connection
+            // so 4s in total for connection dropping
+
+            assertTrue("Failover took less than 3.7 seconds", (end - start) > 3700);
+            // The sleep method is not 100% accurate under windows so with 3 sleeps and a 10ms accuracy then there is
+            // the potential for the tests to finish in 300ms sooner than the predicted 4s.
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+
+    public void onException(JMSException e)
+    {
+        if (e.getLinkedException() instanceof AMQDisconnectedException)
+        {
+            _failoverComplete.countDown();
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
new file mode 100644
index 0000000000..0762a7a561
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * 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.plugins;
+
+import java.util.Map;
+
+import org.apache.qpid.server.exchange.ExchangeType;
+
+import junit.framework.TestCase;
+
+public class PluginTest extends TestCase
+{
+
+    private static final String TEST_EXCHANGE_CLASS = "org.apache.qpid.extras.exchanges.example.TestExchangeType";
+    private static final String PLUGIN_DIRECTORY = System.getProperty("example.plugin.target");
+
+    public void testLoadExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager(PLUGIN_DIRECTORY);
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertNotNull("No exchanges found in "+PLUGIN_DIRECTORY, exchanges);
+        assertEquals("Wrong number of exchanges found in "+PLUGIN_DIRECTORY, 
+                     2, exchanges.size());
+        assertNotNull("Wrong exchange found in "+PLUGIN_DIRECTORY,
+                      exchanges.get(TEST_EXCHANGE_CLASS));
+    } 
+    
+    public void testNoExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager("/path/to/nowhere");
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertNull("Exchanges found", exchanges);
+    } 
+    
+}
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 66cd1cc7da..e4555e020e 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
@@ -21,6 +21,9 @@
 package org.apache.qpid.server.protocol;
 
 import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.framing.AMQShortString;
@@ -28,10 +31,9 @@ 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.store.SkeletonMessageStore;
+import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import javax.management.JMException;
 
@@ -41,8 +43,10 @@ import javax.management.JMException;
  */
 public class AMQProtocolSessionMBeanTest extends TestCase
 {
-    private MessageStore _messageStore = new MemoryMessageStore();
-    private TransactionManager _txm = new MemoryTransactionManager();
+    /** Used for debugging. */
+    private static final Logger log = Logger.getLogger(AMQProtocolSessionMBeanTest.class);
+
+    private MessageStore _messageStore = new SkeletonMessageStore();
     private AMQMinaProtocolSession _protocolSession;
     private AMQChannel _channel;
     private AMQProtocolSessionMBean _mbean;
@@ -57,7 +61,8 @@ 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, _messageStore);
+	
         channel.setDefaultQueue(queue);
         _protocolSession.addChannel(channel);
         channelCount = _mbean.channels().size();
@@ -68,7 +73,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, _messageStore);
         channel3.setLocalTransactional();
         _protocolSession.addChannel(channel3);
         _mbean.rollbackTransactions(2);
@@ -84,23 +89,23 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         }
         catch (JMException ex)
         {
-            System.out.println("expected exception is thrown :" + ex.getMessage());
+            log.debug("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, _messageStore));
         _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, _messageStore));
             fail();
         }
         catch (AMQException ex)
         {
-            System.out.println("expected exception is thrown :" + ex.getMessage());
+            log.debug("expected exception is thrown :" + ex.getMessage());
         }
     }
 
@@ -110,12 +115,11 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         super.setUp();
 
         IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        _protocolSession = new AMQMinaProtocolSession(new MockIoSession(),
-                                                      appRegistry.getVirtualHostRegistry(),
-                                                      new AMQCodecFactory(true),
-                                                      null);
+        _protocolSession =
+            new AMQMinaProtocolSession(new MockIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
+                null);
         _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
-        _channel = new AMQChannel(_protocolSession, 1, _txm, _messageStore, null);
+        _channel = new AMQChannel(_protocolSession, 1, _messageStore);
         _protocolSession.addChannel(_channel);
         _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 c1d7b0f598..62f5e0c6bf 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
@@ -27,6 +27,8 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.protocol.AMQConstant;
 
 /** Test class to test MBean operations for AMQMinaProtocolSession. */
 public class MaxChannelsTest extends TestCase
@@ -55,7 +57,7 @@ public class MaxChannelsTest extends TestCase
         {
             for (long currentChannel = 0L; currentChannel < maxChannels; currentChannel++)
             {
-                _protocolSession.addChannel(new AMQChannel(_protocolSession, (int) currentChannel, null, null, null));
+                _protocolSession.addChannel(new AMQChannel(_protocolSession, (int) currentChannel, null));
             }
         }
         catch (AMQException e)
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 65ac12463f..2416442b10 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
@@ -34,7 +34,6 @@ import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 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.util.NullApplicationRegistry;
@@ -56,8 +55,6 @@ public class AckTest extends TestCase
 
     private TestableMemoryMessageStore _messageStore;
 
-    private MemoryTransactionManager _txm;
-
     private StoreContext _storeContext = new StoreContext();
 
     private AMQChannel _channel;
@@ -77,9 +74,8 @@ public class AckTest extends TestCase
     {
         super.setUp();
         _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, _messageStore);
 
         _protocolSession.addChannel(_channel);
         _subscriptionManager = new SubscriptionSet();
@@ -94,8 +90,8 @@ public class AckTest extends TestCase
     private void publishMessages(int count, boolean persistent) throws AMQException
     {
         TransactionalContext txnContext = new NonTransactionalContext(_messageStore, _storeContext, null,
-                                                                      new LinkedList<RequiredDeliveryException>(),
-                                                                      new HashSet<Long>());
+                                                                      new LinkedList<RequiredDeliveryException>()
+        );
         MessageHandleFactory factory = new MessageHandleFactory();
         for (int i = 1; i <= count; i++)
         {
@@ -109,6 +105,11 @@ public class AckTest extends TestCase
                     return new AMQShortString("someExchange");
                 }
 
+                public void setExchange(AMQShortString exchange)
+                {
+                    //To change body of implemented methods use File | Settings | File Templates.
+                }
+
                 public boolean isImmediate()
                 {
                     return false;
@@ -144,7 +145,7 @@ public class AckTest extends TestCase
             msg.incrementReference();
             msg.routingComplete(_messageStore, _storeContext, factory);
             // we manually send the message to the subscription
-            _subscription.send(msg, _queue);
+            _subscription.send(new QueueEntry(_queue,msg), _queue);
         }
     }
 
@@ -172,7 +173,7 @@ public class AckTest extends TestCase
             assertTrue(deliveryTag == i);
             i++;
             UnacknowledgedMessage unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.queue == _queue);
+            assertTrue(unackedMsg.getQueue() == _queue);
         }
 
         assertTrue(map.size() == msgCount);
@@ -219,7 +220,7 @@ public class AckTest extends TestCase
         {
             assertTrue(deliveryTag == i);
             UnacknowledgedMessage unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.queue == _queue);
+            assertTrue(unackedMsg.getQueue() == _queue);
             // 5 is the delivery tag of the message that *should* be removed
             if (++i == 5)
             {
@@ -248,7 +249,7 @@ public class AckTest extends TestCase
         {
             assertTrue(deliveryTag == i + 5);
             UnacknowledgedMessage unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.queue == _queue);
+            assertTrue(unackedMsg.getQueue() == _queue);
             ++i;
         }
     }
@@ -272,7 +273,7 @@ public class AckTest extends TestCase
         {
             assertTrue(deliveryTag == i + 5);
             UnacknowledgedMessage unackedMsg = map.get(deliveryTag);
-            assertTrue(unackedMsg.queue == _queue);
+            assertTrue(unackedMsg.getQueue() == _queue);
             ++i;
         }
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java b/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
index 6a70fea711..4f92cc94b7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
@@ -42,9 +42,9 @@ public class ConcurrencyTestDisabled extends MessageTestHelper
 
     private final List<SubscriptionTestHelper> _subscribers = new ArrayList<SubscriptionTestHelper>();
     private final Set<Subscription> _active = new HashSet<Subscription>();
-    private final List<AMQMessage> _messages = new ArrayList<AMQMessage>();
+    private final List<QueueEntry> _messages = new ArrayList<QueueEntry>();
     private int next = 0;//index to next message to send
-    private final List<AMQMessage> _received = Collections.synchronizedList(new ArrayList<AMQMessage>());
+    private final List<QueueEntry> _received = Collections.synchronizedList(new ArrayList<QueueEntry>());
     private final Executor _executor = new OnCurrentThreadExecutor();
     private final List<Thread> _threads = new ArrayList<Thread>();
 
@@ -159,7 +159,7 @@ public class ConcurrencyTestDisabled extends MessageTestHelper
         }
     }
 
-    private AMQMessage nextMessage()
+    private QueueEntry nextMessage()
     {
         synchronized (_messages)
         {
@@ -191,7 +191,7 @@ public class ConcurrencyTestDisabled extends MessageTestHelper
     {
         void doRun() throws Throwable
         {
-            AMQMessage msg = nextMessage();
+            QueueEntry msg = nextMessage();
             if (msg != null)
             {
                 _deliveryMgr.deliver(null, new AMQShortString(toString()), msg, false);
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
index dc5a6d3cf6..b33259cfba 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
@@ -40,7 +40,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
 
     public void testStartInQueueingMode() throws AMQException
     {
-        AMQMessage[] messages = new AMQMessage[10];
+        QueueEntry[] messages = new QueueEntry[10];
         for (int i = 0; i < messages.length; i++)
         {
             messages[i] = message();
@@ -85,7 +85,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
 
     public void testStartInDirectMode() throws AMQException
     {
-        AMQMessage[] messages = new AMQMessage[10];
+        QueueEntry[] messages = new QueueEntry[10];
         for (int i = 0; i < messages.length; i++)
         {
             messages[i] = message();
@@ -132,7 +132,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
     {
         try
         {
-            AMQMessage msg = message(true);
+            QueueEntry msg = message(true);
             _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg, false);
             msg.checkDeliveredToConsumer();
             fail("expected exception did not occur");
@@ -154,7 +154,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
             SubscriptionTestHelper s = new SubscriptionTestHelper("A");
             _subscriptions.addSubscriber(s);
             s.setSuspended(true);
-            AMQMessage msg = message(true);
+            QueueEntry msg = message(true);
             _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg, false);
             msg.checkDeliveredToConsumer();
             fail("expected exception did not occur");
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 0d4e3e748b..114c8cac32 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
@@ -36,7 +36,6 @@ import org.apache.qpid.AMQException;
 import junit.framework.TestCase;
 
 import java.util.LinkedList;
-import java.util.HashSet;
 
 class MessageTestHelper extends TestCase
 {
@@ -45,20 +44,20 @@ class MessageTestHelper extends TestCase
     private final StoreContext _storeContext = new StoreContext();
 
     private final TransactionalContext _txnContext = new NonTransactionalContext(_messageStore, _storeContext, null,
-                                                                                 new LinkedList<RequiredDeliveryException>(),
-                                                                                 new HashSet<Long>());
+                                                                                 new LinkedList<RequiredDeliveryException>()
+    );
 
     MessageTestHelper() throws Exception
     {
         ApplicationRegistry.initialise(new NullApplicationRegistry());
     }
 
-    AMQMessage message() throws AMQException
+    QueueEntry message() throws AMQException
     {
         return message(false);
     }
 
-    AMQMessage message(final boolean immediate) throws AMQException
+    QueueEntry message(final boolean immediate) throws AMQException
     {
         MessagePublishInfo publish = new MessagePublishInfo()
         {
@@ -68,6 +67,11 @@ class MessageTestHelper extends TestCase
                 return null;
             }
 
+            public void setExchange(AMQShortString exchange)
+            {
+                //To change body of implemented methods use File | Settings | File Templates.
+            }
+
             public boolean isImmediate()
             {
                 return immediate;
@@ -84,8 +88,8 @@ class MessageTestHelper extends TestCase
             }
         };
                               
-        return new AMQMessage(_messageStore.getNewMessageId(), publish, _txnContext,
-                              new ContentHeaderBody());
+        return new QueueEntry(null,new AMQMessage(_messageStore.getNewMessageId(), publish, _txnContext,
+                              new ContentHeaderBody()));
     }
 
 }
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 0ad6502755..cf986e7803 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
@@ -21,10 +21,7 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.VersionSpecificRegistry;
+import org.apache.qpid.framing.*;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.output.ProtocolOutputConverter;
 import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
@@ -188,16 +185,53 @@ public class MockProtocolSession implements AMQProtocolSession
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    public MethodRegistry getMethodRegistry()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void methodFrameReceived(int channelId, AMQMethodBody body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void contentHeaderReceived(int channelId, ContentHeaderBody body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void contentBodyReceived(int channelId, ContentBody body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void heartbeatBodyReceived(int channelId, HeartbeatBody body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public MethodDispatcher getMethodDispatcher()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     public byte getProtocolMajorVersion()
     {
-        return 8;  //To change body of implemented methods use File | Settings | File Templates.
+        return getProtocolVersion().getMajorVersion();
     }
 
     public byte getProtocolMinorVersion()
     {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+        return getProtocolVersion().getMinorVersion();
     }
 
+
+    public ProtocolVersion getProtocolVersion()
+    {
+        return ProtocolVersion.getLatestSupportedVersion();  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+
     public VersionSpecificRegistry getRegistry()
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
index fe947ef3bc..1fa70a08d4 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
@@ -28,13 +28,13 @@ import java.util.Queue;
 
 public class SubscriptionTestHelper implements Subscription
 {
-    private final List<AMQMessage> messages;
+    private final List<QueueEntry> messages;
     private final Object key;
     private boolean isSuspended;
 
     public SubscriptionTestHelper(Object key)
     {
-        this(key, new ArrayList<AMQMessage>());
+        this(key, new ArrayList<QueueEntry>());
     }
 
     public SubscriptionTestHelper(final Object key, final boolean isSuspended)
@@ -43,18 +43,18 @@ public class SubscriptionTestHelper implements Subscription
         setSuspended(isSuspended);
     }
 
-    SubscriptionTestHelper(Object key, List<AMQMessage> messages)
+    SubscriptionTestHelper(Object key, List<QueueEntry> messages)
     {
         this.key = key;
         this.messages = messages;
     }
 
-    List<AMQMessage> getMessages()
+    List<QueueEntry> getMessages()
     {
         return messages;
     }
 
-    public void send(AMQMessage msg, AMQQueue queue)
+    public void send(QueueEntry msg, AMQQueue queue)
     {
         messages.add(msg);
     }
@@ -69,12 +69,12 @@ public class SubscriptionTestHelper implements Subscription
         return isSuspended;
     }
 
-    public boolean wouldSuspend(AMQMessage msg)
+    public boolean wouldSuspend(QueueEntry msg)
     {
         return isSuspended;
     }
 
-    public void addToResendQueue(AMQMessage msg)
+    public void addToResendQueue(QueueEntry msg)
     {
         //no-op
     }
@@ -88,6 +88,11 @@ public class SubscriptionTestHelper implements Subscription
     {
         return null;
     }
+    
+    public void start()
+    {
+        //no-op
+    }
 
     public void queueDeleted(AMQQueue queue)
     {
@@ -98,36 +103,31 @@ public class SubscriptionTestHelper implements Subscription
         return false;
     }
 
-    public boolean hasInterest(AMQMessage msg)
+    public boolean hasInterest(QueueEntry msg)
     {
         return true;
     }
 
-    public Queue<AMQMessage> getPreDeliveryQueue()
+    public Queue<QueueEntry> getPreDeliveryQueue()
     {
         return null;
     }
 
-    public Queue<AMQMessage> getResendQueue()
+    public Queue<QueueEntry> getResendQueue()
     {
         return null;
     }
 
-    public Queue<AMQMessage> getNextQueue(Queue<AMQMessage> messages)
+    public Queue<QueueEntry> getNextQueue(Queue<QueueEntry> messages)
     {
         return messages;
     }
 
-    public void enqueueForPreDelivery(AMQMessage msg, boolean deliverFirst)
+    public void enqueueForPreDelivery(QueueEntry msg, boolean deliverFirst)
     {
         //no-op
     }
 
-    public boolean isAutoClose()
-    {
-        return false;
-    }
-
     public void close()
     {
         //no-op
@@ -157,4 +157,5 @@ public class SubscriptionTestHelper implements Subscription
     {
         return key.toString();
     }
+    
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 06956ba52f..a803bf7da5 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
@@ -25,7 +25,11 @@ import junit.framework.TestCase;
 import junit.framework.Assert;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
+import org.apache.qpid.url.URLSyntaxException;
+import org.apache.qpid.AMQException;
 import org.apache.log4j.Logger;
 
 import javax.jms.JMSException;
@@ -38,6 +42,7 @@ import javax.jms.Connection;
 import javax.jms.Message;
 import javax.naming.spi.InitialContextFactory;
 import javax.naming.Context;
+import javax.naming.NamingException;
 import java.util.Hashtable;
 
 
@@ -53,21 +58,37 @@ public class TimeToLiveTest extends TestCase
 
     private final long TIME_TO_LIVE = 1000L;
 
-    Context _context;
-
-    private Connection _clientConnection, _producerConnection;
-
-    private MessageConsumer _consumer;
-    MessageProducer _producer;
-    Session _clientSession, _producerSession;
     private static final int MSG_COUNT = 50;
+    private static final long SERVER_TTL_TIMEOUT = 60000L;
 
     protected void setUp() throws Exception
     {
-        if (BROKER.startsWith("vm://"))
+        super.setUp();
+
+        if (usingInVMBroker())
         {
             TransportConnection.createVMBroker(1);
         }
+
+
+    }
+
+    private boolean usingInVMBroker()
+    {
+        return BROKER.startsWith("vm://");
+    }
+
+    protected void tearDown() throws Exception
+    {
+        if (usingInVMBroker())
+        {
+            TransportConnection.killAllVMBrokers();
+        }
+        super.tearDown();
+    }
+
+    public void testPassiveTTL() throws JMSException, NamingException
+    {
         InitialContextFactory factory = new PropertiesFileInitialContextFactory();
 
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -75,56 +96,40 @@ public class TimeToLiveTest extends TestCase
         env.put("connectionfactory.connection", "amqp://guest:guest@TTL_TEST_ID" + VHOST + "?brokerlist='" + BROKER + "'");
         env.put("queue.queue", QUEUE);
 
-        _context = factory.getInitialContext(env);
+        Context context = factory.getInitialContext(env);
 
-        Queue queue = (Queue) _context.lookup("queue");
+        Queue queue = (Queue) context.lookup("queue");
 
         //Create Client 1
-        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        Connection clientConnection = ((ConnectionFactory) context.lookup("connection")).createConnection();
 
-        _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-        _consumer = _clientSession.createConsumer(queue);
+        MessageConsumer consumer = clientSession.createConsumer(queue);
 
         //Create Producer
-        _producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        Connection producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection();
 
-        _producerConnection.start();
+        producerConnection.start();
 
-        _producerSession = _producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-        _producer = _producerSession.createProducer(queue);
-    }
+        MessageProducer producer = producerSession.createProducer(queue);
 
-    protected void tearDown() throws Exception
-    {
-        _clientConnection.close();
-
-        _producerConnection.close();
-        super.tearDown();
-        
-        if (BROKER.startsWith("vm://"))
-        {
-            TransportConnection.killAllVMBrokers();
-        }
-    }
-
-    public void test() throws JMSException
-    {
         //Set TTL
         int msg = 0;
-        _producer.send(nextMessage(String.valueOf(msg), true));
+        producer.send(nextMessage(String.valueOf(msg), true, producerSession, producer));
 
-        _producer.setTimeToLive(TIME_TO_LIVE);
+        producer.setTimeToLive(TIME_TO_LIVE);
 
         for (; msg < MSG_COUNT - 2; msg++)
         {
-            _producer.send(nextMessage(String.valueOf(msg), false));
+            producer.send(nextMessage(String.valueOf(msg), false, producerSession, producer));
         }
 
         //Reset TTL
-        _producer.setTimeToLive(0L);
-        _producer.send(nextMessage(String.valueOf(msg), false));
+        producer.setTimeToLive(0L);
+        producer.send(nextMessage(String.valueOf(msg), false, producerSession, producer));
 
          try
         {
@@ -136,31 +141,71 @@ public class TimeToLiveTest extends TestCase
 
         }
 
-        _clientConnection.start();
+        clientConnection.start();
 
         //Receive Message 0
-        Message received = _consumer.receive(100);
+        Message received = consumer.receive(1000);
         Assert.assertNotNull("First message not received", received);
         Assert.assertTrue("First message doesn't have first set.", received.getBooleanProperty("first"));
         Assert.assertEquals("First message has incorrect TTL.", 0L, received.getLongProperty("TTL"));
 
 
-        received = _consumer.receive(100);
+        received = consumer.receive(1000);
         Assert.assertNotNull("Final message not received", received);
         Assert.assertFalse("Final message has first set.", received.getBooleanProperty("first"));
         Assert.assertEquals("Final message has incorrect TTL.", 0L, received.getLongProperty("TTL"));
 
-        received = _consumer.receive(100);
+        received = consumer.receive(1000);
         Assert.assertNull("More messages received", received);
+
+        clientConnection.close();
+
+        producerConnection.close();
     }
 
-    private Message nextMessage(String msg, boolean first) throws JMSException
+    private Message nextMessage(String msg, boolean first, Session producerSession, MessageProducer producer) throws JMSException
     {
-        Message send = _producerSession.createTextMessage("Message " + msg);
+        Message send = producerSession.createTextMessage("Message " + msg);
         send.setBooleanProperty("first", first);
-        send.setLongProperty("TTL", _producer.getTimeToLive());
+        send.setLongProperty("TTL", producer.getTimeToLive());
         return send;
     }
 
 
+    /**
+     * Tests the expired messages get actively deleted even on queues which have no consumers
+     */
+    public void testActiveTTL() throws URLSyntaxException, AMQException, JMSException, InterruptedException
+    {
+        Connection producerConnection = new AMQConnection(BROKER,"guest","guest","activeTTLtest","test");
+        AMQSession producerSession = (AMQSession) producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Queue queue = producerSession.createTemporaryQueue();
+        producerSession.declareAndBind((AMQDestination) queue);
+        MessageProducer producer = producerSession.createProducer(queue);
+        producer.setTimeToLive(1000L);
+
+        // send Messages
+        for(int i = 0; i < MSG_COUNT; i++)
+        {
+            producer.send(producerSession.createTextMessage("Message: "+i));
+        }
+        long failureTime = System.currentTimeMillis() + 2*SERVER_TTL_TIMEOUT;
+
+        // check Queue depth for up to TIMEOUT seconds
+        long messageCount;
+
+        do
+        {
+            Thread.sleep(100);
+            messageCount = producerSession.getQueueDepth((AMQDestination) queue);
+        }
+        while(messageCount > 0L && System.currentTimeMillis() < failureTime);
+
+        assertEquals("Messages not automatically expired: ", 0L, messageCount);
+
+        producer.close();
+        producerSession.close();
+        producerConnection.close();
+    }
+
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
new file mode 100644
index 0000000000..9ba0f6024c
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
@@ -0,0 +1,607 @@
+/*
+ *  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.security.acl;
+
+import junit.framework.TestCase;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.*;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.url.URLSyntaxException;
+
+import javax.jms.*;
+import javax.jms.IllegalStateException;
+import java.io.File;
+
+
+public class SimpleACLTest extends TestCase implements ConnectionListener
+{
+    private String BROKER = "vm://:1";//"tcp://localhost:5672";
+
+    public void setUp() throws Exception
+    {
+        // Initialise ACLs.
+        final String QpidExampleHome = System.getProperty("QPID_EXAMPLE_HOME");
+        final File defaultaclConfigFile = new File(QpidExampleHome, "etc/acl.config.xml");
+
+        if (!defaultaclConfigFile.exists())
+        {
+            System.err.println("Configuration file not found:" + defaultaclConfigFile);
+            fail("Configuration file not found:" + defaultaclConfigFile);
+        }
+
+        if (System.getProperty("QPID_HOME") == null)
+        {
+            fail("QPID_HOME not set");
+        }
+
+        ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
+
+        ApplicationRegistry.initialise(config, 1);
+
+        TransportConnection.createVMBroker(1);
+    }
+
+    public void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+        TransportConnection.killAllVMBrokers();
+    }
+
+    public String createConnectionString(String username, String password, String broker)
+    {
+
+        return "amqp://" + username + ":" + password + "@clientid/test?brokerlist='" + broker + "'";
+    }
+
+    public void testAccessAuthorized() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            Session sesh = conn.createSession(true, Session.SESSION_TRANSACTED);
+
+            conn.start();
+
+            //Do something to show connection is active.
+            sesh.rollback();
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Connection was not created due to:" + e.getMessage());
+        }
+    }
+
+    public void testAccessNoRights() throws URLSyntaxException, JMSException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("guest", "guest", BROKER));
+
+            //Attempt to do do things to test connection.
+            Session sesh = conn.createSession(true, Session.SESSION_TRANSACTED);
+            conn.start();
+            sesh.rollback();
+
+            conn.close();
+            fail("Connection was created.");
+        }
+        catch (AMQException amqe)
+        {
+            if (amqe.getCause().getClass() == Exception.class)
+            {
+                System.err.println("QPID-594 : WARNING RACE CONDITION. Unable to determine cause of Connection Failure.");
+                return;
+            }
+            assertEquals("Linked Exception Incorrect", JMSException.class, amqe.getCause().getClass());
+            Exception linked = ((JMSException) amqe.getCause()).getLinkedException();
+            assertEquals("Exception was wrong type", AMQAuthenticationException.class, linked.getClass());
+            assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) linked).getErrorCode().getCode());
+        }
+    }
+
+    public void testClientConsumeFromTempQueueValid() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            sesh.createConsumer(sesh.createTemporaryQueue());
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test failed due to:" + e.getMessage());
+        }
+    }
+
+    public void testClientConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            //Prevent Failover
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            sesh.createConsumer(sesh.createQueue("IllegalQueue"));
+            fail("Test failed as consumer was created.");
+            //conn will be automatically closed
+        }
+        catch (JMSException e)
+        {
+            Throwable cause = e.getLinkedException();
+
+            assertNotNull("There was no liked exception", cause);
+            assertEquals("Wrong linked exception type", AMQAuthenticationException.class, cause.getClass());
+            assertEquals("Incorrect error code received", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
+        }
+    }
+
+    public void testClientCreateTemporaryQueue() throws JMSException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            //Create Temporary Queue  - can't use the createTempQueue as QueueName is null.
+            ((AMQSession) sesh).createQueue(new AMQShortString("doesnt_matter_as_autodelete_means_tmp"),
+                                            true, false, false);
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test failed due to:" + e.getMessage());
+        }
+    }
+
+    public void testClientCreateNamedQueue() throws JMSException, URLSyntaxException, AMQException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            //Create a Named Queue
+            ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
+
+            fail("Test failed as Queue creation succeded.");
+            //conn will be automatically closed
+        }
+        catch (AMQAuthenticationException amqe)
+        {
+            assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) amqe).getErrorCode().getCode());
+        }
+    }
+
+    public void testClientPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session sesh = conn.createSession(true, Session.SESSION_TRANSACTED);
+
+            conn.start();
+
+            MessageProducer sender = sesh.createProducer(sesh.createQueue("example.RequestQueue"));
+
+            sender.send(sesh.createTextMessage("test"));
+
+            //Send the message using a transaction as this will allow us to retrieve any errors that occur on the broker.
+            sesh.commit();
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test publish failed:" + e);
+        }
+    }
+
+    public void testClientPublishValidQueueSuccess() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            MessageProducer sender = ((AMQSession) sesh).createProducer(null);
+
+            Queue queue = sesh.createQueue("example.RequestQueue");
+
+            // Send a message that we will wait to be sent, this should give the broker time to process the msg
+            // before we finish this test. Message is set !immed !mand as the queue is invalid so want to test ACLs not
+            // queue existence.
+            ((org.apache.qpid.jms.MessageProducer) sender).send(queue, sesh.createTextMessage("test"),
+                                                                DeliveryMode.NON_PERSISTENT, 0, 0L, false, false, true);
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test publish failed:" + e);
+        }
+    }
+
+    public void testClientPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            MessageProducer sender = ((AMQSession) session).createProducer(null);
+
+            Queue queue = session.createQueue("Invalid");
+
+            // Send a message that we will wait to be sent, this should give the broker time to close the connection
+            // before we finish this test. Message is set !immed !mand as the queue is invalid so want to test ACLs not
+            // queue existence.
+            ((org.apache.qpid.jms.MessageProducer) sender).send(queue, session.createTextMessage("test"),
+                                                                DeliveryMode.NON_PERSISTENT, 0, 0L, false, false, true);
+
+            // Test the connection with a valid consumer
+            // This may fail as the session may be closed before the queue or the consumer created.
+            session.createConsumer(session.createTemporaryQueue()).close();
+
+            //Connection should now be closed and will throw the exception caused by the above send
+            conn.close();
+
+            fail("Close is not expected to succeed.");
+        }
+        catch (IllegalStateException ise)
+        {
+            System.err.println("QPID-826 : WARNING : Unable to determine cause of failure due to closure as we don't " +
+                               "record it for reporting after connection closed asynchronously");
+        }
+        catch (JMSException e)
+        {
+            Throwable cause = e.getLinkedException();
+            assertEquals("Incorrect exception", AMQAuthenticationException.class, cause.getClass());
+            assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
+        }
+    }
+
+    public void testServerConsumeFromNamedQueueValid() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            sesh.createConsumer(sesh.createQueue("example.RequestQueue"));
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test failed due to:" + e.getMessage());
+        }
+    }
+
+    public void testServerConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            sesh.createConsumer(sesh.createQueue("Invalid"));
+
+            fail("Test failed as consumer was created.");
+            //conn will be automatically closed
+        }
+        catch (JMSException e)
+        {
+            Throwable cause = e.getLinkedException();
+
+            assertNotNull("There was no liked exception", cause);
+            assertEquals("Wrong linked exception type", AMQAuthenticationException.class, cause.getClass());
+            assertEquals("Incorrect error code received", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
+        }
+    }
+
+    public void testServerConsumeFromTemporaryQueue() throws AMQException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            //Prevent Failover
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            sesh.createConsumer(sesh.createTemporaryQueue());
+            fail("Test failed as consumer was created.");
+            //conn will be automatically closed
+        }
+        catch (JMSException e)
+        {
+            Throwable cause = e.getLinkedException();
+
+            assertNotNull("There was no liked exception", cause);
+            assertEquals("Wrong linked exception type", AMQAuthenticationException.class, cause.getClass());
+            assertEquals("Incorrect error code received", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
+        }
+    }
+
+    public void testServerCreateNamedQueueValid() throws JMSException, URLSyntaxException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            //Create Temporary Queue
+            ((AMQSession) sesh).createQueue(new AMQShortString("example.RequestQueue"), false, false, false);
+
+            conn.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test failed due to:" + e.getMessage());
+        }
+    }
+
+    public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            //Create a Named Queue
+            ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
+
+            fail("Test failed as creation succeded.");
+            //conn will be automatically closed
+        }
+        catch (AMQAuthenticationException amqe)
+        {
+            assertEquals("Incorrect error code thrown", 403, amqe.getErrorCode().getCode());
+        }
+    }
+
+    public void testServerCreateTemporyQueueInvalid() throws JMSException, URLSyntaxException, AMQException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            ((AMQSession) sesh).createQueue(new AMQShortString("again_ensure_auto_delete_queue_for_temporary"),
+                                            true, false, false);
+
+            fail("Test failed as creation succeded.");
+            //conn will be automatically closed
+        }
+        catch (AMQAuthenticationException amqe)
+        {
+            assertEquals("Incorrect error code thrown", 403, amqe.getErrorCode().getCode());
+        }
+    }
+
+    /**
+     * This test uses both the cilent and sender to validate that the Server is able to publish to a temporary queue.
+     * The reason the client must be in volved is that the Serve is unable to create its own Temporary Queues.
+     *
+     * @throws AMQException
+     * @throws URLSyntaxException
+     * @throws JMSException
+     */
+    public void testServerPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException, JMSException
+    {
+        //Set up the Server
+        Connection serverConnection = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+        ((AMQConnection) serverConnection).setConnectionListener(this);
+
+        Session serverSession = serverConnection.createSession(true, Session.SESSION_TRANSACTED);
+
+        Queue requestQueue = serverSession.createQueue("example.RequestQueue");
+
+        MessageConsumer server = serverSession.createConsumer(requestQueue);
+
+        serverConnection.start();
+
+        //Set up the consumer
+        Connection clientConnection = new AMQConnection(createConnectionString("client", "guest", BROKER));
+
+        //Send a test mesage
+        Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Queue responseQueue = clientSession.createTemporaryQueue();
+
+        MessageConsumer clientResponse = clientSession.createConsumer(responseQueue);
+
+        clientConnection.start();
+
+        Message request = clientSession.createTextMessage("Request");
+
+        assertNotNull("Response Queue is null", responseQueue);
+
+        request.setJMSReplyTo(responseQueue);
+
+        clientSession.createProducer(requestQueue).send(request);
+
+        try
+        {
+            Message msg = null;
+
+            msg = server.receive(2000);
+
+            while (msg != null && !((TextMessage) msg).getText().equals("Request"))
+            {
+                msg = server.receive(2000);
+            }
+
+            assertNotNull("Message not received", msg);
+
+            assertNotNull("Reply-To is Null", msg.getJMSReplyTo());
+
+            MessageProducer sender = serverSession.createProducer(msg.getJMSReplyTo());
+
+            sender.send(serverSession.createTextMessage("Response"));
+
+            //Send the message using a transaction as this will allow us to retrieve any errors that occur on the broker.
+            serverSession.commit();
+
+            serverConnection.close();
+
+            //Ensure Response is received.
+            Message clientResponseMsg = clientResponse.receive(2000);
+            assertNotNull("Client did not receive response message,", clientResponseMsg);
+            assertEquals("Incorrect message received", "Response", ((TextMessage) clientResponseMsg).getText());
+
+            clientConnection.close();
+        }
+        catch (Exception e)
+        {
+            fail("Test publish failed:" + e);
+        }
+    }
+
+    public void testServerPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException
+    {
+        try
+        {
+            Connection conn = new AMQConnection(createConnectionString("server", "guest", BROKER));
+
+            ((AMQConnection) conn).setConnectionListener(this);
+
+            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            conn.start();
+
+            MessageProducer sender = ((AMQSession) session).createProducer(null);
+
+            Queue queue = session.createQueue("Invalid");
+
+            // Send a message that we will wait to be sent, this should give the broker time to close the connection
+            // before we finish this test. Message is set !immed !mand as the queue is invalid so want to test ACLs not
+            // queue existence.
+            ((org.apache.qpid.jms.MessageProducer) sender).send(queue, session.createTextMessage("test"),
+                                                                DeliveryMode.NON_PERSISTENT, 0, 0L, false, false, true);
+
+            // Test the connection with a valid consumer
+            // This may not work as the session may be closed before the queue or consumer creation can occur.
+            // The correct JMSexception with linked error will only occur when the close method is recevied whilst in
+            // the failover safe block
+            session.createConsumer(session.createQueue("example.RequestQueue")).close();
+
+            //Connection should now be closed and will throw the exception caused by the above send
+            conn.close();
+
+            fail("Close is not expected to succeed.");
+        }
+        catch (IllegalStateException ise)
+        {
+            System.err.println("QPID-826 : WARNING : Unable to determine cause of failure due to closure as we don't " +
+                               "record it for reporting after connection closed asynchronously");
+        }
+        catch (JMSException e)
+        {
+            Throwable cause = e.getLinkedException();
+            assertEquals("Incorrect exception", AMQAuthenticationException.class, cause.getClass());
+            assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
+        }
+    }
+
+    // Connection Listener Interface - Used here to block failover
+
+    public void bytesSent(long count)
+    {
+    }
+
+    public void bytesReceived(long count)
+    {
+    }
+
+    public boolean preFailover(boolean redirect)
+    {
+        //Prevent failover.
+        return false;
+    }
+
+    public boolean preResubscribe()
+    {
+        return false;
+    }
+
+    public void failoverComplete()
+    {
+    }
+}
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
index ab6d9742e4..c7984d5d33 100644
--- 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
@@ -23,7 +23,6 @@ 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;
@@ -61,6 +60,11 @@ public class TestReferenceCounting extends TestCase
                 return null;
             }
 
+            public void setExchange(AMQShortString exchange)
+            {
+                //To change body of implemented methods use File | Settings | File Templates.
+            }
+
             public boolean isImmediate()
             {
                 return false;
@@ -78,7 +82,7 @@ public class TestReferenceCounting extends TestCase
         };
 
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), info,
-                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            new NonTransactionalContext(_store, _storeContext, null, null),
                                             createPersistentContentHeader());
         message = message.takeReference();
 
@@ -109,6 +113,11 @@ public class TestReferenceCounting extends TestCase
                 return null;
             }
 
+            public void setExchange(AMQShortString exchange)
+            {
+                //To change body of implemented methods use File | Settings | File Templates.
+            }
+
             public boolean isImmediate()
             {
                 return false;
@@ -127,7 +136,7 @@ public class TestReferenceCounting extends TestCase
 
         AMQMessage message = new AMQMessage(_store.getNewMessageId(),
                                             info,
-                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            new NonTransactionalContext(_store, _storeContext, null, null),
                                             createPersistentContentHeader());
         
         message = message.takeReference();
diff --git a/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java b/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
index 58ea392306..b34f28b1a8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
@@ -27,6 +27,7 @@ import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 
 import java.util.LinkedList;
+import java.util.NoSuchElementException;
 
 public class TxnBufferTest extends TestCase
 {
@@ -78,7 +79,15 @@ public class TxnBufferTest extends TestCase
         buffer.enlist(new FailedPrepare());
         buffer.enlist(new MockOp());
 
-        buffer.commit(null);
+        try
+        {
+            buffer.commit(null);
+        }
+        catch (NoSuchElementException e)
+        {
+        
+        }
+    
         validateOps();
         store.validate();
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index bd7ed60d1d..83b4665be6 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.util;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
+import org.apache.qpid.server.plugins.PluginManager;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -30,8 +31,8 @@ import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
 import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
 import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
 import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.security.access.AllowAll;
+import org.apache.qpid.server.security.access.ACLPlugin;
+import org.apache.qpid.server.security.access.plugins.AllowAll;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -53,7 +54,7 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
     private ManagedObjectRegistry _managedObjectRegistry;
 
-    private AccessManager _accessManager;
+    private ACLPlugin _accessManager;
 
     private PrincipalDatabaseManager _databaseManager;
 
@@ -136,14 +137,25 @@ public class TestApplicationRegistry extends ApplicationRegistry
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public AccessManager getAccessManager()
+    public ACLPlugin getAccessManager()
     {
         return _accessManager;
     }
 
+    public void setAccessManager(ACLPlugin newManager)
+    {
+        _accessManager = newManager;
+    }
+
     public MessageStore getMessageStore()
     {
         return _messageStore;
     }
+
+    public PluginManager getPluginManager()
+    {
+        return null;
+    }
 }
 
+
diff --git a/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
new file mode 100644
index 0000000000..4dd957c121
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
@@ -0,0 +1,76 @@
+/*
+ *
+ * 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;
+
+import org.apache.qpid.test.VMTestCase;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.NamingException;
+import java.util.Hashtable;
+import java.util.Map;
+
+public class FailoverBaseCase extends VMTestCase
+{
+    private boolean failedOver = true;
+
+    public void setUp() throws Exception
+    {
+        // Make Broker 2 the first one so we can kill it and allow VMTestCase to clean up vm://:1
+        _brokerlist = "vm://:2;vm://:1";
+        _clientID = this.getClass().getName();
+        _virtualhost = "/test";
+
+        _connections.put("connection1", "amqp://guest:guest@" + _clientID + _virtualhost + "?brokerlist='vm://:1'");
+        _connections.put("connection2", "amqp://guest:guest@" + _clientID + _virtualhost + "?brokerlist='vm://:2'");
+
+        try
+        {
+            TransportConnection.createVMBroker(2);
+        }
+        catch (Exception e)
+        {
+            fail("Unable to create broker: " + e);
+        }
+
+        super.setUp();
+    }
+
+    public void tearDown() throws Exception
+    {
+        if (!failedOver)
+        {
+            TransportConnection.killVMBroker(2);
+            ApplicationRegistry.remove(2);
+        }
+        super.tearDown();
+    }
+
+
+    public void failBroker()
+    {
+        failedOver = true;
+        TransportConnection.killVMBroker(2);
+        ApplicationRegistry.remove(2);
+    }
+}
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 4d8ddeaddd..dcdfb11618 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
@@ -19,24 +19,28 @@
  */
 package org.apache.qpid.test;
 
-import junit.extensions.TestSetup;
-import junit.framework.Test;
 import junit.framework.TestCase;
-
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
 
-import javax.naming.Context;
-import javax.naming.spi.InitialContextFactory;
-import javax.jms.Queue;
+import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Queue;
 import javax.jms.Session;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.LinkedList;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -85,22 +89,22 @@ public class VMTestCase extends TestCase
             _brokerlist = "vm://:1";
         }
 
-        env.put("connectionfactory.connection", "amqp://guest:guest@" +
-                                                _clientID + _virtualhost + "?brokerlist='" + _brokerlist + "'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@" + _clientID + _virtualhost + "?brokerlist='"
+                                                + _brokerlist + "'");
 
         for (Map.Entry<String, String> c : _connections.entrySet())
         {
             env.put("connectionfactory." + c.getKey(), c.getValue());
         }
 
-        env.put("queue.queue", "queue");
+        _queues.put("queue", "queue");
 
         for (Map.Entry<String, String> q : _queues.entrySet())
         {
             env.put("queue." + q.getKey(), q.getValue());
         }
 
-        env.put("topic.topic", "topic");
+        _topics.put("topic", "topic");
 
         for (Map.Entry<String, String> t : _topics.entrySet())
         {
@@ -112,14 +116,50 @@ public class VMTestCase extends TestCase
 
     protected void tearDown() throws Exception
     {
+        //Disabled
+//        checkQueuesClean();
+
         TransportConnection.killVMBroker(1);
         ApplicationRegistry.remove(1);
         
         super.tearDown();
     }
 
-    public void testDummyinVMTestCase()
+    private void checkQueuesClean() throws NamingException, JMSException
+    {
+        Connection connection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        connection.start();
+
+        Iterator<String> queueNames = new HashSet<String>(_queues.values()).iterator();
+
+        assertTrue("QueueNames doesn't have next", queueNames.hasNext());
+
+        while (queueNames.hasNext())
+        {
+            Queue queue = session.createQueue(queueNames.next());
+
+            //Validate that the queue are  reporting empty.
+            long queueDepth = 0;
+            try
+            {
+                queueDepth = ((AMQSession) session).getQueueDepth((AMQDestination) queue);
+            }
+            catch (AMQException e)
+            {
+                //ignore
+            }
+
+            assertEquals("Session reports Queue depth not as expected", 0, queueDepth);
+        }
+
+        connection.close();
+    }
+
+    public int getMessageCount(String queueName)
     {
-        // keep maven happy
+        return ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(_virtualhost.substring(1))
+                .getQueueRegistry().getQueue(new AMQShortString(queueName)).getMessageCount();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
new file mode 100644
index 0000000000..2b02f1cbbf
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.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.client;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.test.VMTestCase;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.jms.JMSException;
+import javax.naming.NamingException;
+import java.util.Enumeration;
+public class CancelTest extends VMTestCase
+{
+    private static final Logger _logger = Logger.getLogger(CancelTest.class);
+
+    private Connection _clientConnection;
+    private Session _clientSession;
+    private Queue _queue;
+
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+
+    /**
+     * Simply
+     */
+    public void test() throws JMSException, NamingException
+    {
+        Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        producerConnection.start();
+
+        Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        MessageProducer producer = producerSession.createProducer(_queue);
+        producer.send(producerSession.createTextMessage());
+        producerConnection.close();
+
+
+        QueueBrowser browser = _clientSession.createBrowser(_queue);
+        Enumeration e = browser.getEnumeration();
+
+
+        while (e.hasMoreElements())
+        {
+            e.nextElement();
+        }
+
+        browser.close();
+
+        MessageConsumer consumer = _clientSession.createConsumer(_queue);
+        consumer.receive();
+        consumer.close();
+    }
+
+    public void loop()
+    {
+        try
+        {
+            int run = 0;
+            while (true)
+            {
+                System.err.println(run++);
+                test();
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.error(e, e);
+        }
+    }
+
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
new file mode 100644
index 0000000000..463946e14a
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
@@ -0,0 +1,160 @@
+package org.apache.qpid.test.client;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.VMTestCase;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.NamingException;
+import java.util.concurrent.CountDownLatch;/*
+ *
+ * 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.
+ *
+ */
+
+public class DupsOkTest extends VMTestCase
+{
+
+    private Queue _queue;
+    private static final int MSG_COUNT = 9999;
+    private CountDownLatch _awaitCompletion = new CountDownLatch(1);
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //CreateQueue
+        ((ConnectionFactory) _context.lookup("connection")).createConnection().createSession(false, Session.AUTO_ACKNOWLEDGE).createConsumer(_queue).close();
+
+        //Create Producer put some messages on the queue
+        Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        producerConnection.start();
+
+        Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        MessageProducer producer = producerSession.createProducer(_queue);
+
+        for (int count = 1; count <= MSG_COUNT; count++)
+        {
+            Message msg = producerSession.createTextMessage("Message " + count);
+            msg.setIntProperty("count", count);
+            producer.send(msg);
+        }
+
+        producerConnection.close();
+    }
+
+    public void testDupsOK() throws NamingException, JMSException, InterruptedException, AMQException
+    {
+        //Create Client
+        Connection clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        clientConnection.start();
+
+        final Session clientSession = clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
+
+        MessageConsumer consumer = clientSession.createConsumer(_queue);
+
+        consumer.setMessageListener(new MessageListener()
+        {
+            int _msgCount = 0;
+
+            public void onMessage(Message message)
+            {
+                _msgCount++;
+                if (message == null)
+                {
+                    fail("Should not get null messages");
+                }
+
+                if (message instanceof TextMessage)
+                {
+                    try
+                    {
+                        /*if (message.getIntProperty("count") == 5000)
+                        {
+                            assertEquals("The queue should have 4999 msgs left", 4999, getMessageCount(_queue.getQueueName()));
+                        }*/
+
+                        if (message.getIntProperty("count") == MSG_COUNT)
+                        {
+                            try
+                            {
+                                long remainingMessages = ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue);
+                                if(remainingMessages != 0)
+                                {
+
+                                    assertEquals("The queue should have 0 msgs left, seen " + _msgCount + " messages.", 0, getMessageCount(_queue.getQueueName()));
+                                }
+                            }
+                            catch (AMQException e)
+                            {
+                                assertNull("Got AMQException", e);
+                            }
+                            finally
+                            {
+                                //This is the last message so release test.
+                                _awaitCompletion.countDown();
+                            }
+                        }
+
+                    }
+                    catch (JMSException e)
+                    {
+                        fail("Unable to get int property 'count'");
+                    }
+                }
+                else
+                {
+                    fail("");
+                }
+            }
+        });
+
+        try
+        {
+            _awaitCompletion.await();
+        }
+        catch (InterruptedException e)
+        {
+            fail("Unable to wait for test completion");
+            throw e;
+        }
+
+//        consumer.close();
+
+        assertEquals("The queue should have 0 msgs left", 0, ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue));
+        clientConnection.close();
+
+    }
+
+
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
new file mode 100644
index 0000000000..9beaa9844a
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
@@ -0,0 +1,510 @@
+/*
+ *  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.client;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.FailoverBaseCase;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.NamingException;
+import java.util.Enumeration;
+import java.util.Random;
+
+public class QueueBrowserAutoAckTest extends FailoverBaseCase
+{
+    private static final Logger _logger = Logger.getLogger(QueueBrowserAutoAckTest.class);
+
+    protected Connection _clientConnection;
+    protected Session _clientSession;
+    protected Queue _queue;
+    protected static final String MESSAGE_ID_PROPERTY = "MessageIDProperty";
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        //Ensure there are no messages on the queue to start with.
+        checkQueueDepth(0);
+    }
+
+    public void tearDown() throws Exception
+    {
+        if (_clientConnection != null)
+        {
+            _clientConnection.close();
+        }
+
+        super.tearDown();
+    }
+
+    protected void sendMessages(int num) throws JMSException
+    {
+        Connection producerConnection = null;
+        try
+        {
+            producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        }
+        catch (NamingException e)
+        {
+            fail("Unable to lookup connection in JNDI.");
+        }
+
+        sendMessages(producerConnection, num);
+    }
+
+    protected void sendMessages(String connection, int num) throws JMSException
+    {
+        Connection producerConnection = null;
+        try
+        {
+            producerConnection = ((ConnectionFactory) _context.lookup(connection)).createConnection();
+        }
+        catch (NamingException e)
+        {
+            fail("Unable to lookup connection in JNDI.");
+        }
+        sendMessages(producerConnection, num);
+    }
+
+
+    protected void sendMessages(Connection producerConnection, int num) throws JMSException
+    {
+        producerConnection.start();
+
+        Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        producerSession.createConsumer(_queue).close();
+
+        MessageProducer producer = producerSession.createProducer(_queue);
+
+        for (int messsageID = 0; messsageID < num; messsageID++)
+        {
+            TextMessage textMsg = producerSession.createTextMessage("Message " + messsageID);
+            textMsg.setIntProperty(MESSAGE_ID_PROPERTY, messsageID);
+            producer.send(textMsg);
+        }
+
+        producerConnection.close();
+    }
+
+    protected void checkQueueDepth(int depth) throws JMSException
+    {
+
+        // create QueueBrowser
+        _logger.info("Creating Queue Browser");
+
+        QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
+
+        // check for messages
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("Checking for " + depth + " messages with QueueBrowser");
+        }
+
+        //Check what the session believes the queue count to be.
+        long queueDepth = 0;
+
+        try
+        {
+            queueDepth = ((AMQSession) _clientSession).getQueueDepth((AMQDestination) _queue);
+        }
+        catch (AMQException e)
+        {
+        }
+
+        assertEquals("Session reports Queue depth not as expected", depth, queueDepth);
+
+        // Browse the queue to get a second opinion
+        int msgCount = 0;
+        Enumeration msgs = queueBrowser.getEnumeration();
+
+        while (msgs.hasMoreElements())
+        {
+            msgs.nextElement();
+            msgCount++;
+        }
+
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("Found " + msgCount + " messages total in browser");
+        }
+
+        // check to see if all messages found
+        assertEquals("Browser did not find all messages", depth, msgCount);
+
+        //Close browser
+        queueBrowser.close();
+    }
+
+    protected void closeBrowserBeforeAfterGetNext(int messageCount) throws JMSException
+    {
+        QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
+
+        Enumeration msgs = queueBrowser.getEnumeration();
+
+        int msgCount = 0;
+
+        while (msgs.hasMoreElements() && msgCount < messageCount)
+        {
+            msgs.nextElement();
+            msgCount++;
+        }
+
+        try
+        {
+            queueBrowser.close();
+        }
+        catch (JMSException e)
+        {
+            fail("Close should happen without error:" + e.getMessage());
+        }
+    }
+
+
+    protected void checkMultipleGetEnum(int sentMessages, int browserCount) throws JMSException
+    {
+        QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
+
+        for (int count = 0; count < browserCount; count++)
+        {
+            Enumeration msgs = queueBrowser.getEnumeration();
+
+            int msgCount = 0;
+
+            while (msgs.hasMoreElements())
+            {
+                msgs.nextElement();
+                msgCount++;
+            }
+            assertEquals(msgCount, sentMessages);
+        }
+
+        try
+        {
+            queueBrowser.close();
+        }
+        catch (JMSException e)
+        {
+            fail("Close should happen without error:" + e.getMessage());
+        }
+    }
+
+    protected void checkOverlappingMultipleGetEnum(int browserCount, int expectedMessages) throws JMSException
+    {
+        checkOverlappingMultipleGetEnum(browserCount, expectedMessages, null);
+    }
+
+    protected void checkOverlappingMultipleGetEnum(int browserCount, int expectedMessages, String selector) throws JMSException
+    {
+        QueueBrowser queueBrowser = selector == null ?
+                                    _clientSession.createBrowser(_queue, selector) :
+                                    _clientSession.createBrowser(_queue);
+
+        Enumeration[] msgs = new Enumeration[browserCount];
+        int[] msgCount = new int[browserCount];
+
+        //create Enums
+        for (int count = 0; count < browserCount; count++)
+        {
+            msgs[count] = queueBrowser.getEnumeration();
+        }
+
+        //interleave reads
+        for (int cnt = 0; cnt < expectedMessages; cnt++)
+        {
+            for (int count = 0; count < browserCount; count++)
+            {
+                if (msgs[count].hasMoreElements())
+                {
+                    msgs[count].nextElement();
+                    msgCount[count]++;
+                }
+            }
+        }
+
+        //validate all browsers get right message count.
+        for (int count = 0; count < browserCount; count++)
+        {
+            assertEquals(msgCount[count], expectedMessages);
+        }
+
+        try
+        {
+            queueBrowser.close();
+        }
+        catch (JMSException e)
+        {
+            fail("Close should happen without error:" + e.getMessage());
+        }
+    }
+
+    protected void validate(int messages) throws JMSException
+    {
+        //Create a new connection to validate message content
+        Connection connection = null;
+
+        try
+        {
+            connection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        }
+        catch (NamingException e)
+        {
+            fail("Unable to make validation connection");
+        }
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        connection.start();
+
+        MessageConsumer consumer = session.createConsumer(_queue);
+
+        _logger.info("Verify messages are still on the queue");
+
+        Message tempMsg;
+
+        for (int msgCount = 0; msgCount < messages; msgCount++)
+        {
+            tempMsg = (TextMessage) consumer.receive(RECEIVE_TIMEOUT);
+            if (tempMsg == null)
+            {
+                fail("Message " + msgCount + " not retrieved from queue");
+            }
+        }
+
+        //Close this new connection
+        connection.close();
+
+        _logger.info("All messages recevied from queue");
+
+        //ensure no message left.
+        checkQueueDepth(0);
+    }
+
+    protected void checkQueueDepthWithSelectors(int clients, int totalMessages) throws JMSException
+    {
+
+        String selector = MESSAGE_ID_PROPERTY + " % " + clients;
+
+        checkOverlappingMultipleGetEnum(clients, totalMessages / clients, selector);
+    }
+
+
+    /**
+     * This tests you can browse an empty queue, see QPID-785
+     *
+     * @throws Exception
+     */
+    public void testBrowsingEmptyQueue() throws Exception
+    {
+        checkQueueDepth(0);
+    }
+
+    /*
+    * Test Messages Remain on Queue
+    * Create a queu and send messages to it. Browse them and then receive them all to verify they were still there
+    *
+    */
+    public void testQueueBrowserMsgsRemainOnQueue() throws Exception
+    {
+        int messages = 10;
+
+        sendMessages(messages);
+
+        checkQueueDepth(messages);
+
+        validate(messages);
+    }
+
+
+    public void testClosingBrowserMidReceiving() throws NamingException, JMSException
+    {
+        int messages = 100;
+
+        sendMessages(messages);
+
+        checkQueueDepth(messages);
+
+        closeBrowserBeforeAfterGetNext(10);
+
+        validate(messages);
+
+    }
+
+    public void testMultipleGetEnum() throws NamingException, JMSException
+    {
+        int messages = 100;
+
+        sendMessages(messages);
+
+        checkQueueDepth(messages);
+
+        checkMultipleGetEnum(messages, 5);
+
+        validate(messages);
+    }
+
+    public void testMultipleOverlappingGetEnum() throws NamingException, JMSException
+    {
+        int messages = 25;
+
+        sendMessages(messages);
+
+        checkQueueDepth(messages);
+
+        checkOverlappingMultipleGetEnum(5, messages);
+
+        validate(messages);
+    }
+
+
+    public void testBrowsingWithSelector() throws JMSException
+    {
+        int messages = 40;
+
+        sendMessages(messages);
+
+        checkQueueDepth(messages);
+
+        for (int clients = 2; clients <= 10; clients++)
+        {
+            checkQueueDepthWithSelectors(clients, messages);
+        }
+
+        validate(messages);
+    }
+
+    public void testFailoverWithQueueBrowser() throws JMSException
+    {
+        int messages = 50;
+
+        sendMessages("connection1", messages);
+        sendMessages("connection2", messages);
+
+
+        checkQueueDepth(messages);
+
+
+        _logger.info("Creating Queue Browser");
+
+        QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
+
+        long queueDepth = 0;
+
+        try
+        {
+            queueDepth = ((AMQSession) _clientSession).getQueueDepth((AMQDestination) _queue);
+        }
+        catch (AMQException e)
+        {
+        }
+
+        assertEquals("Session reports Queue depth not as expected", messages, queueDepth);
+
+
+        int msgCount = 0;
+
+        int failPoint = 0;
+
+        failPoint = new Random().nextInt(messages) + 1;
+
+        Enumeration msgs = queueBrowser.getEnumeration();
+
+        while (msgs.hasMoreElements())
+        {
+            msgs.nextElement();
+            msgCount++;
+
+            if (msgCount == failPoint)
+            {
+                failBroker();
+            }
+        }
+
+        assertTrue("We should get atleast " + messages + " msgs.", msgCount >= messages);
+
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("QBAAT Found " + msgCount + " messages total in browser");
+        }
+
+        //Close browser
+        queueBrowser.close();
+
+        //Validate all messages still on Broker 1
+        validate(messages);
+    }
+
+    public void testFailoverAsQueueBrowserCreated() throws JMSException
+    {
+        // The IoServiceListenerSupport seems to get stuck in with a managedSession that isn't closing when requested.
+        // So it hangs waiting for the session.
+        int messages = 50;
+
+        sendMessages("connection1", messages);
+        sendMessages("connection2", messages);
+
+        failBroker();
+
+        checkQueueDepth(messages);
+
+        //Validate all messages still on Broker 1
+        validate(messages);
+    }
+
+    public void loop() throws JMSException
+    {
+        int run = 0;
+        try
+        {
+            while (true)
+            {
+                System.err.println(run++ + ":************************************************************************");
+                testQueueBrowserMsgsRemainOnQueue();
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.error(e, e);
+        }
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
new file mode 100644
index 0000000000..0ef0217234
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
@@ -0,0 +1,49 @@
+/*
+ *
+ * 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.client;
+
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+import javax.jms.Session;
+
+public class QueueBrowserClientAckTest extends QueueBrowserAutoAckTest
+{
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
new file mode 100644
index 0000000000..80d74b1b79
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
@@ -0,0 +1,49 @@
+/*
+ *
+ * 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.client;
+
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+import javax.jms.Session;
+
+public class QueueBrowserDupsOkTest extends QueueBrowserAutoAckTest
+{
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
new file mode 100644
index 0000000000..1bc5f07b4e
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
@@ -0,0 +1,50 @@
+/*
+ *
+ * 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.client;
+
+import org.apache.qpid.client.AMQSession;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Queue;
+
+public class QueueBrowserNoAckTest extends QueueBrowserAutoAckTest
+{
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
new file mode 100644
index 0000000000..42e13c89e4
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.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.client;
+
+import org.apache.qpid.client.AMQSession;
+
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+
+public class QueueBrowserPreAckTest extends QueueBrowserAutoAckTest
+{
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(false, AMQSession.PRE_ACKNOWLEDGE);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
deleted file mode 100644
index ec9df8f1b3..0000000000
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  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.client;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.test.VMTestCase;
-
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
-import javax.jms.Session;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.MessageConsumer;
-import javax.jms.QueueBrowser;
-import javax.jms.TextMessage;
-import javax.jms.JMSException;
-import javax.jms.QueueReceiver;
-import javax.jms.Message;
-import java.util.Enumeration;
-
-import junit.framework.TestCase;
-
-public class QueueBrowserTest extends VMTestCase
-{
-    private static final Logger _logger = Logger.getLogger(QueueBrowserTest.class);
-
-    private static final int MSG_COUNT = 10;
-
-    private Connection _clientConnection;
-    private Session _clientSession;
-    private Queue _queue;
-
-    public void setUp() throws Exception
-    {
-
-        super.setUp();
-
-        _queue = (Queue) _context.lookup("queue");
-
-        //Create Client
-        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
-
-        _clientConnection.start();
-
-        _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
-
-        //Create Producer put some messages on the queue
-        Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
-
-        producerConnection.start();
-
-        Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        MessageProducer producer = producerSession.createProducer(_queue);
-
-        for (int msg = 0; msg < MSG_COUNT; msg++)
-        {
-            producer.send(producerSession.createTextMessage("Message " + msg));
-        }
-
-        producerConnection.close();
-
-    }
-
-    /*
-    * Test Messages Remain on Queue
-    * Create a queu and send messages to it. Browse them and then receive them all to verify they were still there
-    *
-    */
-
-    public void testQueueBrowserMsgsRemainOnQueue() throws JMSException
-    {
-
-        // create QueueBrowser
-        _logger.info("Creating Queue Browser");
-
-        QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
-
-        // check for messages
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Checking for " + MSG_COUNT + " messages with QueueBrowser");
-        }
-
-        int msgCount = 0;
-        Enumeration msgs = queueBrowser.getEnumeration();
-
-        while (msgs.hasMoreElements())
-        {
-            msgs.nextElement();
-            msgCount++;
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Found " + msgCount + " messages total in browser");
-        }
-
-        // check to see if all messages found
-//        assertEquals("browser did not find all messages", MSG_COUNT, msgCount);
-        if (msgCount != MSG_COUNT)
-        {
-            _logger.warn(msgCount + "/" + MSG_COUNT + " messages received.");
-        }
-
-        //Close browser
-        queueBrowser.close();
-
-        // VERIFY
-
-        // continue and try to receive all messages
-        MessageConsumer consumer = _clientSession.createConsumer(_queue);
-
-        _logger.info("Verify messages are still on the queue");
-
-        Message tempMsg;
-
-        for (msgCount = 0; msgCount < MSG_COUNT; msgCount++)
-        {
-            tempMsg = (TextMessage) consumer.receive(RECEIVE_TIMEOUT);
-            if (tempMsg == null)
-            {
-                fail("Message " + msgCount + " not retrieved from queue");
-            }
-        }
-
-        _logger.info("All messages recevied from queue");
-    }
-
-
-}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
new file mode 100644
index 0000000000..0d63373e61
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.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.client;
+
+import javax.jms.Queue;
+import javax.jms.ConnectionFactory;
+import javax.jms.Session;
+
+public class QueueBrowserTransactedTest extends QueueBrowserAutoAckTest
+{
+    public void setUp() throws Exception
+    {
+
+        super.setUp();
+
+        _clientConnection.close();
+        _clientSession.close();
+
+        _queue = (Queue) _context.lookup("queue");
+
+        //Create Client
+        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+
+        _clientConnection.start();
+
+        _clientSession = _clientConnection.createSession(true, Session.SESSION_TRANSACTED);
+
+        //Ensure _queue is created
+        _clientSession.createConsumer(_queue).close();
+    }
+
+
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
new file mode 100644
index 0000000000..e7d7c7eba6
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
@@ -0,0 +1,257 @@
+/*
+ *
+ * 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.client.failover;
+
+import junit.framework.TestCase;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.url.URLSyntaxException;
+import org.apache.log4j.Logger;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.util.concurrent.CountDownLatch;
+
+public class FailoverTest extends TestCase implements ConnectionListener
+{
+    private static final Logger _logger = Logger.getLogger(FailoverTest.class);
+
+    private static final int NUM_BROKERS = 2;
+    private static final String BROKER = "amqp://guest:guest@/test?brokerlist='vm://:%d;vm://:%d'";
+    private static final String QUEUE = "queue";
+    private static final int NUM_MESSAGES = 10;
+    private Connection con;
+    private AMQConnectionFactory conFactory;
+    private Session prodSess;
+    private AMQQueue q;
+    private MessageProducer prod;
+    private Session conSess;
+    private MessageConsumer consumer;
+
+    private static int usedBrokers = 0;
+    private CountDownLatch failoverComplete;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        // Create two VM brokers
+
+        for (int i = 0; i < NUM_BROKERS; i++)
+        {
+            usedBrokers++;
+
+            TransportConnection.createVMBroker(usedBrokers);
+        }
+
+        conFactory = new AMQConnectionFactory(String.format(BROKER, usedBrokers - 1, usedBrokers));
+        _logger.info("Connecting on:" + conFactory.getConnectionURL());
+        con = conFactory.createConnection();
+        ((AMQConnection) con).setConnectionListener(this);
+        con.start();
+        failoverComplete = new CountDownLatch(1);
+    }
+
+    private void init(boolean transacted, int mode) throws JMSException
+    {
+        prodSess = con.createSession(transacted, mode);
+        q = new AMQQueue("amq.direct", QUEUE);
+        prod = prodSess.createProducer(q);
+        conSess = con.createSession(transacted, mode);
+        consumer = conSess.createConsumer(q);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        try
+        {
+            con.close();
+        }
+        catch (Exception e)
+        {
+
+        }
+
+        try
+        {
+            TransportConnection.killAllVMBrokers();
+            ApplicationRegistry.removeAll();
+        }
+        catch (Exception e)
+        {
+            fail("Unable to clean up");
+        }
+        super.tearDown();
+    }
+
+    private void consumeMessages(int toConsume) throws JMSException
+    {
+        Message msg;
+        for (int i = 0; i < toConsume; i++)
+        {
+            msg = consumer.receive(1000);
+            assertNotNull("Message " + i + " was null!", msg);
+            assertEquals("message " + i, ((TextMessage) msg).getText());
+        }
+    }
+
+    private void sendMessages(int totalMessages) throws JMSException
+    {
+        for (int i = 0; i < totalMessages; i++)
+        {
+            prod.send(prodSess.createTextMessage("message " + i));
+        }
+
+//        try
+//        {
+//            Thread.sleep(100 * totalMessages);
+//        }
+//        catch (InterruptedException e)
+//        {
+//            //evil ignoring of IE
+//        }
+    }
+
+    public void testP2PFailover() throws Exception
+    {
+        testP2PFailover(NUM_MESSAGES, true);
+    }
+
+    public void testP2PFailoverWithMessagesLeft() throws Exception
+    {
+        testP2PFailover(NUM_MESSAGES, false);
+    }
+
+    private void testP2PFailover(int totalMessages, boolean consumeAll) throws JMSException
+    {
+        Message msg = null;
+        init(false, Session.AUTO_ACKNOWLEDGE);
+        sendMessages(totalMessages);
+
+        // Consume some messages
+        int toConsume = totalMessages;
+        if (!consumeAll)
+        {
+            toConsume = totalMessages / 2;
+        }
+
+        consumeMessages(toConsume);
+
+        _logger.info("Failing over");
+
+        causeFailure();
+
+        msg = consumer.receive(500);
+        //todo: reinstate
+        assertNull("Should not have received message from new broker!", msg);
+        // Check that messages still sent / received
+        sendMessages(totalMessages);
+        consumeMessages(totalMessages);
+    }
+
+    private void causeFailure()
+    {
+        _logger.info("Failover");
+
+        TransportConnection.killVMBroker(usedBrokers - 1);
+        ApplicationRegistry.remove(usedBrokers - 1);
+
+        _logger.info("Awaiting Failover completion");
+        try
+        {
+            failoverComplete.await();
+        }
+        catch (InterruptedException e)
+        {
+            //evil ignore IE.
+        }
+    }
+
+    public void testClientAckFailover() throws Exception
+    {
+        init(false, Session.CLIENT_ACKNOWLEDGE);
+        sendMessages(1);
+        Message msg = consumer.receive();
+        assertNotNull("Expected msgs not received", msg);
+
+
+        causeFailure();
+
+        Exception failure = null;
+        try
+        {
+            msg.acknowledge();
+        }
+        catch (Exception e)
+        {
+            failure = e;
+        }
+        assertNotNull("Exception should be thrown", failure);
+    }
+
+    // This test disabled so that it doesn't add 4 minnutes to the length of time it takes to run, which would be lame
+    public void txest4MinuteFailover() throws Exception
+    {
+        conFactory = new AMQConnectionFactory("amqp://guest:guest@/test?brokerlist='vm://:"+(usedBrokers-1)+"?connectdelay='60000'&retries='2''");
+        _logger.info("Connecting on:" + conFactory.getConnectionURL());
+        con = conFactory.createConnection();
+        ((AMQConnection) con).setConnectionListener(this);
+        con.start();
+
+        long failTime = System.currentTimeMillis() + 60000;
+        causeFailure();
+        assertTrue("Failover did not take long enough", System.currentTimeMillis() > failTime);
+    }
+
+    public void bytesSent(long count)
+    {
+    }
+
+    public void bytesReceived(long count)
+    {
+    }
+
+    public boolean preFailover(boolean redirect)
+    {
+        return true;
+    }
+
+    public boolean preResubscribe()
+    {
+        return true;
+    }
+
+    public void failoverComplete()
+    {
+        failoverComplete.countDown();
+    }
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java b/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
new file mode 100644
index 0000000000..706d99ffe2
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
@@ -0,0 +1,54 @@
+/*

+ *

+ * 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.junit.extensions.util.ParsedProperties;

+

+/**

+ * An AMQPPublisher represents the status of the publishing side of a test circuit that exposes AMQP specific features.

+ * Its provides additional assertions not available through the plain JMS {@link Publisher} interface.

+ *

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

+ * <tr><th> Responsibilities

+ * <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 AMQPPublisher extends Publisher

+{

+    /**

+     * Provides an assertion that the publisher got a no consumers exception on every message.

+     *

+     * @param testProps The test configuration properties.

+     *

+     * @return An assertion that the publisher got a no consumers exception on every message.

+     */

+    Assertion noConsumersAssertion(ParsedProperties testProps);

+

+    /**

+     * Provides an assertion that the publisher got a no rout exception on every message.

+     *

+     * @param testProps The test configuration properties.

+     *

+     * @return An assertion that the publisher got a no rout exception on every message.

+     */

+    Assertion noRouteAssertion(ParsedProperties testProps);

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java b/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
new file mode 100644
index 0000000000..e8b7da2537
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
@@ -0,0 +1,70 @@
+/*

+ *

+ * 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;

+

+/**

+ * BrokerLifecycleAware is an awareness interface implemented by test cases that can run control the life-cycle of

+ * the brokers on which they run. Its purpose is to expose additional instrumentation of brokers during testing, that

+ * enables tests to use an automated failure mechanism to simulate broker failures, and to re-start failed brokers.

+ *

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

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

+ * <tr><td> Indicate whether or not a test case is using an in-vm broker.

+ * <tr><td> Track which in-vm broker is currently in use.

+ * <tr><td> Accept setting of a failure mechanism. <td> {@link CauseFailure}.

+ * </table>

+ *

+ * @todo Need to think about how to present the brokers through this interface. Thinking numbering the available

+ *       brokers from 1 will do. Then can kill 1 and assume failing onto 2. Restart 1 and kill 2 and fail back onto

+ *       1 again?

+ */

+public interface BrokerLifecycleAware

+{

+    public void setInVmBrokers();

+

+    /**

+     * Indicates whether or not a test case is using in-vm brokers.

+     *

+     * @return <tt>true</tt> if the test is using in-vm brokers, <tt>false</tt> otherwise.

+     */

+    public boolean usingInVmBroker();

+

+    /**

+     * Sets the currently live in-vm broker.

+     *

+     * @param i The currently live in-vm broker.

+     */

+    public void setLiveBroker(int i);

+

+    /**

+     * Reports the currently live in-vm broker.

+     *

+     * @return The currently live in-vm broker.

+     */

+    public int getLiveBroker();

+

+    /**

+     * Accepts a failure mechanism.

+     *

+     * @param failureMechanism The failure mechanism.

+     */

+    public void setFailureMechanism(CauseFailure failureMechanism);

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java b/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
new file mode 100644
index 0000000000..8a5a9560a0
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
@@ -0,0 +1,42 @@
+/*

+ *

+ * 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;

+

+/**

+ * CauseFailure provides a method to cause a failure in a messaging broker, usually used in conjunction with fail-over

+ * or other failure mode testing. In some cases failures may be automated, for example by shutting down an in-vm broker,

+ * or by sending a special control signal to a broker over a network connection. In other cases, it may be preferable

+ * to ask a user interactively to cause a failure scenario, in which case an implementation may display a prompt or

+ * dialog box asking for notification once the failure has been caused. The purpose of this interface is to abstract

+ * the exact cause and nature of a failure out of failure test cases.

+ *

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

+ * <tr><th> Responsibilities

+ * <tr><td> Cause messaging broker failure.

+ * </table>

+ */

+public interface CauseFailure

+{

+    /**

+     * Causes the active message broker to fail.

+     */

+    void causeFailure();

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java b/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
new file mode 100644
index 0000000000..6b96ade674
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
@@ -0,0 +1,65 @@
+/*

+ *

+ * 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.test.framework.CauseFailure;

+

+import java.io.IOException;

+

+/**

+ * Causes a message broker failure by interactively prompting the user to cause it.

+ *

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

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

+ * <tr><td> Cause messaging broker failure.

+ * </table>

+ */

+public class CauseFailureUserPrompt implements CauseFailure

+{

+    /**

+     * Causes the active message broker to fail.

+     */

+    public void causeFailure()

+    {

+        waitForUser("Cause a broker failure now, then press Return.");

+    }

+

+    /**

+     * Outputs a prompt to the console and waits for the user to press return.

+     *

+     * @param prompt The prompt to display on the console.

+     */

+    private void waitForUser(String prompt)

+    {

+        System.out.println(prompt);

+

+        try

+        {

+            System.in.read();

+        }

+        catch (IOException e)

+        {

+            // Ignored.

+        }

+

+        System.out.println("Continuing.");

+    }

+}

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
index d971aa5385..d5a33514df 100644
--- 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
@@ -51,11 +51,14 @@ public class CircuitEndBase implements CircuitEnd
     ExceptionMonitor exceptionMonitor;
 
     /**
-     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     * Creates a circuit end point on the specified producer, consumer and controlSession. Monitors are also configured
+     * for messages and exceptions received by the circuit end.
      *
-     * @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.
+     * @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.
+     * @param messageMonitor   The monitor to notify of all messages received by the circuit end.
+     * @param exceptionMonitor The monitor to notify of all exceptions received by the circuit end.
      */
     public CircuitEndBase(MessageProducer producer, MessageConsumer consumer, Session session, MessageMonitor messageMonitor,
         ExceptionMonitor exceptionMonitor)
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
index 1ac94b5244..7d06aba1c0 100644
--- 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
@@ -12,6 +12,20 @@
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
+/*
+ *
+ * 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
@@ -36,7 +50,7 @@ import java.util.List;
  *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Record all exceptions received. <td> {@link ExceptionListener}
+ * <tr><td> Record all exceptions received.
  * </table>
  */
 public class ExceptionMonitor implements ExceptionListener
@@ -45,14 +59,14 @@ public class ExceptionMonitor implements ExceptionListener
     private final Logger log = Logger.getLogger(ExceptionMonitor.class);
 
     /** Holds the received exceptions. */
-    List<JMSException> exceptions = new ArrayList<JMSException>();
+    List<Exception> exceptions = new ArrayList<Exception>();
 
     /**
      * Receives incoming exceptions.
      *
      * @param e The exception to record.
      */
-    public void onException(JMSException e)
+    public synchronized void onException(JMSException e)
     {
         log.debug("public void onException(JMSException e): called", e);
 
@@ -64,7 +78,7 @@ public class ExceptionMonitor implements ExceptionListener
      *
      * @return <tt>true</tt> if no exceptions have been received, <tt>false</tt> otherwise.
      */
-    public boolean assertNoExceptions()
+    public synchronized boolean assertNoExceptions()
     {
         return exceptions.isEmpty();
     }
@@ -74,7 +88,7 @@ public class ExceptionMonitor implements ExceptionListener
      *
      * @return <tt>true</tt> if exactly one exception been received, <tt>false</tt> otherwise.
      */
-    public boolean assertOneJMSException()
+    public synchronized boolean assertOneJMSException()
     {
         return exceptions.size() == 1;
     }
@@ -82,20 +96,27 @@ public class ExceptionMonitor implements ExceptionListener
     /**
      * Checks that exactly one exception, with a linked cause of the specified type, has been received.
      *
+     * @param aClass The type of the linked cause.
+     *
      * @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)
+    public synchronized boolean assertOneJMSExceptionWithLinkedCause(Class aClass)
     {
         if (exceptions.size() == 1)
         {
-            JMSException e = exceptions.get(0);
-
-            Exception linkedCause = e.getLinkedException();
+            Exception e = exceptions.get(0);
 
-            if ((linkedCause != null) && aClass.isInstance(linkedCause))
+            if (e instanceof JMSException)
             {
-                return true;
+                JMSException jmse = (JMSException) e;
+
+                Exception linkedCause = jmse.getLinkedException();
+
+                if ((linkedCause != null) && aClass.isInstance(linkedCause))
+                {
+                    return true;
+                }
             }
         }
 
@@ -103,11 +124,37 @@ public class ExceptionMonitor implements ExceptionListener
     }
 
     /**
+     * Checks that at least one exception of the the specified type, has been received.
+     *
+     * @param exceptionClass The type of the exception.
+     *
+     * @return <tt>true</tt> if at least one exception of the specified type has been received, <tt>false</tt> otherwise.
+     */
+    public synchronized boolean assertExceptionOfType(Class exceptionClass)
+    {
+        // Start by assuming that the exception has no been received.
+        boolean passed = false;
+
+        // Scan all the exceptions for a match.
+        for (Exception e : exceptions)
+        {
+            if (exceptionClass.isInstance(e))
+            {
+                passed = true;
+
+                break;
+            }
+        }
+
+        return passed;
+    }
+
+    /**
      * Reports the number of exceptions held by this monitor.
      *
      * @return The number of exceptions held by this monitor.
      */
-    public int size()
+    public synchronized int size()
     {
         return exceptions.size();
     }
@@ -115,9 +162,9 @@ public class ExceptionMonitor implements ExceptionListener
     /**
      * Clears the record of received exceptions.
      */
-    public void reset()
+    public synchronized void reset()
     {
-        exceptions = new ArrayList();
+        exceptions = new ArrayList<Exception>();
     }
 
     /**
@@ -126,11 +173,11 @@ public class ExceptionMonitor implements ExceptionListener
      *
      * @return A string containing a dump of the stack traces of all exceptions.
      */
-    public String toString()
+    public synchronized String toString()
     {
         String result = "ExceptionMonitor: holds " + exceptions.size() + " exceptions.\n\n";
 
-        for (JMSException ex : exceptions)
+        for (Exception ex : exceptions)
         {
             result += getStackTrace(ex) + "\n";
         }
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
index fa70e14d16..51b053d2b2 100644
--- 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
@@ -20,23 +20,20 @@
  */
 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.BrokerLifecycleAware;
 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 org.apache.qpid.junit.extensions.AsymptoticTestCase;
+import org.apache.qpid.junit.extensions.SetupTaskAware;
+import org.apache.qpid.junit.extensions.SetupTaskHandler;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+import org.apache.qpid.junit.extensions.util.TestContextProperties;
 
 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
@@ -50,13 +47,26 @@ import java.util.Properties;
  * <tr><td> Convert failed assertions to error messages.
  * </table>
  */
-public class FrameworkBaseCase extends AsymptoticTestCase
+public class FrameworkBaseCase extends AsymptoticTestCase implements FrameworkTestContext, SetupTaskAware,
+    BrokerLifecycleAware
 {
     /** 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();
+    protected CircuitFactory circuitFactory = new LocalCircuitFactory();
+
+    /** Used to read the tests configurable properties through. */
+    protected ParsedProperties testProps;
+
+    /** A default setup task processor to delegate setup tasks to. */
+    protected SetupTaskHandler taskHandler = new SetupTaskHandler();
+
+    /** Flag used to track whether the test is in-vm or not. */
+    protected boolean isUsingInVM;
+
+    /** Holds the failure mechanism. */
+    protected CauseFailure failureMechanism = new CauseFailureUserPrompt();
 
     /**
      * Creates a new test case with the specified name.
@@ -92,6 +102,26 @@ public class FrameworkBaseCase extends AsymptoticTestCase
     }
 
     /**
+     * Reports the current test case name.
+     *
+     * @return The current test case name.
+     */
+    public TestCaseVector getTestCaseVector()
+    {
+        return new TestCaseVector(this.getName(), 0);
+    }
+
+    /**
+     * Reports the current test case parameters.
+     *
+     * @return The current test case parameters.
+     */
+    public MessagingTestConfigProperties getTestParameters()
+    {
+        return new MessagingTestConfigProperties(testProps);
+    }
+
+    /**
      * Creates a list of assertions.
      *
      * @param asserts The assertions to compile in a list.
@@ -116,7 +146,7 @@ public class FrameworkBaseCase extends AsymptoticTestCase
      *
      * @param asserts The list of failed assertions.
      */
-    protected void assertNoFailures(List<Assertion> asserts)
+    protected static void assertNoFailures(List<Assertion> asserts)
     {
         log.debug("protected void assertNoFailures(List<Assertion> asserts = " + asserts + "): called");
 
@@ -140,7 +170,7 @@ public class FrameworkBaseCase extends AsymptoticTestCase
      *
      * @return The error message.
      */
-    protected String assertionsToString(List<Assertion> asserts)
+    protected static String assertionsToString(List<Assertion> asserts)
     {
         String errorMessage = "";
 
@@ -161,8 +191,10 @@ public class FrameworkBaseCase extends AsymptoticTestCase
     {
         NDC.push(getName());
 
-        // Ensure that the in-vm broker is created.
-        TransportConnection.createVMBroker(1);
+        testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);
+
+        // Process all optional setup tasks. This may include in-vm broker creation, if a decorator has added it.
+        taskHandler.runSetupTasks();
     }
 
     /**
@@ -170,16 +202,30 @@ public class FrameworkBaseCase extends AsymptoticTestCase
      */
     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();
-        }
+        NDC.pop();
+
+        // Process all optional tear down tasks. This may include in-vm broker clean up, if a decorator has added it.
+        taskHandler.runTearDownTasks();
+    }
+
+    /**
+     * Adds the specified task to the tests setup.
+     *
+     * @param task The task to add to the tests setup.
+     */
+    public void chainSetupTask(Runnable task)
+    {
+        taskHandler.chainSetupTask(task);
+    }
+
+    /**
+     * Adds the specified task to the tests tear down.
+     *
+     * @param task The task to add to the tests tear down.
+     */
+    public void chainTearDownTask(Runnable task)
+    {
+        taskHandler.chainTearDownTask(task);
     }
 
     /**
@@ -197,84 +243,46 @@ public class FrameworkBaseCase extends AsymptoticTestCase
         return methodName;
     }
 
+    public void setInVmBrokers()
+    {
+        isUsingInVM = true;
+    }
+
     /**
-     * DefaultCircuitFactory is a test sequencer that creates test circuits with publishing and receiving ends rooted
-     * on the same JVM.
+     * Indicates whether or not a test case is using in-vm brokers.
+     *
+     * @return <tt>true</tt> if the test is using in-vm brokers, <tt>false</tt> otherwise.
      */
-    public class DefaultCircuitFactory implements CircuitFactory
+    public boolean usingInVmBroker()
     {
-        /**
-         * 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.");
-        }
+        return isUsingInVM;
+    }
 
-        /**
-         * Supplies the sending test client.
-         *
-         * @return The sending test client.
-         */
-        public TestClientDetails getSender()
-        {
-            throw new RuntimeException("Not implemented.");
-        }
+    /**
+     * Sets the currently live in-vm broker.
+     *
+     * @param i The currently live in-vm broker.
+     */
+    public void setLiveBroker(int i)
+    { }
 
-        /**
-         * Supplies the receiving test client.
-         *
-         * @return The receiving test client.
-         */
-        public List<TestClientDetails> getReceivers()
-        {
-            throw new RuntimeException("Not implemented.");
-        }
+    /**
+     * Reports the currently live in-vm broker.
+     *
+     * @return The currently live in-vm broker.
+     */
+    public int getLiveBroker()
+    {
+        return 0;
+    }
 
-        /**
-         * 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.");
-        }
+    /**
+     * Accepts a failure mechanism.
+     *
+     * @param failureMechanism The failure mechanism.
+     */
+    public void setFailureMechanism(CauseFailure failureMechanism)
+    {
+        this.failureMechanism = failureMechanism;
     }
 }
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
index 7bd65618e3..2322955253 100644
--- 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
@@ -1,3 +1,23 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
 package org.apache.qpid.test.framework;
 
 /**
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
new file mode 100644
index 0000000000..e7268db8eb
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.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 FrameworkTestContext provides context information to test code about the current test case being run; its name, its

+ * parameters.

+ *

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

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

+ * <tr><td> Provide the name of the current test case.

+ * <tr><td> Provide the test parameters.

+ * </table>

+ */

+public interface FrameworkTestContext

+{

+    /**

+     * Reports the current test case name.

+     *

+     * @return The current test case name.

+     */

+    TestCaseVector getTestCaseVector();

+

+    /**

+     * Reports the current test case parameters.

+     *

+     * @return The current test case parameters.

+     */

+    MessagingTestConfigProperties getTestParameters();

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
new file mode 100644
index 0000000000..d1fcad9cc0
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
@@ -0,0 +1,168 @@
+/*

+ *

+ * 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 org.apache.qpid.client.AMQSession;

+import org.apache.qpid.test.framework.localcircuit.LocalAMQPPublisherImpl;

+import org.apache.qpid.test.framework.localcircuit.LocalPublisherImpl;

+

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+

+import javax.jms.*;

+

+/**

+ * LocalAMQPCircuitFactory is a test sequencer that creates test circuits with publishing and receiving ends rooted

+ * on the same JVM, allowing AMQP/Qpid specific options to be applied to the circuit.

+ *

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

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

+ * <tr><td> Provide a standard test procedure over a test circuit.

+ * <tr><td> Construct test circuits appropriate to a tests context.

+ * <tr><td> Construct test circuits the support AMQP specific options.

+ * </table>

+ */

+public class LocalAMQPCircuitFactory extends LocalCircuitFactory

+{

+    /** Used for debugging. */

+    private static final Logger log = Logger.getLogger(LocalAMQPCircuitFactory.class);

+

+    /**

+     * 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 javax.jms.JMSException Any underlying JMSExceptions are allowed to fall through and fail the creation.

+     */

+    public CircuitEndBase createPublisherCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)

+        throws JMSException

+    {

+        log.debug(

+            "public 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.getPublisherTransacted(), 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 CircuitEndBase createReceiverCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)

+        throws JMSException

+    {

+        log.debug(

+            "public 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.getPublisherTransacted(), 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);

+    }

+

+    /**

+     * Creates a local {@link Publisher} from a {@link CircuitEnd}. The publisher implementation provides AMQP

+     * specific assertion methods, for testing beyond JMS.

+     *

+     * @param publisherEnd The publishing circuit end.

+     *

+     * @return A {@link Receiver}.

+     */

+    protected LocalPublisherImpl createPublisherFromCircuitEnd(CircuitEndBase publisherEnd)

+    {

+        return new LocalAMQPPublisherImpl(publisherEnd);

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
new file mode 100644
index 0000000000..38a924a4ee
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
@@ -0,0 +1,316 @@
+/*

+ *

+ * 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 org.apache.qpid.test.framework.localcircuit.LocalCircuitImpl;

+import org.apache.qpid.test.framework.localcircuit.LocalPublisherImpl;

+import org.apache.qpid.test.framework.localcircuit.LocalReceiverImpl;

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

+import org.apache.qpid.util.ConversationFactory;

+

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+

+import javax.jms.*;

+

+import java.util.List;

+import java.util.Properties;

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

+

+/**

+ * LocalCircuitFactory is a circuit factory that creates test circuits with publishing and receiving ends rooted

+ * on the same JVM. The ends of the circuit are presented as {@link Publisher} and {@link Receiver} interfaces, which

+ * in turn provide methods to apply assertions to the circuit. The creation of the circuit ends, and the presentation

+ * of the ends as publisher/receiver interfaces, are designed to be overriden, so that circuits and assertions that

+ * use messaging features not available in JMS can be written. This provides an extension point for writing tests

+ * against proprietary features of JMS implementations.

+ *

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

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

+ * <tr><td> Provide a standard test procedure over a test circuit.

+ * <tr><td> Construct test circuits appropriate to a tests context.

+ * </table>

+ */

+public class LocalCircuitFactory implements CircuitFactory

+{

+    /** Used for debugging. */

+    private static final Logger log = Logger.getLogger(LocalCircuitFactory.class);

+

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

+    protected static AtomicLong uniqueDestsId = new AtomicLong();

+

+    /**

+     * 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)

+    {

+        FrameworkBaseCase.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)

+    {

+        Circuit result;

+

+        // Cast the test properties into a typed interface for convenience.

+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProperties);

+

+        // Create a standard publisher/receivers test client pair on a shared connection, individual sessions.

+        try

+        {

+            // 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(testProperties);

+

+            // 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 = createPublisherFromCircuitEnd(publisherEnd);

+            LocalReceiverImpl receiver = createReceiverFromCircuitEnd(receiverEnd);

+

+            result = new LocalCircuitImpl(testProperties, publisher, receiver, connection, publisher.getExceptionMonitor());

+        }

+        catch (JMSException e)

+        {

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

+        }

+

+        return result;

+    }

+

+    /**

+     * Creates a local {@link Receiver} from a {@link CircuitEnd}. Sub-classes may override this to provide more

+     * specialized receivers if necessary.

+     *

+     * @param receiverEnd The receiving circuit end.

+     *

+     * @return A {@link Receiver}.

+     */

+    protected LocalReceiverImpl createReceiverFromCircuitEnd(CircuitEndBase receiverEnd)

+    {

+        return new LocalReceiverImpl(receiverEnd);

+    }

+

+    /**

+     * Creates a local {@link Publisher} from a {@link CircuitEnd}. Sub-classes may override this to provide more

+     * specialized receivers if necessary.

+     *

+     * @param publisherEnd The publishing circuit end.

+     *

+     * @return A {@link Receiver}.

+     */

+    protected LocalPublisherImpl createPublisherFromCircuitEnd(CircuitEndBase publisherEnd)

+    {

+        return new LocalPublisherImpl(publisherEnd);

+    }

+

+    /**

+     * 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 CircuitEndBase createPublisherCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)

+        throws JMSException

+    {

+        log.debug(

+            "public 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);

+

+        // Check that the test properties do not contain AMQP/Qpid specific settings, and fail if they do.

+        if (props.getImmediate() || props.getMandatory())

+        {

+            throw new RuntimeException(

+                "Cannot create a pure JMS circuit as the test properties require AMQP specific options.");

+        }

+

+        Session session = connection.createSession(props.getPublisherTransacted(), props.getAckMode());

+

+        Destination destination =

+            props.getPubsub() ? session.createTopic(props.getSendDestinationNameRoot() + "_" + uniqueId)

+                              : session.createQueue(props.getSendDestinationNameRoot() + "_" + uniqueId);

+

+        MessageProducer producer = props.getPublisherProducerBind() ? 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 CircuitEndBase createReceiverCircuitEnd(Connection connection, ParsedProperties testProps, long uniqueId)

+        throws JMSException

+    {

+        log.debug(

+            "public 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);

+

+        // Check that the test properties do not contain AMQP/Qpid specific settings, and fail if they do.

+        if (props.getImmediate() || props.getMandatory())

+        {

+            throw new RuntimeException(

+                "Cannot create a pure JMS circuit as the test properties require AMQP specific options.");

+        }

+

+        Session session = connection.createSession(props.getPublisherTransacted(), 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);

+    }

+

+    /**

+     * 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/MessageIdentityVector.java b/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
new file mode 100644
index 0000000000..b672b9c3ce
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
@@ -0,0 +1,167 @@
+/*

+ *

+ * 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;

+

+/**

+ * MessageIdentityVector provides a message identification scheme, that matches individual messages with test cases.

+ * Test messages are being sent by a number of test clients, sending messages over a set of routes, and being received

+ * by another set of test clients. Each test is itself, being run within a test cycle, of which there could be many. It

+ * is the job of the test coordinator to request and receive reports from the available test clients, on what has been

+ * sent, what has been received, and what errors may have occurred, and to reconcile this information against the

+ * assertions being applied by the test case. In order to be able to figure out which messages belong to which test,

+ * there needs to be an identification scheme, that the coordinator can use to correlate messages in senders and

+ * receiver reports. Every message sent in a test can be associated with this information.

+ *

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

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

+ * <tr><td> Identify a test case, a handling client id, a circuit end within the client, and a test cycle number.

+ * </table>

+ */

+public class MessageIdentityVector

+{

+    /** Holds the test case vector component of the message identity vector. */

+    private TestCaseVector testCaseVector;

+

+    /** The unique client id. */

+    private String clientId;

+

+    /** The unique circuit end number within the client id. */

+    private int circuitEndId;

+

+    /**

+     * Creates a new identity vector for test messages.

+     *

+     * @param testCase        The name of the test case generating the messages.

+     * @param clientId        The unique id of the client implementing a circuit end that is handling the messages.

+     * @param circuitEndId    The unique id number of the circuit end within the client.

+     * @param testCycleNumber The cycle iteration number of the test case.

+     */

+    public MessageIdentityVector(String testCase, String clientId, int circuitEndId, int testCycleNumber)

+    {

+        this.testCaseVector = new TestCaseVector(testCase, testCycleNumber);

+        this.clientId = clientId;

+        this.circuitEndId = circuitEndId;

+    }

+

+    /**

+     * Reports the test case vector component of the message identity vector.

+     *

+     * @return The test case vector component of the message identity vector.

+     */

+    public TestCaseVector getTestCaseVector()

+    {

+        return testCaseVector;

+    }

+

+    /**

+     * Reports the name of the test case.

+     *

+     * @return The name of the test case.

+     */

+    public String getTestCase()

+    {

+        return testCaseVector.getTestCase();

+    }

+

+    /**

+     * Reports the test iteration cycle number within the test case.

+     *

+     * @return The test iteration cycle number within the test case.

+     */

+    public int getTestCycleNumber()

+    {

+        return testCaseVector.getTestCycleNumber();

+    }

+

+    /**

+     * Resports the client id.

+     *

+     * @return The client id.

+     */

+    public String getClientId()

+    {

+        return clientId;

+    }

+

+    /**

+     * Reports the circuit end number within the test client.

+     *

+     * @return The circuit end number within the test client.

+     */

+    public int getCircuitEndId()

+    {

+        return circuitEndId;

+    }

+

+    /**

+     * Compares this identity vector with another for equality. All fields must match.

+     *

+     * @param o The identity vector to compare with.

+     *

+     * @return <tt>true</tt> if the identity vector is identical to this one by all fields, <tt>false</tt> otherwise.

+     */

+    public boolean equals(Object o)

+    {

+        if (this == o)

+        {

+            return true;

+        }

+

+        if ((o == null) || (getClass() != o.getClass()))

+        {

+            return false;

+        }

+

+        MessageIdentityVector that = (MessageIdentityVector) o;

+

+        if (circuitEndId != that.circuitEndId)

+        {

+            return false;

+        }

+

+        if ((clientId != null) ? (!clientId.equals(that.clientId)) : (that.clientId != null))

+        {

+            return false;

+        }

+

+        if ((testCaseVector != null) ? (!testCaseVector.equals(that.testCaseVector)) : (that.testCaseVector != null))

+        {

+            return false;

+        }

+

+        return true;

+    }

+

+    /**

+    * Computes a hash code for this identity vector based on all fields.

+    *

+    * @return A hash code for this identity vector based on all fields.

+    */

+    public int hashCode()

+    {

+        int result;

+        result = ((testCaseVector != null) ? testCaseVector.hashCode() : 0);

+        result = (31 * result) + ((clientId != null) ? clientId.hashCode() : 0);

+        result = (31 * result) + circuitEndId;

+

+        return result;

+    }

+}

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
index 9e91286683..27f9261d94 100644
--- 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
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.test.framework;
 
-import org.apache.qpid.jms.Session;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+import javax.jms.Session;
 
 import java.util.Properties;
 
@@ -181,10 +181,16 @@ public class MessagingTestConfigProperties extends ParsedProperties
     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";
+    public static final String TRANSACTED_PUBLISHER_PROPNAME = "transactedPublisher";
 
     /** Holds the transactional mode to use for the test. */
-    public static final boolean TRANSACTED_DEFAULT = false;
+    public static final boolean TRANSACTED_PUBLISHER_DEFAULT = false;
+
+    /** Holds the name of the property to get the test transactional mode from. */
+    public static final String TRANSACTED_RECEIVER_PROPNAME = "transactedReceiver";
+
+    /** Holds the transactional mode to use for the test. */
+    public static final boolean TRANSACTED_RECEIVER_DEFAULT = false;
 
     /** Holds the name of the property to set the no local flag from. */
     public static final String NO_LOCAL_PROPNAME = "noLocal";
@@ -204,7 +210,7 @@ public class MessagingTestConfigProperties extends ParsedProperties
     /** Defines the default value of the durable subscriptions flag. */
     public static final boolean DURABLE_SUBSCRIPTION_DEFAULT = false;
 
-    // ======================  Qpid Options and Flags ================================
+    // ======================  Qpid/AMQP Options and Flags ================================
 
     /** Holds the name of the property to set the exclusive flag from. */
     public static final String EXCLUSIVE_PROPNAME = "exclusive";
@@ -230,7 +236,7 @@ public class MessagingTestConfigProperties extends ParsedProperties
     /** 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. */
+    /** Holds the name of the property to set the prefetch size from. */
     public static final String PREFETCH_PROPNAME = "prefetch";
 
     /** Defines the default prefetch size to use when consuming messages. */
@@ -274,6 +280,26 @@ public class MessagingTestConfigProperties extends ParsedProperties
     /** 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 publisher rollback flag from. */
+    public static final String ROLLBACK_PUBLISHER_PROPNAME = "rollbackPublisher";
+
+    /** Holds the default publisher roll back setting. */
+    public static final boolean ROLLBACK_PUBLISHER_DEFAULT = false;
+
+    /** Holds the name of the property to get the publisher rollback flag from. */
+    public static final String ROLLBACK_RECEIVER_PROPNAME = "rollbackReceiver";
+
+    /** Holds the default publisher roll back setting. */
+    public static final boolean ROLLBACK_RECEIVER_DEFAULT = false;
+
+    // ====================== Options that control the bahviour of the test framework. =========================
+
+    /** Holds the name of the property to get the behavioural mode of not applicable assertions. */
+    public static final String NOT_APPLICABLE_ASSERTION_PROPNAME = "notApplicableAssertion";
+
+    /** Holds the default behavioral mode of not applicable assertions, which is logging them as a warning. */
+    public static final String NOT_APPLICABLE_ASSERTION_DEFAULT = "warn";
+
     /** Holds the name of the property to get the verbose mode proeprty from. */
     public static final String VERBOSE_PROPNAME = "verbose";
 
@@ -286,8 +312,11 @@ public class MessagingTestConfigProperties extends 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(BROKER_PROPNAME, BROKER_DEFAULT);
+        defaults.setPropertyIfNull(VIRTUAL_HOST_PROPNAME, VIRTUAL_HOST_DEFAULT);
+        defaults.setPropertyIfNull(USERNAME_PROPNAME, USERNAME_DEFAULT);
+        defaults.setPropertyIfNull(PASSWORD_PROPNAME, PASSWORD_DEFAULT);
+
         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);
@@ -296,28 +325,33 @@ public class MessagingTestConfigProperties extends ParsedProperties
         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(PUBSUB_PROPNAME, PUBSUB_DEFAULT);
+
+        defaults.setPropertyIfNull(PERSISTENT_MODE_PROPNAME, PERSISTENT_MODE_DEFAULT);
+        defaults.setPropertyIfNull(TRANSACTED_PUBLISHER_PROPNAME, TRANSACTED_PUBLISHER_DEFAULT);
+        defaults.setPropertyIfNull(TRANSACTED_RECEIVER_PROPNAME, TRANSACTED_RECEIVER_DEFAULT);
+        defaults.setPropertyIfNull(NO_LOCAL_PROPNAME, NO_LOCAL_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);
+        defaults.setPropertyIfNull(DURABLE_DESTS_PROPNAME, DURABLE_DESTS_DEFAULT);
+        defaults.setPropertyIfNull(PREFETCH_PROPNAME, PREFETCH_DEFAULT);
+
+        defaults.setPropertyIfNull(MESSAGE_SIZE_PROPNAME, MESSAGE_SIZE_DEAFULT);
+        defaults.setPropertyIfNull(RATE_PROPNAME, RATE_DEFAULT);
+        defaults.setPropertyIfNull(SELECTOR_PROPNAME, SELECTOR_DEFAULT);
+        defaults.setPropertyIfNull(TIMEOUT_PROPNAME, TIMEOUT_DEFAULT);
+        defaults.setPropertyIfNull(TX_BATCH_SIZE_PROPNAME, TX_BATCH_SIZE_DEFAULT);
+        defaults.setPropertyIfNull(MAX_PENDING_PROPNAME, MAX_PENDING_DEFAULT);
+        defaults.setPropertyIfNull(ROLLBACK_PUBLISHER_PROPNAME, ROLLBACK_PUBLISHER_DEFAULT);
+        defaults.setPropertyIfNull(ROLLBACK_RECEIVER_PROPNAME, ROLLBACK_RECEIVER_DEFAULT);
+
+        defaults.setPropertyIfNull(NOT_APPLICABLE_ASSERTION_PROPNAME, NOT_APPLICABLE_ASSERTION_DEFAULT);
+        defaults.setPropertyIfNull(VERBOSE_PROPNAME, VERBOSE_DEFAULT);
     }
 
     /**
@@ -338,148 +372,314 @@ public class MessagingTestConfigProperties extends ParsedProperties
         super(properties);
     }
 
+    /**
+     * The size of test messages to send.
+     *
+     * @return The size of test messages to send.
+     */
     public int getMessageSize()
     {
         return getPropertyAsInteger(MESSAGE_SIZE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the publishing producer should be set up to publish to a destination.
+     *
+     * @return Flag to indicate that the publishing producer should be set up to publish to a destination.
+     */
     public boolean getPublisherProducerBind()
     {
         return getPropertyAsBoolean(PUBLISHER_PRODUCER_BIND_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the publishing consumer should be set up to receive from a destination.
+     *
+     * @return Flag to indicate that the publishing consumer should be set up to receive from a destination.
+     */
     public boolean getPublisherConsumerBind()
     {
         return getPropertyAsBoolean(PUBLISHER_CONSUMER_BIND_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the receiving producer should be set up to publish to a destination.
+     *
+     * @return Flag to indicate that the receiving producer should be set up to publish to a destination.
+     */
     public boolean getReceiverProducerBind()
     {
         return getPropertyAsBoolean(RECEIVER_PRODUCER_BIND_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the receiving consumer should be set up to receive from a destination.
+     *
+     * @return Flag to indicate that the receiving consumer should be set up to receive from a destination.
+     */
     public boolean getReceiverConsumerBind()
     {
         return getPropertyAsBoolean(RECEIVER_CONSUMER_BIND_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the publishing consumer should be created and actively listening.
+     *
+     * @return Flag to indicate that the publishing consumer should be created.
+     */
     public boolean getPublisherConsumerActive()
     {
         return getPropertyAsBoolean(PUBLISHER_CONSUMER_ACTIVE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that the receiving consumers should be created and actively listening.
+     *
+     * @return Flag to indicate that the receiving consumers should be created and actively listening.
+     */
     public boolean getReceiverConsumerActive()
     {
         return getPropertyAsBoolean(RECEIVER_CONSUMER_ACTIVE_PROPNAME);
     }
 
+    /**
+     * A root to create all test destination names from.
+     *
+     * @return A root to create all test destination names from.
+     */
     public String getSendDestinationNameRoot()
     {
         return getProperty(SEND_DESTINATION_NAME_ROOT_PROPNAME);
     }
 
+    /**
+     * A root to create all receiving destination names from.
+     *
+     * @return A root to create all receiving destination names from.
+     */
     public String getReceiveDestinationNameRoot()
     {
         return getProperty(RECEIVE_DESTINATION_NAME_ROOT_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that persistent messages should be used.
+     *
+     * @return Flag to indicate that persistent messages should be used.
+     */
     public boolean getPersistentMode()
     {
         return getPropertyAsBoolean(PERSISTENT_MODE_PROPNAME);
     }
 
-    public boolean getTransacted()
+    /**
+     * Flag to indicate that transactional messages should be sent by the publisher.
+     *
+     * @return Flag to indicate that transactional messages should be sent by the publisher.
+     */
+    public boolean getPublisherTransacted()
     {
-        return getPropertyAsBoolean(TRANSACTED_PROPNAME);
+        return getPropertyAsBoolean(TRANSACTED_PUBLISHER_PROPNAME);
     }
 
-    public String getBroker()
+    /**
+     * Flag to indicate that transactional receives should be used by the receiver.
+     *
+     * @return Flag to indicate that transactional receives should be used by the receiver.
+     */
+    public boolean getReceiverTransacted()
     {
-        return getProperty(BROKER_PROPNAME);
+        return getPropertyAsBoolean(TRANSACTED_PUBLISHER_PROPNAME);
     }
 
+    /**
+     * The name of the virtual host to run all tests over.
+     *
+     * @return The name of the virtual host to run all tests over.
+     */
     public String getVirtualHost()
     {
         return getProperty(VIRTUAL_HOST_PROPNAME);
     }
 
+    /**
+     * Limiting rate for each sender in messages per second, or zero for unlimited.
+     *
+     * @return Limiting rate for each sender in messages per second, or zero for unlimited.
+     */
     public String getRate()
     {
         return getProperty(RATE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that test messages should be received publish/subscribe style by all receivers.
+     *
+     * @return Flag to indicate that test messages should be received publish/subscribe style by all receivers.
+     */
     public boolean getPubsub()
     {
         return getPropertyAsBoolean(PUBSUB_PROPNAME);
     }
 
+    /**
+     * The username credentials to run tests with.
+     *
+     * @return The username credentials to run tests with.
+     */
     public String getUsername()
     {
         return getProperty(USERNAME_PROPNAME);
     }
 
+    /**
+     * The password credentials to run tests with.
+     *
+     * @return The password credentials to run tests with.
+     */
     public String getPassword()
     {
         return getProperty(PASSWORD_PROPNAME);
     }
 
-    public int getDestinationCount()
-    {
-        return getPropertyAsInteger(DESTINATION_COUNT_PROPNAME);
-    }
-
+    /**
+     * The timeout duration to fail tests on, should they receive no messages within it.
+     *
+     * @return The timeout duration to fail tests on, should they receive no messages within it.
+     */
     public long getTimeout()
     {
         return getPropertyAsLong(TIMEOUT_PROPNAME);
     }
 
+    /**
+     * The number of messages to batch into each transaction in transational tests.
+     *
+     * @return The number of messages to batch into each transaction in transational tests.
+     */
     public int getTxBatchSize()
     {
         return getPropertyAsInteger(TX_BATCH_SIZE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that tests should use durable destinations.
+     *
+     * @return Flag to indicate that tests should use durable destinations.
+     */
     public boolean getDurableDests()
     {
         return getPropertyAsBoolean(DURABLE_DESTS_PROPNAME);
     }
 
+    /**
+     * The ack mode for message receivers to use.
+     *
+     * @return The ack mode for message receivers to use.
+     */
     public int getAckMode()
     {
         return getPropertyAsInteger(ACK_MODE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that tests should use durable subscriptions.
+     *
+     * @return Flag to indicate that tests should use durable subscriptions.
+     */
     public boolean getDurableSubscription()
     {
         return getPropertyAsBoolean(DURABLE_SUBSCRIPTION_PROPNAME);
     }
 
+    /**
+     * The maximum amount of in-flight data, in bytes, that tests should send at any time.
+     *
+     * @return The maximum amount of in-flight data, in bytes, that tests should send at any time.
+     */
     public int getMaxPending()
     {
         return getPropertyAsInteger(MAX_PENDING_PROPNAME);
     }
 
-    public int getPrefecth()
+    /**
+     * The size of the prefetch queue to use.
+     *
+     * @return The size of the prefetch queue to use.
+     */
+    public int getPrefetch()
     {
         return getPropertyAsInteger(PREFETCH_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that subscriptions should be no-local.
+     *
+     * @return Flag to indicate that subscriptions should be no-local.
+     */
     public boolean getNoLocal()
     {
         return getPropertyAsBoolean(NO_LOCAL_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that subscriptions should be exclusive.
+     *
+     * @return Flag to indicate that subscriptions should be exclusive.
+     */
     public boolean getExclusive()
     {
         return getPropertyAsBoolean(EXCLUSIVE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that messages must be delivered immediately.
+     *
+     * @return Flag to indicate that messages must be delivered immediately.
+     */
     public boolean getImmediate()
     {
         return getPropertyAsBoolean(IMMEDIATE_PROPNAME);
     }
 
+    /**
+     * Flag to indicate that messages must be routable.
+     *
+     * @return Flag to indicate that messages must be routable.
+     */
     public boolean getMandatory()
     {
         return getPropertyAsBoolean(MANDATORY_PROPNAME);
     }
+
+    /**
+     * Gets the value of a flag to indicate that the publisher should rollback all messages sent.
+     *
+     * @return A flag to indicate that the publisher should rollback all messages sent.
+     */
+    public boolean getRollbackPublisher()
+    {
+        return getPropertyAsBoolean(ROLLBACK_PUBLISHER_PROPNAME);
+    }
+
+    /**
+     * Gets the value of a flag to indicate that the receiver should rollback all messages received, then receive them
+     * again.
+     *
+     * @return A flag to indicate that the publisher should rollback all messages received.
+     */
+    public boolean getRollbackReceiver()
+    {
+        return getPropertyAsBoolean(ROLLBACK_RECEIVER_PROPNAME);
+    }
+
+    /**
+     * Gets the behavioural mode of not applicable assertions. Should be one of 'quiet', 'warn' or 'fail'.
+     *
+     * @return The behavioural mode of not applicable assertions.
+     */
+    public String getNotApplicableAssertionMode()
+    {
+        return getProperty(NOT_APPLICABLE_ASSERTION_PROPNAME);
+    }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java b/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
new file mode 100644
index 0000000000..63c7fd61c3
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
@@ -0,0 +1,112 @@
+/*

+ *

+ * 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 org.apache.qpid.junit.extensions.util.ParsedProperties;

+

+/**

+ * NotApplicableAssertion is a messaging assertion that can be used when an assertion requested by a test-case is not

+ * applicable to the testing scenario. For example an assertion may relate to AMQP functionality, but a test case may be

+ * being run over a non-AMQP JMS implementation, in which case the request to create the assertion may return this

+ * instead of the proper assertion. The test framework is configurable to quietly drop these assertions, log them

+ * as warnings to the console, or raise them as test failures.

+ *

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

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

+ * <tr><td> Quitely pass.

+ * <tr><td> Log a warning.

+ * <tr><td> Raise a test failure.

+ * </table>

+ */

+public class NotApplicableAssertion implements Assertion

+{

+    /** Used for logging to the console. */

+    private static final Logger console = Logger.getLogger("CONSOLE." + NotApplicableAssertion.class.getName());

+

+    /** The possible behavioural modes of this assertion. */

+    private enum Mode

+    {

+        /** Quietly ignore the assertion by passing. */

+        Quiet,

+

+        /** Ignore the assertion by passing but log a warning about it. */

+        Warn,

+

+        /** Fail the assertion. */

+        Fail;

+    }

+

+    /** The behavioural mode of the assertion. */

+    private Mode mode;

+

+    /**

+     * Creates an assertion that is driven by the value of the 'notApplicableAssertion' property of the test

+     * configuration. Its value should match one of 'quiet', 'warn' or 'fail' and if it does not it is automatically

+     * read as 'fail'.

+     *

+     * @param testProperties The test configuration properties.

+     */

+    public NotApplicableAssertion(ParsedProperties testProperties)

+    {

+        // Cast the test properties into a typed interface for convenience.

+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProperties);

+

+        String modeName = props.getNotApplicableAssertionMode();

+

+        if ("quiet".equals(modeName))

+        {

+            mode = Mode.Quiet;

+        }

+        else if ("warn".equals(modeName))

+        {

+            mode = Mode.Warn;

+        }

+        else

+        {

+            mode = Mode.Fail;

+        }

+    }

+

+    /**

+     * Applies the assertion.

+     *

+     * @return <tt>true</tt> if the assertion passes, <tt>false</tt> if it fails.

+     */

+    public boolean apply()

+    {

+        switch (mode)

+        {

+        case Quiet:

+            return true;

+

+        case Warn:

+            console.warn("Warning: Not applicable assertion being ignored.");

+

+            return true;

+

+        case Fail:

+        default:

+            return false;

+        }

+    }

+}

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
index 8e61deedcf..2c8be4f787 100644
--- 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
@@ -20,37 +20,55 @@
  */
 package org.apache.qpid.test.framework;
 
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 /**
- * 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.
+ * A Publisher 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>
+ *
+ * @todo There are mixtures of AMQP and JMS assertions in this interface. Either keep them here, but quietly (or with a
+ *       warning or error) drop them from test cases where they are not relevant, or push them down into sub-classes.
+ *       I am tempted to go with the dropping/warning/error approach, that would imply that it makes sense to pull
+ *       the assertions back from AMQPPublisher to here.
  */
 public interface Publisher
 {
+    // Assertions that are meaningfull to AMQP and to JMS.
+
     /**
      * Provides an assertion that the publisher encountered no exceptions.
      *
+     * @param testProps The test configuration properties.
+     *
      * @return An assertion that the publisher encountered no exceptions.
      */
-    public Assertion noExceptionsAssertion();
+    public Assertion noExceptionsAssertion(ParsedProperties testProps);
+
+    // Assertions that are meaningfull only to AMQP.
 
     /**
-     * Provides an assertion that the publisher got a no consumers exception on every message.
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
      *
-     * @return An assertion that the publisher got a no consumers exception on every message.
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
      */
-    public Assertion noConsumersAssertion();
+    public Assertion channelClosedAssertion(ParsedProperties testProps);
+
+    // Assertions that are meaningfull only to Java/JMS.
 
     /**
-     * Provides an assertion that the publisher got a no rout exception on every message.
+     * Provides an assertion that the publisher got a given exception during the test.
+     *
+     * @param testProps      The test configuration properties.
+     * @param exceptionClass The exception class to check for.
      *
-     * @return An assertion that the publisher got a no rout exception on every message.
+     * @return An assertion that the publisher got a given exception during the test.
      */
-    public Assertion noRouteAssertion();
+    public Assertion exceptionAssertion(ParsedProperties testProps, Class<? extends Exception> exceptionClass);
 }
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
index f1343b9997..19dc4d90e7 100644
--- 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
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.test.framework;
 
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 /**
  * 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.
@@ -29,20 +31,62 @@ package org.apache.qpid.test.framework;
  * <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>
+ *
+ * @todo There are mixtures of AMQP and JMS assertions in this interface. Either keep them here, but quietly (or with a
+ *       warning or error) drop them from test cases where they are not relevant, or push them down into sub-classes.
+ *       I am tempted to go with the dropping/warning/error approach.
  */
 public interface Receiver
 {
+    // Assertions that are meaningfull to AMQP and to JMS.
+
     /**
      * Provides an assertion that the receivers encountered no exceptions.
      *
+     * @param testProps The test configuration properties.
+     *
      * @return An assertion that the receivers encountered no exceptions.
      */
-    public Assertion noExceptionsAssertion();
+    public Assertion noExceptionsAssertion(ParsedProperties testProps);
 
     /**
      * Provides an assertion that the receivers got all messages that were sent to it.
      *
+     * @param testProps The test configuration properties.
+     *
      * @return An assertion that the receivers got all messages that were sent to it.
      */
-    public Assertion allMessagesAssertion();
+    public Assertion allMessagesReceivedAssertion(ParsedProperties testProps);
+
+    /**
+     * Provides an assertion that the receivers got none of the messages that were sent to it.
+     *
+     * @param testProps The test configuration properties.
+     *
+     * @return An assertion that the receivers got none of the messages that were sent to it.
+     */
+    public Assertion noMessagesReceivedAssertion(ParsedProperties testProps);
+
+    // Assertions that are meaningfull only to AMQP.
+
+    /**
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
+     *
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
+     */
+    public Assertion channelClosedAssertion(ParsedProperties testProps);
+
+    // Assertions that are meaningfull only to Java/JMS.
+
+    /**
+     * Provides an assertion that the receiver got a given exception during the test.
+     *
+     * @param testProps The test configuration properties.
+     * @param exceptionClass The exception class to check for.
+     *
+     * @return An assertion that the receiver got a given exception during the test.
+     */
+    public Assertion exceptionAssertion(ParsedProperties testProps, Class<? extends Exception> exceptionClass);
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java b/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
new file mode 100644
index 0000000000..0518a827ba
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
@@ -0,0 +1,88 @@
+/*

+ *

+ * 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;

+

+/**

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

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

+ * <tr><td>

+ * </table>

+ */

+public class TestCaseVector

+{

+    /** The test case name. */

+    private String testCase;

+

+    /** The test cycle number within the test case. */

+    private int testCycleNumber;

+

+    public TestCaseVector(String testCase, int testCycleNumber)

+    {

+        this.testCase = testCase;

+        this.testCycleNumber = testCycleNumber;

+    }

+

+    public String getTestCase()

+    {

+        return testCase;

+    }

+

+    public int getTestCycleNumber()

+    {

+        return testCycleNumber;

+    }

+

+    public boolean equals(Object o)

+    {

+        if (this == o)

+        {

+            return true;

+        }

+

+        if ((o == null) || (getClass() != o.getClass()))

+        {

+            return false;

+        }

+

+        TestCaseVector that = (TestCaseVector) o;

+

+        if (testCycleNumber != that.testCycleNumber)

+        {

+            return false;

+        }

+

+        if ((testCase != null) ? (!testCase.equals(that.testCase)) : (that.testCase != null))

+        {

+            return false;

+        }

+

+        return true;

+    }

+

+    public int hashCode()

+    {

+        int result;

+        result = ((testCase != null) ? testCase.hashCode() : 0);

+        result = (31 * result) + testCycleNumber;

+

+        return result;

+    }

+}

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
index c855ee21fa..d7a6f83527 100644
--- 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
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;
 
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 import javax.jms.*;
 import javax.naming.Context;
@@ -32,7 +32,6 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * TestUtils provides static helper methods that are usefull for writing tests against QPid.
@@ -40,7 +39,9 @@ import java.util.Properties;
  * <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> Create test messages.
  * <tr><td> Inject a short pause in a test.
+ * <tr><td> Serialize properties into a message.
  * </table>
  */
 public class TestUtils
@@ -48,7 +49,8 @@ public class TestUtils
     /** Used for debugging. */
     private static Logger log = Logger.getLogger(TestUtils.class);
 
-    private static byte[] MESSAGE_DATA_BYTES =
+    /** Some dummy data to stuff all test messages with. */
+    private static final byte[] MESSAGE_DATA_BYTES =
         "Test Message -- Test Message -- Test Message -- Test Message -- Test Message -- Test Message -- Test Message -- "
         .getBytes();
 
@@ -118,7 +120,7 @@ public class TestUtils
      *
      * @return A bytes message, of the specified size, filled with dummy data.
      *
-     *
+     * @throws JMSException Any underlying JMSExceptions are allowed to fall through.
      */
     public static Message createTestMessageOfSize(Session session, int size) throws JMSException
     {
@@ -187,3 +189,4 @@ public class TestUtils
         }
     }
 }
+
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
index 51b839d51e..00cc2d8966 100644
--- 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
@@ -21,8 +21,8 @@
 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.
+ * ClockSynchFailureException represents failure of a {@link ClockSynchronizer} to achieve synchronization. For example,
+ * this could be because a reference signal is not available, or because a desired accurracy cannot be attained.
  *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
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
index 88f0043067..3d4c4f7d12 100644
--- 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
@@ -22,8 +22,8 @@ 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;
+import org.apache.qpid.junit.extensions.ShutdownHookable;
+import org.apache.qpid.junit.extensions.Throttle;
 
 /**
  * ClockSynchThread is a convenient utility for running a thread that periodically synchronizes the clock against
@@ -121,3 +121,4 @@ public class ClockSynchThread extends Thread implements ShutdownHookable
                 });
     }
 }
+
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
index 96485edbea..a92c551bc2 100644
--- 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
@@ -32,7 +32,7 @@ package org.apache.qpid.test.framework.clocksynch;
  *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Trigger a clock synchronziation.
+ * <tr><td> Trigger a clock synchronization.
  * <tr><td> Compute a clock delta to apply to the local clock.
  * <tr><td> Estimate the error in the synchronzation.
  * </table>
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
index 8b68097158..8bce752f68 100644
--- 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
@@ -20,14 +20,12 @@
  */
 package org.apache.qpid.test.framework.clocksynch;
 
-import org.apache.log4j.Logger;
+import org.apache.qpid.junit.extensions.ShutdownHookable;
 
 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()).
  *
@@ -49,7 +47,7 @@ public class UDPClockReference implements Runnable, ShutdownHookable
     private static final int TIMEOUT = 200;
 
     /** Defines the port to run the clock reference on. */
-    public static final int REFERENCE_PORT = 4445;
+    public static final int REFERENCE_PORT = 4444;
 
     /** Holds the socket to receive clock reference requests on. */
     protected DatagramSocket socket = null;
@@ -164,3 +162,4 @@ public class UDPClockReference implements Runnable, ShutdownHookable
         }
     }
 }
+
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
index a5ae0a0db6..c89112eff8 100644
--- 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
@@ -20,10 +20,8 @@
  */
 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 org.apache.qpid.junit.extensions.util.CommandLineParser;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 import java.io.IOException;
 import java.net.*;
@@ -462,3 +460,4 @@ public class UDPClockSynchronizer implements ClockSynchronizer
         }
     }
 }
+
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
index 159f364825..aefeb17d59 100644
--- 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
@@ -25,9 +25,9 @@ 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 org.apache.qpid.junit.extensions.TimingController;
+import org.apache.qpid.junit.extensions.TimingControllerAware;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -232,7 +232,7 @@ public class DistributedCircuitImpl implements Circuit, TimingControllerAware
     }
 
     /**
-     * Used by tests cases that can supply a {@link uk.co.thebadgerset.junit.extensions.TimingController} to set the
+     * Used by tests cases that can supply a {@link org.apache.qpid.junit.extensions.TimingController} to set the
      * controller on an aware test.
      *
      * @param controller The timing controller.
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
index 810e1ae685..c51f710494 100644
--- 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
@@ -23,10 +23,17 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;
 import org.apache.qpid.test.framework.Publisher;
 
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 /**
+ * DistributedPublisherImpl represents the status of the publishing side of a test circuit. Its main purpose is to
+ * provide assertions that can be applied to verify the behaviour of a non-local publisher.
+ *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <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 class DistributedPublisherImpl implements Publisher
@@ -35,8 +42,9 @@ public class DistributedPublisherImpl implements Publisher
      * Provides an assertion that the publisher encountered no exceptions.
      *
      * @return An assertion that the publisher encountered no exceptions.
+     * @param testProps
      */
-    public Assertion noExceptionsAssertion()
+    public Assertion noExceptionsAssertion(ParsedProperties testProps)
     {
         throw new RuntimeException("Not implemented.");
     }
@@ -60,4 +68,28 @@ public class DistributedPublisherImpl implements Publisher
     {
         throw new RuntimeException("Not implemented.");
     }
+
+    /**
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
+     */
+    public Assertion channelClosedAssertion(ParsedProperties testProps)
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the publisher got a given exception during the test.
+     *
+     * @param testProps      The test configuration properties.
+     * @param exceptionClass The exception class to check for.
+     * @return An assertion that the publisher got a given exception during the test.
+     */
+    public Assertion exceptionAssertion(ParsedProperties testProps, Class<? extends Exception> exceptionClass)
+    {
+        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
index db85921b85..863921e387 100644
--- 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
@@ -23,10 +23,16 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;
 import org.apache.qpid.test.framework.Receiver;
 
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 /**
+ * DistributedReceiverImpl represents the status of the receiving side of a test circuit. Its main purpose is to
+ * provide assertions that can be applied to verify the behaviour of a non-local receiver.
+ *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <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 DistributedReceiverImpl implements Receiver
@@ -35,8 +41,9 @@ public class DistributedReceiverImpl implements Receiver
      * Provides an assertion that the receivers encountered no exceptions.
      *
      * @return An assertion that the receivers encountered no exceptions.
+     * @param testProps
      */
-    public Assertion noExceptionsAssertion()
+    public Assertion noExceptionsAssertion(ParsedProperties testProps)
     {
         throw new RuntimeException("Not implemented.");
     }
@@ -45,9 +52,44 @@ public class DistributedReceiverImpl implements Receiver
      * 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.
+     * @param testProps
+     */
+    public Assertion allMessagesReceivedAssertion(ParsedProperties testProps)
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the receivers got none of the messages that were sent to it.
+     *
+     * @return An assertion that the receivers got none of the messages that were sent to it.
+     * @param testProps
+     */
+    public Assertion noMessagesReceivedAssertion(ParsedProperties testProps)
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
+     */
+    public Assertion channelClosedAssertion(ParsedProperties testProps)
+    {
+        throw new RuntimeException("Not implemented.");
+    }
+
+    /**
+     * Provides an assertion that the receiver got a given exception during the test.
+     *
+     * @param testProps
+     *@param exceptionClass The exception class to check for. @return An assertion that the receiver got a given exception during the test.
      */
-    public Assertion allMessagesAssertion()
+    public Assertion exceptionAssertion(ParsedProperties testProps, Class<? extends Exception> exceptionClass)
     {
         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
index 95f02aa70e..dce2706bc4 100644
--- 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
@@ -24,10 +24,9 @@ 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 org.apache.qpid.junit.extensions.util.ParsedProperties;
+import org.apache.qpid.junit.extensions.util.TestContextProperties;
 
 import javax.jms.*;
 
@@ -48,7 +47,15 @@ import javax.jms.*;
  *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <tr><td> Provide a message producer for sending messages.
+ *     <td> {@link CircuitEnd}, {@link LocalCircuitFactory}, {@link TestUtils}
+ * <tr><td> Provide a message consumer for receiving messages.
+ *     <td> {@link CircuitEnd}, {@link LocalCircuitFactory}, {@link TestUtils}
+ * <tr><td> Supply the name of the test case that this implements.
+ * <tr><td> Accept/Reject invites based on test parameters. <td> {@link MessagingTestConfigProperties}
+ * <tr><td> Adapt to assigned roles. <td> {@link TestClientControlledTest.Roles}
+ * <tr><td> Perform test case actions. <td> {@link MessageMonitor}
+ * <tr><td> Generate test reports. <td> {@link MessageMonitor}
  * </table>
  */
 public class TestClientCircuitEnd implements CircuitEnd, TestClientControlledTest
@@ -145,13 +152,15 @@ public class TestClientCircuitEnd implements CircuitEnd, TestClientControlledTes
         connection = TestUtils.createConnection(testProps);
 
         // Create a circuit end that matches the assigned role and test parameters.
+        LocalCircuitFactory circuitFactory = new LocalCircuitFactory();
+
         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);
+            circuitEnd = circuitFactory.createPublisherCircuitEnd(connection, testProps, 0L);
 
             // Create a custom message monitor that will be updated on every message sent.
             messageMonitor = new MessageMonitor();
@@ -162,7 +171,7 @@ public class TestClientCircuitEnd implements CircuitEnd, TestClientControlledTes
         case RECEIVER:
 
             // Set up the receiver.
-            circuitEnd = LocalCircuitImpl.createReceiverCircuitEnd(connection, testProps, 0L);
+            circuitEnd = circuitFactory.createReceiverCircuitEnd(connection, testProps, 0L);
 
             // Use the message monitor from the consumer for stats.
             messageMonitor = getMessageMonitor();
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
index f79cde9dcc..55f05ec6f2 100644
--- 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
@@ -20,33 +20,31 @@
  */
 package org.apache.qpid.test.framework.distributedtesting;
 
+import java.net.InetAddress;
+import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import javax.jms.*;
+
 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.util.ConversationFactory;
-import org.apache.qpid.util.PrettyPrintingUtils;
-
-import uk.co.thebadgerset.junit.extensions.TKTestRunner;
-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;
-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.net.InetAddress;
-import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.qpid.junit.extensions.TKTestRunner;
+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;
+import org.apache.qpid.junit.extensions.util.CommandLineParser;
+import org.apache.qpid.junit.extensions.util.MathUtils;
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+import org.apache.qpid.junit.extensions.util.TestContextProperties;
 
 /**
  * <p/>Implements the coordinator client described in the interop testing specification
@@ -56,7 +54,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  * <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> Decorate available tests to run on all available clients. <td> {@link DistributedTestDecorator}
  * <tr><td> Attach XML test result logger.
  * <tr><td> Terminate the interop testing framework.
  * </table>
@@ -64,8 +62,6 @@ import java.util.concurrent.LinkedBlockingQueue;
  * @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
 {
@@ -119,27 +115,28 @@ public class Coordinator extends TKTestRunner
     /**
      * 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.
+     * @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.
+     * @param decoratorFactories List of factories for user specified decorators.
      */
     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)
+        boolean terminate, boolean csv, boolean xml, List<TestDecoratorFactory> decoratorFactories)
     {
-        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, csv, xml, verbose);
+        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, csv, xml, decoratorFactories);
 
         log.debug("public Coordinator(Integer repetitions = " + repetitions + " , Long duration = " + duration
             + ", int[] threads = " + Arrays.toString(threads) + ", int delay = " + delay + ", int[] params = "
@@ -221,7 +218,11 @@ public class Coordinator extends TKTestRunner
                                 },
                                 { "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" }
+                                { "n", "A name for this test run, used to name the output file.", "name", "true" },
+                                {
+                                    "X:decorators", "A list of additional test decorators to wrap the tests in.",
+                                    "\"class.name[:class.name]*\"", "false"
+                                }
                             }), testContextProperties));
 
             // Extract the command line options.
@@ -234,13 +235,13 @@ public class Coordinator extends TKTestRunner
             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");
+            String decorators = options.getProperty("X:decorators");
 
             int[] threads = (threadsString == null) ? null : MathUtils.parseSequence(threadsString);
             int[] params = (paramsString == null) ? null : MathUtils.parseSequence(paramsString);
@@ -253,6 +254,9 @@ public class Coordinator extends TKTestRunner
             Collection<Class<? extends FrameworkBaseCase>> testCaseClasses =
                 new ArrayList<Class<? extends FrameworkBaseCase>>();
 
+            // Create a list of test decorator factories for use specified decorators to be applied.
+            List<TestDecoratorFactory> decoratorFactories = parseDecorators(decorators);
+
             // Scan for available test cases using a classpath scanner.
             // ClasspathScanner.getMatches(DistributedTestCase.class, "^Test.*", true);
 
@@ -306,7 +310,7 @@ public class Coordinator extends TKTestRunner
             // 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);
+                    virtualHost, engine, terminate, csvResults, xmlResults, decoratorFactories);
 
             TestResult testResult = coordinator.start(testClassNames);
 
@@ -324,6 +328,7 @@ public class Coordinator extends TKTestRunner
         {
             log.debug("Top level handler caught execption.", e);
             console.info(e.getMessage());
+            e.printStackTrace();
             System.exit(EXCEPTION_EXIT);
         }
     }
@@ -339,8 +344,7 @@ public class Coordinator extends TKTestRunner
      */
     public TestResult start(String[] testClassNames) throws Exception
     {
-        log.debug("public TestResult start(String[] testClassNames = " + PrettyPrintingUtils.printArray(testClassNames)
-            + ": called");
+        log.debug("public TestResult start(String[] testClassNames = " + Arrays.toString(testClassNames) + ": called");
 
         // Connect to the broker.
         connection = TestUtils.createConnection(TestContextProperties.getInstance());
@@ -474,7 +478,7 @@ public class Coordinator extends TKTestRunner
         {
             log.debug("targetTest is a TestSuite");
 
-            TestSuite suite = (TestSuite) test;
+            TestSuite suite = (TestSuite)test;
 
             int numTests = suite.countTestCases();
             log.debug("There are " + numTests + " in the suite.");
@@ -494,6 +498,9 @@ public class Coordinator extends TKTestRunner
             log.debug("Wrapped with a WrappedSuiteTestDecorator.");
         }
 
+        // Apply any optional user specified decorators.
+        targetTest = applyOptionalUserDecorators(targetTest);
+
         // Wrap the tests in a suitable distributed test decorator, to perform the invite/test cycle.
         targetTest = newTestDecorator(targetTest, enlistedClients, conversationFactory, connection);
 
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
index d11348cbad..d2f8ca896c 100644
--- 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
@@ -29,7 +29,7 @@ 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 org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
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
index 6fc3b2937e..d6ae390a4a 100644
--- 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
@@ -32,14 +32,13 @@ 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 org.apache.qpid.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;
 
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
index 130173cc96..38ab66d6ae 100644
--- 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
@@ -31,7 +31,7 @@ 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 org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;
 
 import javax.jms.Connection;
 
@@ -50,7 +50,7 @@ import java.util.*;
  * <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}
+ * <tr><td> Fail non-participating pairings. <td> {@link OptOutTestCase}
  * </table>
  */
 public class InteropTestDecorator extends DistributedTestDecorator
@@ -206,3 +206,4 @@ public class InteropTestDecorator extends DistributedTestDecorator
         }
     }
 }
+
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
new file mode 100644
index 0000000000..1c138fe575
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
@@ -0,0 +1,497 @@
+/*

+ *

+ * 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.log4j.Logger;

+import org.apache.log4j.NDC;

+

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

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

+import org.apache.qpid.test.framework.clocksynch.ClockSynchThread;

+import org.apache.qpid.test.framework.clocksynch.UDPClockSynchronizer;

+import org.apache.qpid.util.ReflectionUtils;

+import org.apache.qpid.util.ReflectionUtilsException;

+

+import org.apache.qpid.junit.extensions.SleepThrottle;

+import org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

+

+import javax.jms.*;

+

+import java.util.*;

+

+/**

+ * Implements a test client as described in the interop testing spec

+ * (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification). A test client is an agent that

+ * reacts to control message sequences send by the test {@link Coordinator}.

+ *

+ * <p/><table><caption>Messages Handled by TestClient</caption>

+ * <tr><th> Message               <th> Action

+ * <tr><td> Invite(compulsory)    <td> Reply with Enlist.

+ * <tr><td> Invite(test case)     <td> Reply with Enlist if test case available.

+ * <tr><td> AssignRole(test case) <td> Reply with Accept Role if matches an enlisted test. Keep test parameters.

+ * <tr><td> Start                 <td> Send test messages defined by test parameters. Send report on messages sent.

+ * <tr><td> Status Request        <td> Send report on messages received.

+ * <tr><td> Terminate             <td> Terminate the test client.

+ * <tr><td> ClockSynch            <td> Synch clock against the supplied UDP address.

+ * </table>

+ *

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

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

+ * <tr><td> Handle all incoming control messages. <td> {@link TestClientControlledTest}

+ * <tr><td> Configure and look up test cases by name. <td> {@link TestClientControlledTest}

+ * </table>

+ */

+public class TestClient implements MessageListener

+{

+    /** Used for debugging. */

+    private static final Logger log = Logger.getLogger(TestClient.class);

+

+    /** Used for reporting to the console. */

+    private static final Logger console = Logger.getLogger("CONSOLE");

+

+    /** Holds the default identifying name of the test client. */

+    public static final String CLIENT_NAME = "java";

+

+    /** Holds the URL of the broker to run the tests on. */

+    public static String brokerUrl;

+

+    /** Holds the virtual host to run the tests on. If <tt>null</tt>, then the default virtual host is used. */

+    public static String virtualHost;

+

+    /**

+     * 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.

+     */

+    public static ParsedProperties testContextProperties =

+        TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);

+

+    /** Holds all the test cases loaded from the classpath. */

+    Map<String, TestClientControlledTest> testCases = new HashMap<String, TestClientControlledTest>();

+

+    /** Holds the test case currently being run by this client. */

+    protected TestClientControlledTest currentTestCase;

+

+    /** Holds the connection to the broker that the test is being coordinated on. */

+    protected Connection connection;

+

+    /** Holds the message producer to hold the test coordination over. */

+    protected MessageProducer producer;

+

+    /** Holds the JMS controlSession for the test coordination. */

+    protected Session session;

+

+    /** Holds the name of this client, with a default value. */

+    protected String clientName = CLIENT_NAME;

+

+    /** This flag indicates that the test client should attempt to join the currently running test case on start up. */

+    protected boolean join;

+

+    /** Holds the clock synchronizer for the test node. */

+    ClockSynchThread clockSynchThread;

+

+    /**

+     * Creates a new interop test client, listenting to the specified broker and virtual host, with the specified client

+     * identifying name.

+     *

+     * @param pBrokerUrl   The url of the broker to connect to.

+     * @param pVirtualHost The virtual host to conect to.

+     * @param clientName  The client name to use.

+     * @param join        Flag to indicate that this client should attempt to join running tests.

+     */

+    public TestClient(String pBrokerUrl, String pVirtualHost, String clientName, boolean join)

+    {

+        log.debug("public TestClient(String pBrokerUrl = " + pBrokerUrl + ", String pVirtualHost = " + pVirtualHost

+            + ", String clientName = " + clientName + ", boolean join = " + join + "): called");

+

+        // Retain the connection parameters.

+        brokerUrl = pBrokerUrl;

+        virtualHost = pVirtualHost;

+        this.clientName = clientName;

+        this.join = join;

+    }

+

+    /**

+     * 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> Optional.

+     * <tr><td> -h         <td> The virtual host.     <td> Optional.

+     * <tr><td> -n         <td> The test client name. <td> Optional.

+     * <tr><td> name=value <td> Trailing argument define name/value pairs. Added to system properties. <td> Optional.

+     * </table>

+     *

+     * @param args The command line arguments.

+     */

+    public static void main(String[] args)

+    {

+        log.debug("public static void main(String[] args = " + Arrays.toString(args) + "): called");

+        console.info("Qpid Distributed Test Client.");

+

+        // Override the default broker url to be localhost:5672.

+        testContextProperties.setProperty(MessagingTestConfigProperties.BROKER_PROPNAME, "tcp://localhost:5672");

+

+        // 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(org.apache.qpid.junit.extensions.util.CommandLineParser.processCommandLine(args,

+                    new org.apache.qpid.junit.extensions.util.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" },

+                            { "n", "The name of the test client.", "name", "false" },

+                            { "j", "Join this test client to running test.", "false" }

+                        }), testContextProperties));

+

+        // Extract the command line options.

+        String brokerUrl = options.getProperty("b");

+        String virtualHost = options.getProperty("h");

+        String clientName = options.getProperty("n");

+        clientName = (clientName == null) ? CLIENT_NAME : clientName;

+        boolean join = options.getPropertyAsBoolean("j");

+

+        // To distinguish logging output set up an NDC on the client name.

+        NDC.push(clientName);

+

+        // Create a test client and start it running.

+        TestClient client = new TestClient(brokerUrl, virtualHost, clientName, join);

+

+        // Use a class path scanner to find all the interop test case implementations.

+        // Hard code the test classes till the classpath scanner is fixed.

+        Collection<Class<? extends TestClientControlledTest>> testCaseClasses =

+            new ArrayList<Class<? extends TestClientControlledTest>>();

+        // ClasspathScanner.getMatches(TestClientControlledTest.class, "^TestCase.*", true);

+        testCaseClasses.addAll(loadTestCases("org.apache.qpid.interop.clienttestcases.TestCase1DummyRun",

+                "org.apache.qpid.interop.clienttestcases.TestCase2BasicP2P",

+                "org.apache.qpid.interop.clienttestcases.TestCase3BasicPubSub",

+                "org.apache.qpid.interop.clienttestcases.TestCase4P2PMessageSize",

+                "org.apache.qpid.interop.clienttestcases.TestCase5PubSubMessageSize",

+                "org.apache.qpid.test.framework.distributedcircuit.TestClientCircuitEnd"));

+

+        try

+        {

+            client.start(testCaseClasses);

+        }

+        catch (Exception e)

+        {

+            log.error("The test client was unable to start.", e);

+            console.info(e.getMessage());

+            System.exit(1);

+        }

+    }

+

+    /**

+     * Parses a list of class names, and loads them if they are available on the class path.

+     *

+     * @param classNames The names of the classes to load.

+     *

+     * @return A list of the loaded test case classes.

+     */

+    public static List<Class<? extends TestClientControlledTest>> loadTestCases(String... classNames)

+    {

+        List<Class<? extends TestClientControlledTest>> testCases =

+            new LinkedList<Class<? extends TestClientControlledTest>>();

+

+        for (String className : classNames)

+        {

+            try

+            {

+                Class<?> cls = ReflectionUtils.forName(className);

+                testCases.add((Class<? extends TestClientControlledTest>) cls);

+            }

+            catch (ReflectionUtilsException e)

+            {

+                // Ignore, class could not be found, so test not available.

+                console.warn("Requested class " + className + " cannot be found, ignoring it.");

+            }

+            catch (ClassCastException e)

+            {

+                // Ignore, class was not of correct type to be a test case.

+                console.warn("Requested class " + className + " is not an instance of TestClientControlledTest.");

+            }

+        }

+

+        return testCases;

+    }

+

+    /**

+     * Starts the interop test client running. This causes it to start listening for incoming test invites.

+     *

+     * @param testCaseClasses The classes of the available test cases. The test case names from these are used to

+     *                        matchin incoming test invites against.

+     *

+     * @throws JMSException Any underlying JMSExceptions are allowed to fall through.

+     */

+    protected void start(Collection<Class<? extends TestClientControlledTest>> testCaseClasses) throws JMSException

+    {

+        log.debug("protected void start(Collection<Class<? extends TestClientControlledTest>> testCaseClasses = "

+            + testCaseClasses + "): called");

+

+        // Create all the test case implementations and index them by the test names.

+        for (Class<? extends TestClientControlledTest> nextClass : testCaseClasses)

+        {

+            try

+            {

+                TestClientControlledTest testCase = nextClass.newInstance();

+                testCases.put(testCase.getName(), testCase);

+            }

+            catch (InstantiationException e)

+            {

+                log.warn("Could not instantiate test case class: " + nextClass.getName(), e);

+                // Ignored.

+            }

+            catch (IllegalAccessException e)

+            {

+                log.warn("Could not instantiate test case class due to illegal access: " + nextClass.getName(), e);

+                // Ignored.

+            }

+        }

+

+        // Open a connection to communicate with the coordinator on.

+        connection = TestUtils.createConnection(testContextProperties);

+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

+

+        // Set this up to listen for control messages.

+        Topic privateControlTopic = session.createTopic("iop.control." + clientName);

+        MessageConsumer consumer = session.createConsumer(privateControlTopic);

+        consumer.setMessageListener(this);

+

+        Topic controlTopic = session.createTopic("iop.control");

+        MessageConsumer consumer2 = session.createConsumer(controlTopic);

+        consumer2.setMessageListener(this);

+

+        // Create a producer to send replies with.

+        producer = session.createProducer(null);

+

+        // If the join flag was set, then broadcast a join message to notify the coordinator that a new test client

+        // is available to join the current test case, if it supports it. This message may be ignored, or it may result

+        // in this test client receiving a test invite.

+        if (join)

+        {

+            Message joinMessage = session.createMessage();

+

+            joinMessage.setStringProperty("CONTROL_TYPE", "JOIN");

+            joinMessage.setStringProperty("CLIENT_NAME", clientName);

+            joinMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);

+            producer.send(controlTopic, joinMessage);

+        }

+

+        // Start listening for incoming control messages.

+        connection.start();

+    }

+

+    /**

+     * Handles all incoming control messages.

+     *

+     * @param message The incoming message.

+     */

+    public void onMessage(Message message)

+    {

+        NDC.push(clientName);

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

+

+        try

+        {

+            String controlType = message.getStringProperty("CONTROL_TYPE");

+            String testName = message.getStringProperty("TEST_NAME");

+

+            log.debug("Received control of type '" + controlType + "' for the test '" + testName + "'");

+

+            // Check if the message is a test invite.

+            if ("INVITE".equals(controlType))

+            {

+                // Flag used to indicate that an enlist should be sent. Only enlist to compulsory invites or invites

+                // for which test cases exist.

+                boolean enlist = false;

+

+                if (testName != null)

+                {

+                    log.debug("Got an invite to test: " + testName);

+

+                    // Check if the requested test case is available.

+                    TestClientControlledTest testCase = testCases.get(testName);

+

+                    if (testCase != null)

+                    {

+                        log.debug("Found implementing class for test '" + testName + "', enlisting for it.");

+

+                        // Check if the test case will accept the invitation.

+                        enlist = testCase.acceptInvite(message);

+

+                        log.debug("The test case "

+                            + (enlist ? " accepted the invite, enlisting for it."

+                                      : " did not accept the invite, not enlisting."));

+

+                        // Make the requested test case the current test case.

+                        currentTestCase = testCase;

+                    }

+                    else

+                    {

+                        log.debug("Received an invite to the test '" + testName + "' but this test is not known.");

+                    }

+                }

+                else

+                {

+                    log.debug("Got a compulsory invite, enlisting for it.");

+

+                    enlist = true;

+                }

+

+                if (enlist)

+                {

+                    // Reply with the client name in an Enlist message.

+                    Message enlistMessage = session.createMessage();

+                    enlistMessage.setStringProperty("CONTROL_TYPE", "ENLIST");

+                    enlistMessage.setStringProperty("CLIENT_NAME", clientName);

+                    enlistMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);

+                    enlistMessage.setJMSCorrelationID(message.getJMSCorrelationID());

+

+                    log.debug("Sending enlist message '" + enlistMessage + "' to " + message.getJMSReplyTo());

+

+                    producer.send(message.getJMSReplyTo(), enlistMessage);

+                }

+                else

+                {

+                    // Reply with the client name in an Decline message.

+                    Message enlistMessage = session.createMessage();

+                    enlistMessage.setStringProperty("CONTROL_TYPE", "DECLINE");

+                    enlistMessage.setStringProperty("CLIENT_NAME", clientName);

+                    enlistMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);

+                    enlistMessage.setJMSCorrelationID(message.getJMSCorrelationID());

+

+                    log.debug("Sending decline message '" + enlistMessage + "' to " + message.getJMSReplyTo());

+

+                    producer.send(message.getJMSReplyTo(), enlistMessage);

+                }

+            }

+            else if ("ASSIGN_ROLE".equals(controlType))

+            {

+                // Assign the role to the current test case.

+                String roleName = message.getStringProperty("ROLE");

+

+                log.debug("Got a role assignment to role: " + roleName);

+

+                TestClientControlledTest.Roles role = Enum.valueOf(TestClientControlledTest.Roles.class, roleName);

+

+                currentTestCase.assignRole(role, message);

+

+                // Reply by accepting the role in an Accept Role message.

+                Message acceptRoleMessage = session.createMessage();

+                acceptRoleMessage.setStringProperty("CLIENT_NAME", clientName);

+                acceptRoleMessage.setStringProperty("CONTROL_TYPE", "ACCEPT_ROLE");

+                acceptRoleMessage.setJMSCorrelationID(message.getJMSCorrelationID());

+

+                log.debug("Sending accept role message '" + acceptRoleMessage + "' to " + message.getJMSReplyTo());

+

+                producer.send(message.getJMSReplyTo(), acceptRoleMessage);

+            }

+            else if ("START".equals(controlType) || "STATUS_REQUEST".equals(controlType))

+            {

+                if ("START".equals(controlType))

+                {

+                    log.debug("Got a start notification.");

+

+                    // Extract the number of test messages to send from the start notification.

+                    int numMessages;

+

+                    try

+                    {

+                        numMessages = message.getIntProperty("MESSAGE_COUNT");

+                    }

+                    catch (NumberFormatException e)

+                    {

+                        // If the number of messages is not specified, use the default of one.

+                        numMessages = 1;

+                    }

+

+                    // Start the current test case.

+                    currentTestCase.start(numMessages);

+                }

+                else

+                {

+                    log.debug("Got a status request.");

+                }

+

+                // Generate the report from the test case and reply with it as a Report message.

+                Message reportMessage = currentTestCase.getReport(session);

+                reportMessage.setStringProperty("CLIENT_NAME", clientName);

+                reportMessage.setStringProperty("CONTROL_TYPE", "REPORT");

+                reportMessage.setJMSCorrelationID(message.getJMSCorrelationID());

+

+                log.debug("Sending report message '" + reportMessage + "' to " + message.getJMSReplyTo());

+

+                producer.send(message.getJMSReplyTo(), reportMessage);

+            }

+            else if ("TERMINATE".equals(controlType))

+            {

+                console.info("Received termination instruction from coordinator.");

+

+                // Is a cleaner shutdown needed?

+                connection.close();

+                System.exit(0);

+            }

+            else if ("CLOCK_SYNCH".equals(controlType))

+            {

+                log.debug("Received clock synch command.");

+                String address = message.getStringProperty("ADDRESS");

+

+                log.debug("address = " + address);

+

+                // Re-create (if necessary) and start the clock synch thread to synch the clock every ten seconds.

+                if (clockSynchThread != null)

+                {

+                    clockSynchThread.terminate();

+                }

+

+                SleepThrottle throttle = new SleepThrottle();

+                throttle.setRate(0.1f);

+

+                clockSynchThread = new ClockSynchThread(new UDPClockSynchronizer(address), throttle);

+                clockSynchThread.start();

+            }

+            else

+            {

+                // Log a warning about this but otherwise ignore it.

+                log.warn("Got an unknown control message, controlType = " + controlType + ", message = " + message);

+            }

+        }

+        catch (JMSException e)

+        {

+            // Log a warning about this, but otherwise ignore it.

+            log.warn("Got JMSException whilst handling message: " + message, e);

+        }

+        // Log any runtimes that fall through this message handler. These are fatal errors for the test client.

+        catch (RuntimeException e)

+        {

+            log.error("The test client message handler got an unhandled exception: ", e);

+            console.info("The message handler got an unhandled exception, terminating the test client.");

+            System.exit(1);

+        }

+        finally

+        {

+            NDC.pop();

+        }

+    }

+}

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
index 3752888a9e..8a82b12832 100644
--- 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
@@ -26,8 +26,8 @@ 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 org.apache.qpid.junit.extensions.ShutdownHookable;
+import org.apache.qpid.junit.extensions.listeners.TKTestListener;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
new file mode 100644
index 0000000000..14ae108da8
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
@@ -0,0 +1,133 @@
+/*

+ *

+ * 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 org.apache.qpid.junit.extensions.util.ParsedProperties;

+

+import javax.jms.MessageConsumer;

+import javax.jms.MessageProducer;

+import javax.jms.Session;

+

+/**

+ * LocalAMQPPublisherImpl is an extension of {@link LocalPublisherImpl} that adds AMQP specific features. Specifically

+ * extra assertions for AMQP features not available through generic JMS.

+ *

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

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

+ * <tr><td>

+ * </table>

+ */

+public class LocalAMQPPublisherImpl extends LocalPublisherImpl implements AMQPPublisher

+{

+    /**

+     * Creates a circuit end point on the specified producer, consumer and controlSession. Monitors are also configured

+     * for messages and exceptions received by the circuit end.

+     *

+     * @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.

+     * @param messageMonitor   The monitor to notify of all messages received by the circuit end.

+     * @param exceptionMonitor The monitor to notify of all exceptions received by the circuit end.

+     */

+    public LocalAMQPPublisherImpl(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 LocalAMQPPublisherImpl(CircuitEndBase end)

+    {

+        super(end);

+    }

+

+    /**

+     * Provides an assertion that the publisher got a no consumers exception on every message.

+     *

+     * @param testProps The test configuration properties.

+     *

+     * @return An assertion that the publisher got a no consumers exception on every message.

+     */

+    public Assertion noConsumersAssertion(ParsedProperties testProps)

+    {

+        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.

+     *

+     * @param testProps The test configuration properties.

+     *

+     * @return An assertion that the publisher got a no rout exception on every message.

+     */

+    public Assertion noRouteAssertion(ParsedProperties testProps)

+    {

+        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;

+                }

+            };

+    }

+}

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
index 3a5ff49fd1..391091266c 100644
--- 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
@@ -22,16 +22,14 @@ 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 org.apache.qpid.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
@@ -47,7 +45,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * <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}
+ * <tr><td> Provide access to connection and controlSession exception monitors. <td> {@link ExceptionMonitor}
  * </table>
  */
 public class LocalCircuitImpl implements Circuit
@@ -55,9 +53,6 @@ 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;
 
@@ -86,7 +81,7 @@ public class LocalCircuitImpl implements Circuit
      * @param connection                 The connection.
      * @param connectionExceptionMonitor The connection exception monitor.
      */
-    protected LocalCircuitImpl(ParsedProperties testProps, LocalPublisherImpl publisher, LocalReceiverImpl receiver,
+    public LocalCircuitImpl(ParsedProperties testProps, LocalPublisherImpl publisher, LocalReceiverImpl receiver,
         Connection connection, ExceptionMonitor connectionExceptionMonitor)
     {
         this.testProps = testProps;
@@ -102,159 +97,6 @@ public class LocalCircuitImpl implements Circuit
     }
 
     /**
-     * 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.
@@ -342,7 +184,7 @@ public class LocalCircuitImpl implements Circuit
         }
         catch (JMSException e)
         {
-            throw new RuntimeException("Got JMSException during close.", e);
+            throw new RuntimeException("Got JMSException during close:" + e.getMessage(), e);
         }
     }
 
@@ -351,16 +193,24 @@ public class LocalCircuitImpl implements Circuit
      */
     protected void send()
     {
-        boolean transactional = testProps.getPropertyAsBoolean(MessagingTestConfigProperties.TRANSACTED_PROPNAME);
+        // Cast the test properties into a typed interface for convenience.
+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProps);
+
+        boolean transactional = props.getPublisherTransacted();
+        boolean rollback = props.getRollbackPublisher();
 
-        // Send an immediate message through the publisher and ensure that it results in a JMSException.
+        // Send a message through the publisher and log any exceptions raised.
         try
         {
             CircuitEnd end = getLocalPublisherCircuitEnd();
 
             end.send(createTestMessage(end));
 
-            if (transactional)
+            if (rollback)
+            {
+                end.getSession().rollback();
+            }
+            else if (transactional)
             {
                 end.getSession().commit();
             }
@@ -406,12 +256,12 @@ public class LocalCircuitImpl implements Circuit
         // 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();
 
+        // Apply all of the requested assertions, keeping record of any that fail.
+        List<Assertion> failures = applyAssertions(assertions);
+
         // Return any failed assertions to the caller.
         return failures;
     }
@@ -427,7 +277,10 @@ public class LocalCircuitImpl implements Circuit
      */
     private Message createTestMessage(CircuitEnd client) throws JMSException
     {
-        return client.getSession().createTextMessage("Hello");
+        // Cast the test properties into a typed interface for convenience.
+        MessagingTestConfigProperties props = new MessagingTestConfigProperties(testProps);
+
+        return TestUtils.createTestMessageOfSize(client.getSession(), props.getMessageSize());
     }
 
     /**
@@ -450,3 +303,4 @@ public class LocalCircuitImpl implements Circuit
         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
index 5c5807dcd9..3ec3f62538 100644
--- 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
@@ -20,10 +20,10 @@
  */
 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 org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
@@ -31,7 +31,7 @@ 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
+ * 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>
@@ -46,14 +46,17 @@ import javax.jms.Session;
 public class LocalPublisherImpl extends CircuitEndBase implements Publisher
 {
     /** Holds a reference to the containing circuit. */
-    private LocalCircuitImpl circuit;
+    protected LocalCircuitImpl circuit;
 
     /**
-     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     * Creates a circuit end point on the specified producer, consumer and controlSession. Monitors are also configured
+     * for messages and exceptions received by the circuit end.
      *
      * @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.
+     * @param messageMonitor   The monitor to notify of all messages received by the circuit end.
+     * @param exceptionMonitor The monitor to notify of all exceptions received by the circuit end.
      */
     public LocalPublisherImpl(MessageProducer producer, MessageConsumer consumer, Session session,
         MessageMonitor messageMonitor, ExceptionMonitor exceptionMonitor)
@@ -74,9 +77,11 @@ public class LocalPublisherImpl extends CircuitEndBase implements Publisher
     /**
      * Provides an assertion that the publisher encountered no exceptions.
      *
+     * @param testProps
+     *
      * @return An assertion that the publisher encountered no exceptions.
      */
-    public Assertion noExceptionsAssertion()
+    public Assertion noExceptionsAssertion(ParsedProperties testProps)
     {
         return new AssertionBase()
             {
@@ -109,41 +114,26 @@ public class LocalPublisherImpl extends CircuitEndBase implements Publisher
     }
 
     /**
-     * Provides an assertion that the publisher got a no consumers exception on every message.
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
      *
-     * @return An assertion that the publisher got a no consumers exception on every message.
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
      */
-    public Assertion noConsumersAssertion()
+    public Assertion channelClosedAssertion(ParsedProperties testProps)
     {
-        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;
-                }
-            };
+        return new NotApplicableAssertion(testProps);
     }
 
     /**
-     * Provides an assertion that the publisher got a no rout exception on every message.
+     * Provides an assertion that the publisher got a given exception during the test.
+     *
+     * @param testProps The test configuration properties.
+     * @param exceptionClass The exception class to check for.
      *
-     * @return An assertion that the publisher got a no rout exception on every message.
+     * @return An assertion that the publisher got a given exception during the test.
      */
-    public Assertion noRouteAssertion()
+    public Assertion exceptionAssertion(ParsedProperties testProps, final Class<? extends Exception> exceptionClass)
     {
         return new AssertionBase()
             {
@@ -152,11 +142,11 @@ public class LocalPublisherImpl extends CircuitEndBase implements Publisher
                     boolean passed = true;
                     ExceptionMonitor connectionExceptionMonitor = circuit.getConnectionExceptionMonitor();
 
-                    if (!connectionExceptionMonitor.assertOneJMSExceptionWithLinkedCause(AMQNoRouteException.class))
+                    if (!connectionExceptionMonitor.assertExceptionOfType(exceptionClass))
                     {
                         passed = false;
 
-                        addError("Was expecting linked exception type " + AMQNoRouteException.class.getName()
+                        addError("Was expecting linked exception type " + exceptionClass.getName()
                             + " on the connection.\n");
                         addError((connectionExceptionMonitor.size() > 0)
                             ? ("Actually got the following exceptions on the connection, " + connectionExceptionMonitor)
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
index 0c5dae096e..74f414c974 100644
--- 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
@@ -22,6 +22,8 @@ package org.apache.qpid.test.framework.localcircuit;
 
 import org.apache.qpid.test.framework.*;
 
+import org.apache.qpid.junit.extensions.util.ParsedProperties;
+
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
@@ -46,11 +48,14 @@ public class LocalReceiverImpl extends CircuitEndBase implements Receiver
     private LocalCircuitImpl circuit;
 
     /**
-     * Creates a circuit end point on the specified producer, consumer and controlSession.
+     * Creates a circuit end point on the specified producer, consumer and controlSession. Monitors are also configured
+     * for messages and exceptions received by the circuit end.
      *
      * @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.
+     * @param messageMonitor   The monitor to notify of all messages received by the circuit end.
+     * @param exceptionMonitor The monitor to notify of all exceptions received by the circuit end.
      */
     public LocalReceiverImpl(MessageProducer producer, MessageConsumer consumer, Session session,
         MessageMonitor messageMonitor, ExceptionMonitor exceptionMonitor)
@@ -71,21 +76,60 @@ public class LocalReceiverImpl extends CircuitEndBase implements Receiver
     /**
      * Provides an assertion that the receivers encountered no exceptions.
      *
+     * @param testProps The test configuration properties.
+     *
      * @return An assertion that the receivers encountered no exceptions.
      */
-    public Assertion noExceptionsAssertion()
+    public Assertion noExceptionsAssertion(ParsedProperties testProps)
+    {
+        return new NotApplicableAssertion(testProps);
+    }
+
+    /**
+     * Provides an assertion that the AMQP channel was forcibly closed by an error condition.
+     *
+     * @param testProps The test configuration properties.
+     *
+     * @return An assertion that the AMQP channel was forcibly closed by an error condition.
+     */
+    public Assertion channelClosedAssertion(ParsedProperties testProps)
     {
-        return null;
+        return new NotApplicableAssertion(testProps);
     }
 
     /**
      * Provides an assertion that the receivers got all messages that were sent to it.
      *
+     * @param testProps The test configuration properties.
+     *
      * @return An assertion that the receivers got all messages that were sent to it.
      */
-    public Assertion allMessagesAssertion()
+    public Assertion allMessagesReceivedAssertion(ParsedProperties testProps)
+    {
+        return new NotApplicableAssertion(testProps);
+    }
+
+    /**
+     * Provides an assertion that the receivers got none of the messages that were sent to it.
+     *
+     * @param testProps The test configuration properties.
+     *
+     * @return An assertion that the receivers got none of the messages that were sent to it.
+     */
+    public Assertion noMessagesReceivedAssertion(ParsedProperties testProps)
+    {
+        return new NotApplicableAssertion(testProps);
+    }
+
+    /**
+     * Provides an assertion that the receiver got a given exception during the test.
+     *
+     * @param testProps The test configuration properties.
+     * @param exceptionClass The exception class to check for. @return An assertion that the receiver got a given exception during the test.
+     */
+    public Assertion exceptionAssertion(ParsedProperties testProps, Class<? extends Exception> exceptionClass)
     {
-        return null;
+        return new NotApplicableAssertion(testProps);
     }
 
     /**
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
new file mode 100644
index 0000000000..4545e3c164
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
@@ -0,0 +1,96 @@
+/*

+ *

+ * 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.qpid;

+

+import junit.framework.Test;

+import junit.framework.TestResult;

+

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

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

+

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

+

+/**

+ * AMQPFeatureDecorator applies decorations to {@link FrameworkBaseCase} tests, so that they may use Qpid/AMQP specific

+ * features, not available through JMS. For example, the immediate and mandatory flags. This decorator replaces the

+ * standard test circuit factory on the base class with one that allows these features to be used.

+ *

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

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

+ * <tr><td> Substitute the circuit factory with an AMQP/Qpid specific one.

+ * </table>

+ *

+ * @todo This wrapper substitutes in a LocalAMQPCircuitFactory, which is fine for local tests. For distributed tests

+ *       the Fanout or Interop factories are substituted in by their decorators instead. These actually use

+ *       distributed circuit static create methods to build the circuits, which should actually be changed to a factory,

+ *       so that static methods do not need to be used. The distributed circuit creater delegates the circuit

+ *       construction to remote test nodes. This decorator should not be used with distributed tests, or should be made

+ *       aware of them, in which case it might ensure that an AMQP feature (implied already by other properties) flag

+ *       is passed out to the remote test nodes, and provide a mechansim for them to decorate their circuit creation

+ *       with AMQP features too. Add factory substituion/decoration mechansim for test clients, here or in a seperate

+ *       class.

+ */

+public class AMQPFeatureDecorator extends WrappedSuiteTestDecorator

+{

+    /** The test suite to run. */

+    private Test test;

+

+    /**

+     * Creates a wrapped test test decorator from another one.

+     *

+     * @param test The test test.

+     */

+    public AMQPFeatureDecorator(WrappedSuiteTestDecorator test)

+    {

+        super(test);

+        this.test = test;

+    }

+

+    /**

+     * Runs the tests with a LocalAMQPCircuitFactory. Only tests that extend FrameworkBaseCase are decorated.

+     *

+     * @param testResult The the results object to monitor the test results with.

+     */

+    public void run(TestResult testResult)

+    {

+        for (Test test : getAllUnderlyingTests())

+        {

+            if (test instanceof FrameworkBaseCase)

+            {

+                FrameworkBaseCase frameworkTest = (FrameworkBaseCase) test;

+                frameworkTest.setCircuitFactory(new LocalAMQPCircuitFactory());

+            }

+        }

+

+        // Run the test.

+        test.run(testResult);

+    }

+

+    /**

+     * Prints the name of the test for debugging purposes.

+     *

+     * @return The name of the test.

+     */

+    public String toString()

+    {

+        return "AMQPFeatureDecorator: [test = \"" + test + "\"]";

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
new file mode 100644
index 0000000000..3a048ac042
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
@@ -0,0 +1,95 @@
+/*

+ *

+ * 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.qpid;

+

+import junit.framework.Test;

+import junit.framework.TestResult;

+

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

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

+

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

+

+/**

+ * CauseFailureDecorator applies decorations to {@link BrokerLifecycleAware} tests, so that they may use different failure

+ * mechanisms. It is capable of detecting when a test case uses in-vm brokers, and setting up an automatic failure

+ * for those tests, so that the current live broker can be shut-down by test cases. For external brokers, automatic

+ * failure could be implemented, for example by having a kill script. At the moment this sets up the failure to prompt

+ * a user interactively to cause a failure, using {@link CauseFailureUserPrompt}.

+ *

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

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

+ * <tr><td> Setup automatic failures for in-vm brokers. <td> {@link CauseFailureInVM}

+ * <tr><td> Setup user generated failures for external brokers. <td> {@link CauseFailureUserPrompt}.

+ * <tr><td>

+ * </table>

+ *

+ * @todo Slight problem in that CauseFailureInVM is Qpid specific, whereas CauseFailureUserPrompt is not. Would like the

+ *       failure decorator to be non-qpid specific so that it can test failure of any JMS implementation too. Either pass

+ *       in class name of failure mechanism, set it up in the in-vm decorator instead of here but with prompt user as the

+ *       default for when the in-vm decorator is not used?

+ */

+public class CauseFailureDecorator extends WrappedSuiteTestDecorator

+{

+    /** The test suite to run. */

+    private Test test;

+

+    /**

+     * Creates a wrapped test test decorator from another one.

+     *

+     * @param test The test test.

+     */

+    public CauseFailureDecorator(WrappedSuiteTestDecorator test)

+    {

+        super(test);

+        this.test = test;

+    }

+

+    /**

+     * Runs the tests with a LocalAMQPCircuitFactory. Only tests that extend FrameworkBaseCase are decorated.

+     *

+     * @param testResult The the results object to monitor the test results with.

+     */

+    public void run(TestResult testResult)

+    {

+        for (Test test : getAllUnderlyingTests())

+        {

+            if (test instanceof BrokerLifecycleAware)

+            {

+                BrokerLifecycleAware failureTest = (BrokerLifecycleAware) test;

+                failureTest.setFailureMechanism(new CauseFailureUserPrompt());

+            }

+        }

+

+        // Run the test.

+        test.run(testResult);

+    }

+

+    /**

+     * Prints the name of the test for debugging purposes.

+     *

+     * @return The name of the test.

+     */

+    public String toString()

+    {

+        return "CauseFailureDecorator: [test = \"" + test + "\"]";

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
new file mode 100644
index 0000000000..b63ac43601
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
@@ -0,0 +1,70 @@
+/*

+ *

+ * 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.qpid;

+

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

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

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

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

+

+/**

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

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

+ * <tr><td> Cause messaging broker failure on the active in-vm broker.

+ *     <td> {@link TransportConnection}, {@link ApplicationRegistry}

+ * </table>

+ */

+public class CauseFailureInVM implements CauseFailure

+{

+    /** Holds the in-vm broker instrumented test case to create failures for. */

+    private BrokerLifecycleAware inVMTest;

+

+    /**

+     * Creates an automated failure mechanism for testing against in-vm brokers. The test to create the mechanism

+     * for is specified, and as this failure is for in-vm brokers, the test must be {@link org.apache.qpid.test.framework.BrokerLifecycleAware}. The test

+     * must also report that it is currently being run against an in-vm broker, and it is a runtime error if it is not,

+     * as the creator of this failure mechanism should already have checked that it is.

+     *

+     * @param inVMTest The test case to create an automated failure mechanism for.

+     */

+    public CauseFailureInVM(BrokerLifecycleAware inVMTest)

+    {

+        // Check that the test is really using in-vm brokers.

+        if (!inVMTest.usingInVmBroker())

+        {

+            throw new RuntimeException(

+                "Cannot create in-vm broker failure mechanism for a test that is not using in-vm brokers.");

+        }

+

+        this.inVMTest = inVMTest;

+    }

+

+    /**

+     * Causes the active message broker to fail.

+     */

+    public void causeFailure()

+    {

+        int liveBroker = inVMTest.getLiveBroker();

+

+        TransportConnection.killVMBroker(liveBroker);

+        ApplicationRegistry.remove(liveBroker);

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
new file mode 100644
index 0000000000..bcf052ea06
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
@@ -0,0 +1,135 @@
+/*

+ *

+ * 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.qpid;

+

+import junit.framework.Test;

+import junit.framework.TestResult;

+

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

+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;

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

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

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

+

+import org.apache.qpid.junit.extensions.SetupTaskAware;

+import org.apache.qpid.junit.extensions.WrappedSuiteTestDecorator;

+

+/**

+ * InVMBrokerDecorator is a test decorator, that is activated when running tests against an in-vm broker only. Its

+ * purpose is to automatically create, and close and delete an in-vm broker, during the set-up and tear-down of

+ * each test case. This decorator may only be used in conjunction with tests that extend {@link FrameworkBaseCase}.

+ *

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

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

+ * <tr><td> Create/Destroy an in-vm broker on every test run.

+ * </table>

+ *

+ * @todo May need to add a more fine grained injection point for the in-vm broker management, as this acts at the

+ *       suite level, rather than the individual test level.

+ *

+ * @todo Management of in-vm brokers for failure testing. Failure test setups may need to set their connection url to

+ *       use multiple broker (vm://:1;vm://:2), with fail-over between them. There is round-robin fail-over, but also

+ *       retry? A test case using an in-vm broker needs to record which one it is using, so that it can be

+ *       killed/restarted.

+ */

+public class InVMBrokerDecorator extends WrappedSuiteTestDecorator

+{

+    /** The test suite to run. */

+    private Test test;

+

+    /**

+     * Creates a wrapped test suite decorator from another one.

+     *

+     * @param test The test suite.

+     */

+    public InVMBrokerDecorator(WrappedSuiteTestDecorator test)

+    {

+        super(test);

+        this.test = test;

+    }

+

+    /**

+     * Runs the tests with in-vm broker creation and clean-up added to the tests task stack.

+     *

+     * @param testResult The the results object to monitor the test results with.

+     */

+    public void run(TestResult testResult)

+    {

+        for (Test test : getAllUnderlyingTests())

+        {

+            // Check that the test to have an in-vm broker setup/teardown task added to it, is actually a framework

+            // test that can handle setup tasks.

+            if ((test instanceof SetupTaskAware))

+            {

+                SetupTaskAware frameworkTest = (SetupTaskAware) test;

+

+                frameworkTest.chainSetupTask(new Runnable()

+                    {

+                        public void run()

+                        {

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

+                            try

+                            {

+                                TransportConnection.createVMBroker(1);

+                            }

+                            catch (AMQVMBrokerCreationException e)

+                            {

+                                throw new RuntimeException("In-VM broker creation failed: " + e.getMessage(), e);

+                            }

+                        }

+                    });

+

+                frameworkTest.chainTearDownTask(new Runnable()

+                    {

+                        public void run()

+                        {

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

+                            TransportConnection.killVMBroker(1);

+                            ApplicationRegistry.remove(1);

+                        }

+                    });

+

+                // Check if the test is aware whether or not it can control the broker life cycle, and if so provide

+                // additional instrumentation for it to control the in-vm broker through.

+                if (test instanceof BrokerLifecycleAware)

+                {

+                    BrokerLifecycleAware inVMTest = (BrokerLifecycleAware) test;

+                    inVMTest.setInVmBrokers();

+                    inVMTest.setLiveBroker(1);

+                    inVMTest.setFailureMechanism(new CauseFailureInVM(inVMTest));

+                }

+            }

+        }

+

+        // Run the test.

+        test.run(testResult);

+    }

+

+    /**

+     * Prints the name of the test for debugging purposes.

+     *

+     * @return The name of the test.

+     */

+    public String toString()

+    {

+        return "InVMBrokerDecorator: [test = " + test + "]";

+    }

+}

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
index 4514fb836c..c7bde1ae03 100644
--- 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
@@ -31,13 +31,20 @@ import java.util.List;
 import java.util.Properties;
 
 /**
+ * BaseCircuitFactory provides some functionality common to all {@link CircuitFactory}s, such as the details of
+ * all {@link org.apache.qpid.test.framework.distributedtesting.TestClient}s that make up the end-points of
+ * the circuits that the factory creates, and an active {@link ConversationFactory} that can be used to generate
+ * control conversations with those circuit end-points.
+ *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <tr><td> Hold the details of the sending and receiving end-points to create circuits from.
+ * <tr><td> Provide a conversation factory to create control conversations with the end-points.
  * </table>
  */
 public abstract class BaseCircuitFactory implements CircuitFactory
 {
+
     /** Used for debugging. */
     private final Logger log = Logger.getLogger(BaseCircuitFactory.class);
 
@@ -126,3 +133,4 @@ public abstract class BaseCircuitFactory implements CircuitFactory
         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
index bf7fedcffc..fff617c583 100644
--- 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
@@ -25,17 +25,13 @@ 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 org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 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
+ * A CircuitFactory 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>
@@ -43,12 +39,6 @@ import java.util.Properties;
  * <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
 {
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
index 2ff6725365..d1c39ff3ff 100644
--- 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
@@ -29,7 +29,7 @@ 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 org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -46,7 +46,7 @@ import java.util.Properties;
  *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <tr><td> Create distributed circuits from one to many test nodes, for fanout style testing.
  * </table>
  *
  * @todo Adapt this to be an n*m topology circuit factory. Need to add circuit topology definitions to the test
@@ -57,7 +57,7 @@ import java.util.Properties;
  *
  * @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
+ *       as unnesesary, or move the partitioning functionality 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
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
index 75df5c65ea..feb87e7b9c 100644
--- 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
@@ -29,7 +29,7 @@ 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 org.apache.qpid.junit.extensions.util.ParsedProperties;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -41,10 +41,20 @@ import java.util.List;
 import java.util.Properties;
 
 /**
+ * InteropCircuitFactory 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 one the RECEIVER role.
+ *
  * <p/><table id="crc"><caption>CRC Card</caption>
  * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
+ * <tr><td> Create distributed circuits from pairs of test nodes, for interop style testing.
  * </table>
+ *
+ * @todo The partitioning of a set of nodes into sender and receiver roles is actually done by the interop test
+ *       decorator. See the todo comment in FanOutCircuitFactory about merging the factories with the decorators, or
+ *       more carefully dividing up responsibilities between them.
+ *
+ * @todo The squenceTest code is deprecated, but currently still used by the interop tests. It will be removed once it
+ *       have been fully replaced by the default test procedure.
  */
 public class InteropCircuitFactory extends BaseCircuitFactory
 {
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
new file mode 100644
index 0000000000..e7d874ffa9
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
@@ -0,0 +1,119 @@
+/*

+ *

+ * 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.testcases;

+

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

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

+import org.apache.qpid.test.framework.localcircuit.LocalCircuitImpl;

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

+

+import javax.jms.JMSException;

+import javax.jms.MessageProducer;

+import javax.jms.Session;

+

+/**

+ * FailoverTest provides testing of fail-over over a local-circuit implementation. The circuit being tested may be

+ * against an in-vm broker or against an external broker, with the failure mechanism abstracted out of the test case.

+ * Automatic failures can be simulated against an in-vm broker. Currently the test must interact with the user to

+ * simulate failures on an external broker.

+ *

+ * Things to test:

+ * In tx, failure duing tx causes tx to error on subsequent sends/receives or commits/rollbacks.

+ * Outside of tx, reconnection allows msg flow to continue but there may be loss.

+ *

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

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

+ * <tr><td>

+ * </table>

+ *

+ * @todo This test is designed to be run over a local circuit only. For in-vm using automatic failures, for external

+ *       brokers by prompting the user (or maybe using a script). Enforce the local-circuit only nature of the tests as

+ *       well as thinking about how other local-circuit tests might be implemented. For example, could add a method

+ *       to the framework base case for local only tests to call, that allows them access to the local-circuit

+ *       implementation and so on.

+ *

+ * @todo More. Need to really expand the set of fail-over tests.

+ */

+public class FailoverTest extends FrameworkBaseCase

+{

+    /* Used for debugging purposes. */

+    // private static final Logger log = Logger.getLogger(FailoverTest.class);

+

+    /**

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

+     *

+     * @param name The test case name.

+     */

+    public FailoverTest(String name)

+    {

+        super(name);

+    }

+

+    /**

+     * Checks that all messages sent within a transaction are receieved despite a fail-over occuring outside of

+     * the transaction.

+     *

+     * @throws JMSException Allowed to fall through and fail test.

+     */

+    public void testTxP2PFailover() throws JMSException

+    {

+        // Set up the test properties to match the test cases requirements.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(ACK_MODE_PROPNAME, Session.AUTO_ACKNOWLEDGE);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // MessagingTestConfigProperties props = this.getTestParameters();

+

+        // Create the test circuit from the test configuration parameters.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // Create an assertion that all messages are received.

+        Assertion allMessagesReceived = testCircuit.getReceiver().allMessagesReceivedAssertion(testProps);

+

+        // This test case assumes it is using a local circuit.

+        LocalCircuitImpl localCircuit = (LocalCircuitImpl) testCircuit;

+

+        Session producerSession = localCircuit.getLocalPublisherCircuitEnd().getSession();

+        MessageProducer producer = localCircuit.getLocalPublisherCircuitEnd().getProducer();

+        // MessageConsumer consumer = localCircuit.getLocalReceiverCircuitEnd().getConsumer();

+

+        // Send some test messages.

+        for (int i = 0; i < 100; i++)

+        {

+            producer.send(TestUtils.createTestMessageOfSize(producerSession, 10));

+            producerSession.commit();

+

+            // Cause a failover.

+            if (i == 50)

+            {

+                failureMechanism.causeFailure();

+            }

+

+            // Wait for the reconnection to complete.

+        }

+

+        // Check that trying to send within the original transaction fails.

+

+        // Check that all messages sent were received.

+        assertTrue("All messages sent were not received back again.", allMessagesReceived.apply());

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
new file mode 100644
index 0000000000..845c3ed9c8
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
@@ -0,0 +1,303 @@
+/*

+ *

+ * 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.testcases;

+

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

+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 org.apache.qpid.junit.extensions.util.TestContextProperties;

+

+/**

+ * 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

+ * to receive the message, through a valid route, when it is sent, or when its transaction is committed in the case

+ * of transactional messaging. If this is not the case, the broker should return the message with a NO_CONSUMERS code.

+ *

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

+ * <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 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 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><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 All of these test cases will be generated by a test generator that thoroughly tests all combinations of test

+ *       circuits.

+ */

+public class ImmediateMessageTest extends FrameworkBaseCase

+{

+    /**

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

+     *

+     * @param name The test case name.

+     */

+    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()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

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

+    }

+

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

+    public void test_QPID_517_ImmediateOkTxP2P()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Send one message with no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

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

+    }

+

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

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Disconnect the consumer.

+        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.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noConsumersAssertion(testProps))));

+    }

+

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

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Disconnect the consumer.

+        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.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noConsumersAssertion(testProps))));

+    }

+

+    /** 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_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

+    /** 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_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

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

+    public void test_QPID_517_ImmediateOkNoTxPubSub()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Send one message with no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_517_ImmediateOkTxPubSub()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Send one message with no errors.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Use durable subscriptions, so that the route remains open with no subscribers.

+        testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

+

+        // Disconnect the consumer.

+        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.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noConsumersAssertion(testProps))));

+    }

+

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

+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Use durable subscriptions, so that the route remains open with no subscribers.

+        testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

+

+        // Disconnect the consumer.

+        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.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noConsumersAssertion(testProps))));

+    }

+

+    /** 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_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

+    /** 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_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

+    protected void setUp() throws Exception

+    {

+        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);

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, true);

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
new file mode 100644
index 0000000000..066b4e24ba
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
@@ -0,0 +1,321 @@
+/*

+ *

+ * 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.testcases;

+

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

+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 org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

+

+/**

+ * MandatoryMessageTest tests for the desired behaviour of mandatory messages. Mandatory messages are a non-JMS

+ * feature. A message may be marked with a mandatory delivery flag, which means that a valid route for the message

+ * must exist, when it is sent, or when its transaction is committed in the case of transactional messaging. If this

+ * is not the case, the broker should return the message with a NO_CONSUMERS code.

+ *

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

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

+ * <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 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.

+ * </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 FrameworkBaseCase

+{

+    /** 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()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryOkTxP2P()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

+    /**

+     * 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()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Disconnect the consumer.

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // Send one message with no errors.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

+    /**

+     * 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()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Disconnect the consumer.

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // Send one message with no errors.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryFailsNoRouteNoTxP2P()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryFailsNoRouteTxP2P()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryOkNoTxPubSub()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryOkTxPubSub()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

+    /**

+     * 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()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Use durable subscriptions, so that the route remains open with no subscribers.

+        testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

+

+        // Disconnect the consumer.

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // Send one message with no errors.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

+    /**

+     * 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()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(PUBSUB_PROPNAME, true);

+

+        // Use durable subscriptions, so that the route remains open with no subscribers.

+        testProps.setProperty(DURABLE_SUBSCRIPTION_PROPNAME, true);

+

+        // Disconnect the consumer.

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);

+

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // Send one message with no errors.

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryFailsNoRouteNoTxPubSub()

+    {

+        // Ensure transactional sessions are off.

+        testProps.setProperty(TRANSACTED_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

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

+    public void test_QPID_508_MandatoryFailsNoRouteTxPubSub()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_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 receivers to

+        // collect its messages).

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, false);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));

+    }

+

+    protected void setUp() throws Exception

+    {

+        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);

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, true);

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
new file mode 100644
index 0000000000..f39d22bc67
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
@@ -0,0 +1,132 @@
+/*

+ *

+ * 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.testcases;

+

+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 org.apache.qpid.junit.extensions.util.ParsedProperties;

+import org.apache.qpid.junit.extensions.util.TestContextProperties;

+

+/**

+ * RollbackTest tests the rollback ability of transactional messaging.

+ *

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

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

+ * <tr><td> Check messages sent but rolled back are never received.

+ * <tr><td> Check messages received but rolled back are redelivered on subsequent receives.

+ * <tr><td> Attempting to rollback outside of a transaction results in an IllegalStateException.

+ * </table>

+ */

+public class RollbackTest extends FrameworkBaseCase

+{

+    /** 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 RollbackTest(String name)

+    {

+        super(name);

+    }

+

+    /** Check messages sent but rolled back are never received. */

+    public void testRolledbackMessageNotDelivered()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);

+        testProps.setProperty(ROLLBACK_PUBLISHER_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps),

+                    testCircuit.getReceiver().noMessagesReceivedAssertion(testProps))));

+    }

+

+    /** Check messages received but rolled back are redelivered on subsequent receives. */

+    public void testRolledbackMessagesSubsequentlyReceived()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_RECEIVER_PROPNAME, true);

+        testProps.setProperty(ROLLBACK_RECEIVER_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1,

+                assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps),

+                    testCircuit.getReceiver().allMessagesReceivedAssertion(testProps))));

+    }

+

+    /** Attempting to rollback outside of a transaction results in an IllegalStateException. */

+    public void testRollbackUnavailableOutsideTransactionPublisher()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);

+        testProps.setProperty(ROLLBACK_PUBLISHER_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

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

+    }

+

+    /** Attempting to rollback outside of a transaction results in an IllegalStateException. */

+    public void testRollbackUnavailableOutsideTransactionReceiver()

+    {

+        // Ensure transactional sessions are on.

+        testProps.setProperty(TRANSACTED_RECEIVER_PROPNAME, false);

+        testProps.setProperty(ROLLBACK_RECEIVER_PROPNAME, true);

+

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

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getReceiver().channelClosedAssertion(testProps))));

+    }

+

+    /**

+     * Sets up all tests to have an active outward route and consumer by default.

+     *

+     * @throws Exception Any exceptions are allowed to fall through and fail the test.

+     */

+    protected void setUp() throws Exception

+    {

+        super.setUp();

+

+        testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);

+

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

+        testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, true);

+        testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, true);

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
new file mode 100644
index 0000000000..f752ccba00
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
@@ -0,0 +1,151 @@
+/*

+ *

+ * 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.testcases;

+

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

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

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

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

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

+import org.apache.qpid.test.framework.localcircuit.LocalCircuitImpl;

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

+

+import javax.jms.*;

+

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Random;

+

+/**

+ * TTLTest checks that time-to-live is applied to messages. The test sends messages with a variety of TTL stamps on them

+ * then after a pause attempts to receive those messages. Only messages with a large enough TTL to have survived the pause

+ * should be receiveable. This test case also applies an additional assertion against the broker, that the message store

+ * is empty at the end of the test.

+ *

+ * <p/>This test is designed to run over local circuits only, as it must control a timed pause between sending and receiving

+ * messages to that TTL can be applied to purge some of the messages.

+ *

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

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

+ * <tr><td>

+ * </table>

+ *

+ * @todo Use an interface or other method to mark this test as local only.

+ *

+ * @todo Implement the message store assertion for in-vm broker. Could also be done for external broker, for example

+ *       by using diagnostic exchange.

+ *

+ * @todo Implement and add a queue depth assertion too. This might already be in another test to copy from.

+ *

+ * @todo Create variations on test theme, for different ack mode and tx and message sizes etc.

+ *

+ * @todo Add an allowable margin of error to the test, as ttl may not be precise.

+ */

+public class TTLTest extends FrameworkBaseCase

+{

+    /**

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

+     *

+     * @param name The test case name.

+     */

+    public TTLTest(String name)

+    {

+        super(name);

+    }

+

+    /**

+     * Checks that all messages sent with a TTL shorter than a pause between sending them and attempting to receive them

+     * will fail to arrive. Once all messages have been purged by TTL or received, check that they no longer exist on

+     * the broker.

+     *

+     * @throws javax.jms.JMSException Allowed to fall through and fail test.

+     */

+    public void testTTLP2P() throws JMSException

+    {

+        String errorMessages = "";

+        Random r = new Random();

+

+        // Used to accumulate correctly received messages in.

+        List<Message> receivedMessages = new LinkedList<Message>();

+

+        // Set up the test properties to match the test case requirements.

+        testProps.setProperty(ACK_MODE_PROPNAME, Session.AUTO_ACKNOWLEDGE);

+        testProps.setProperty(PUBSUB_PROPNAME, false);

+

+        // Create the test circuit from the test configuration parameters.

+        CircuitFactory circuitFactory = getCircuitFactory();

+        Circuit testCircuit = circuitFactory.createCircuit(testProps);

+

+        // This test case assumes it is using a local circuit.

+        LocalCircuitImpl localCircuit = (LocalCircuitImpl) testCircuit;

+

+        Session producerSession = localCircuit.getLocalPublisherCircuitEnd().getSession();

+        MessageProducer producer = localCircuit.getLocalPublisherCircuitEnd().getProducer();

+        MessageConsumer consumer = localCircuit.getLocalReceiverCircuitEnd().getConsumer();

+

+        // Send some tests messages, with random TTLs, some shorter and some longer than the pause time.

+        for (int i = 0; i < 100; i++)

+        {

+            Message testMessage = TestUtils.createTestMessageOfSize(producerSession, 10);

+

+            // Set the TTL on the message and record its value in the message headers.

+            long ttl = 500 + r.nextInt(1500);

+            producer.setTimeToLive(ttl);

+            testMessage.setLongProperty("testTTL", ttl);

+

+            producer.send(testMessage);

+            // producerSession.commit();

+        }

+

+        // Inject a pause to allow some messages to be purged by TTL.

+        TestUtils.pause(1000);

+

+        // Attempt to receive back all of the messages, confirming by the message time stamps and TTLs that only

+        // those received should have avoided being purged by the TTL.

+        boolean timedOut = false;

+

+        while (!timedOut)

+        {

+            Message testMessage = consumer.receive(1000);

+

+            long ttl = testMessage.getLongProperty("testTTL");

+            long timeStamp = testMessage.getJMSTimestamp();

+            long now = System.currentTimeMillis();

+

+            if ((timeStamp + ttl) < now)

+            {

+                errorMessages +=

+                    "Received message [sent: " + timeStamp + ", ttl: " + ttl + ", received: " + now

+                    + "] which should have been purged by its TTL.\n";

+            }

+            /*else

+            {

+                receivedMessages.add(testMessage);

+            }*/

+        }

+

+        // Check that the queue and message store on the broker are empty.

+        // assertTrue("Message store is not empty.", messageStoreEmpty.apply());

+        // assertTrue("Queue is not empty.", queueEmpty.apply());

+

+        assertTrue(errorMessages, "".equals(errorMessages));

+    }

+}

diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
new file mode 100644
index 0000000000..8fddf651b4
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
@@ -0,0 +1,174 @@
+package org.apache.qpid.test.unit.ack;
+
+/*
+ * 
+ * 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.
+ *
+ */
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.log4j.Logger;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.test.VMTestCase;
+
+public class AcknowledgeTest extends VMTestCase
+{
+    private static final int NUM_MESSAGES = 50;
+    private Connection _con;
+    private Queue _queue;
+    private MessageProducer _producer;
+    private Session _producerSession;
+	private Session _consumerSession;
+	private MessageConsumer _consumerA;
+	private MessageConsumer _consumerB;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        _queue = (Queue) _context.lookup("queue");
+
+        //CreateQueue
+        ((ConnectionFactory) _context.lookup("connection")).createConnection().createSession(false, Session.AUTO_ACKNOWLEDGE).createConsumer(_queue).close();
+
+        //Create Producer put some messages on the queue
+        _con = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        _con.start();
+    }
+
+	private void init(boolean transacted, int mode) throws JMSException {
+		_producerSession = _con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        _consumerSession = _con.createSession(transacted, mode);
+        _producer = _producerSession.createProducer(_queue);
+        _consumerA = _consumerSession.createConsumer(_queue);
+	}
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+    	super.tearDown();
+    	try
+    	{
+    		TransportConnection.killAllVMBrokers();
+    		ApplicationRegistry.removeAll();
+    	}
+    	catch (Exception e)
+    	{
+    		fail("Unable to clean up");
+    	}
+
+    }
+
+    private void consumeMessages(int toConsume, MessageConsumer consumer) throws JMSException
+    {
+        Message msg;
+        for (int i = 0; i < toConsume; i++)
+        {
+            msg = consumer.receive(1000);
+            assertNotNull("Message " + i + " was null!", msg);
+            assertEquals("message " + i, ((TextMessage) msg).getText());
+        }
+    }
+
+    private void sendMessages(int totalMessages) throws JMSException
+    {
+        for (int i = 0; i < totalMessages; i++)
+        {
+            _producer.send(_producerSession.createTextMessage("message " + i));
+        }
+    }
+
+    private void testMessageAck(boolean transacted, int mode) throws Exception
+    {
+    	init(transacted, mode);
+        sendMessages(NUM_MESSAGES/2);
+        Thread.sleep(1500);
+        _consumerB = _consumerSession.createConsumer(_queue);
+        sendMessages(NUM_MESSAGES/2);
+        int count = 0;
+        Message msg = _consumerB.receive(1500);
+        while (msg != null) 
+        {
+        	if (mode == Session.CLIENT_ACKNOWLEDGE)
+            {
+        		msg.acknowledge();
+            }
+        	count++;
+        	msg = _consumerB.receive(1500);
+        }
+        if (transacted)
+        {
+        	_consumerSession.commit();
+        }  
+        _consumerA.close();
+        _consumerB.close();
+        _consumerSession.close();
+        assertEquals("Wrong number of messages on queue", NUM_MESSAGES - count,
+                        ((AMQSession) _producerSession).getQueueDepth((AMQDestination) _queue));
+
+        // Clean up messages that may be left on the queue
+        _consumerSession = _con.createSession(transacted, mode);
+        _consumerA = _consumerSession.createConsumer(_queue);
+        msg = _consumerA.receive(1500);
+        while (msg != null)
+        {
+            if (mode == Session.CLIENT_ACKNOWLEDGE)
+            {
+                msg.acknowledge();
+            }
+            msg = _consumerA.receive(1500);
+        }
+        _consumerA.close();
+        if (transacted)
+        {
+            _consumerSession.commit();
+        }
+        _consumerSession.close();
+        super.tearDown();
+    }
+    
+    public void test2ConsumersAutoAck() throws Exception
+    {
+    	testMessageAck(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+    public void test2ConsumersClientAck() throws Exception
+    {
+    	testMessageAck(true, Session.CLIENT_ACKNOWLEDGE);
+    }
+    
+    public void test2ConsumersTx() throws Exception
+    {
+    	testMessageAck(true, Session.AUTO_ACKNOWLEDGE);
+    }
+    
+}
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
index 352cb80211..00cb458c86 100644
--- a/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/util/ConversationFactory.java
@@ -92,7 +92,7 @@ import java.util.concurrent.atomic.AtomicLong;
  *
  * <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> 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>