create branch for broker refactoring

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@650146 13f79535-47bb-0310-9956-ffa450edef68

61 files changed, 1939 insertions, 370 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 10189a8017..42d9cccb4f 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
@@ -117,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;
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
index d3f79f84b6..9b2a3a6e28 100644
--- 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
@@ -1,19 +1,4 @@
-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;/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -33,26 +18,51 @@ import java.util.concurrent.CountDownLatch;/*
  * 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 static final Logger _logger = LoggerFactory.getLogger(FailoverMethodTest.class);
     private CountDownLatch _failoverComplete = new CountDownLatch(1);
 
     public void setUp() throws AMQVMBrokerCreationException
     {
+        TransportConnection.createVMBroker(1);
     }
 
     public void tearDown() throws AMQVMBrokerCreationException
     {
+        TransportConnection.killAllVMBrokers();
     }
 
-    public void testFailoverRoundRobinDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    /**
+     * 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);
-        TransportConnection.createVMBroker(1);
 
         try
         {
@@ -64,9 +74,15 @@ public class FailoverMethodTest extends TestCase implements ExceptionListener
             TransportConnection.killAllVMBrokers();
 
             _failoverComplete.await();
+
             long end = System.currentTimeMillis();
 
-            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+            //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)
@@ -80,7 +96,6 @@ public class FailoverMethodTest extends TestCase implements ExceptionListener
         String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='2000',retries='3''";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
-        TransportConnection.createVMBroker(1);
 
         try
         {
@@ -92,9 +107,16 @@ public class FailoverMethodTest extends TestCase implements ExceptionListener
             TransportConnection.killAllVMBrokers();
 
             _failoverComplete.await();
+
             long end = System.currentTimeMillis();
 
-            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+            //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)
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
index 1b082beee4..0221f7e275 100644
--- 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
@@ -1,9 +1,7 @@
 package org.apache.qpid.server.plugins;
 
-import java.util.Collection;
 import java.util.Map;
 
-import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.ExchangeType;
 
 import junit.framework.TestCase;
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 bb9b201e5d..5fbea5e14f 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
@@ -24,20 +24,15 @@ import junit.framework.TestCase;
 
 import org.apache.log4j.Logger;
 
-import org.apache.mina.common.IoSession;
-
 import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.SkeletonMessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import javax.management.JMException;
 
@@ -62,7 +57,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         AMQQueue queue =
             new org.apache.qpid.server.queue.AMQQueue(new AMQShortString("testQueue_" + System.currentTimeMillis()), false,
                 new AMQShortString("test"), true, _protocolSession.getVirtualHost());
-        AMQChannel channel = new AMQChannel(_protocolSession, 2, _messageStore, null);
+        AMQChannel channel = new AMQChannel(_protocolSession, 2, _messageStore);
         channel.setDefaultQueue(queue);
         _protocolSession.addChannel(channel);
         channelCount = _mbean.channels().size();
@@ -73,7 +68,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L);
 
         // check APIs
-        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _messageStore, null);
+        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _messageStore);
         channel3.setLocalTransactional();
         _protocolSession.addChannel(channel3);
         _mbean.rollbackTransactions(2);
@@ -93,14 +88,14 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         }
 
         // check if closing of session works
-        _protocolSession.addChannel(new AMQChannel(_protocolSession, 5, _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, _messageStore, null));
+            _protocolSession.addChannel(new AMQChannel(_protocolSession, 6, _messageStore));
             fail();
         }
         catch (AMQException ex)
@@ -119,7 +114,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
             new AMQMinaProtocolSession(new MockIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
                 null);
         _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
-        _channel = new AMQChannel(_protocolSession, 1, _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 ae02c1c28c..5adfebbffb 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
@@ -21,22 +21,12 @@
 package org.apache.qpid.server.protocol;
 
 import junit.framework.TestCase;
-import org.apache.mina.common.IoSession;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.SkeletonMessageStore;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.framing.AMQShortString;
-
-import javax.management.JMException;
 
 /** Test class to test MBean operations for AMQMinaProtocolSession. */
 public class MaxChannelsTest extends TestCase
@@ -65,7 +55,7 @@ public class MaxChannelsTest extends TestCase
         {
             for (long currentChannel = 0L; currentChannel < maxChannels; currentChannel++)
             {
-                _protocolSession.addChannel(new AMQChannel(_protocolSession, (int) currentChannel, 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 790607e268..95ffb505fb 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
@@ -24,7 +24,6 @@ import junit.framework.TestCase;
 import org.apache.log4j.Logger;
 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;
@@ -37,7 +36,6 @@ import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.util.TestApplicationRegistry;
 import org.apache.qpid.server.util.NullApplicationRegistry;
 
 import java.util.LinkedList;
@@ -77,7 +75,7 @@ public class AckTest extends TestCase
         super.setUp();
         _messageStore = new TestableMemoryMessageStore();
         _protocolSession = new MockProtocolSession(_messageStore);
-        _channel = new AMQChannel(_protocolSession,5, _messageStore, null/*dont need exchange registry*/);
+        _channel = new AMQChannel(_protocolSession,5, _messageStore /*dont need exchange registry*/);
 
         _protocolSession.addChannel(_channel);
         _subscriptionManager = new SubscriptionSet();
@@ -107,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;
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 812aec6a5d..521bedeccd 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
@@ -70,6 +70,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;
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 fcee3c7de4..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
@@ -190,6 +190,26 @@ public class MockProtocolSession implements AMQProtocolSession
         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.
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 5846ad0a9d..458b510ef5 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
@@ -89,6 +89,11 @@ public class SubscriptionTestHelper implements Subscription
         return null;
     }
 
+    public void start()
+    {
+        //no-op
+    }
+
     public void queueDeleted(AMQQueue queue)
     {
     }
@@ -123,11 +128,6 @@ public class SubscriptionTestHelper implements Subscription
         //no-op
     }
 
-    public boolean isAutoClose()
-    {
-        return false;
-    }
-
     public void close()
     {
         //no-op
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..374c69fa00 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
@@ -61,6 +61,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;
@@ -109,6 +114,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;
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 0218109369..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
@@ -31,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;
@@ -54,7 +54,7 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
     private ManagedObjectRegistry _managedObjectRegistry;
 
-    private AccessManager _accessManager;
+    private ACLPlugin _accessManager;
 
     private PrincipalDatabaseManager _databaseManager;
 
@@ -137,11 +137,16 @@ 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;
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 624d9c9f3d..cf5e72eebc 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
@@ -21,15 +21,26 @@
 package org.apache.qpid.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.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.Session;
 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.Iterator;
 import java.util.Map;
 
 public class VMTestCase extends TestCase
@@ -85,14 +96,14 @@ public class VMTestCase extends TestCase
             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())
         {
@@ -104,20 +115,50 @@ public class VMTestCase extends TestCase
 
     protected void tearDown() throws Exception
     {
+        //Disabled
+//        checkQueuesClean();
+
         TransportConnection.killVMBroker(1);
         ApplicationRegistry.remove(1);
 
         super.tearDown();
     }
 
-    public int getMessageCount(String queueName)
+    private void checkQueuesClean() throws NamingException, JMSException
     {
-        return ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(_virtualhost.substring(1))
-                .getQueueRegistry().getQueue(new AMQShortString(queueName)).getMessageCount();
+        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 void testDummyinVMTestCase()
+    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
index 037c8285bc..463946e14a 100644
--- 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
@@ -1,5 +1,8 @@
 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;
@@ -69,21 +72,24 @@ public class DupsOkTest extends VMTestCase
         producerConnection.close();
     }
 
-    public void testDupsOK() throws NamingException, JMSException, InterruptedException
+    public void testDupsOK() throws NamingException, JMSException, InterruptedException, AMQException
     {
         //Create Client
         Connection clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
 
         clientConnection.start();
 
-        Session clientSession = clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
+        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");
@@ -98,12 +104,26 @@ public class DupsOkTest extends VMTestCase
                             assertEquals("The queue should have 4999 msgs left", 4999, getMessageCount(_queue.getQueueName()));
                         }*/
 
-                        if (message.getIntProperty("count") == 9999)
+                        if (message.getIntProperty("count") == MSG_COUNT)
                         {
-                            assertEquals("The queue should have 0 msgs left", 0, getMessageCount(_queue.getQueueName()));
-
-                            //This is the last message so release test.
-                            _awaitCompletion.countDown();
+                            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();
+                            }
                         }
 
                     }
@@ -131,9 +151,9 @@ public class DupsOkTest extends VMTestCase
 
 //        consumer.close();
 
+        assertEquals("The queue should have 0 msgs left", 0, ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue));
         clientConnection.close();
 
-        assertEquals("The queue should have 0 msgs left", 0, getMessageCount(_queue.getQueueName()));
     }
 
 
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
index fffe073362..9d1e461f05 100644
--- 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
@@ -7,6 +7,7 @@ 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;
@@ -49,7 +50,6 @@ public class FailoverTest extends TestCase implements ConnectionListener
 
             TransportConnection.createVMBroker(usedBrokers);
         }
-        //undo last addition
 
         conFactory = new AMQConnectionFactory(String.format(BROKER, usedBrokers - 1, usedBrokers));
         _logger.info("Connecting on:" + conFactory.getConnectionURL());
@@ -197,6 +197,20 @@ public class FailoverTest extends TestCase implements ConnectionListener
         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)
     {
     }
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
index a8f79ad59d..706d99ffe2 100644
--- 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
@@ -20,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

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

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

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 e2106eaca0..ceb9baf49c 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
@@ -26,11 +26,11 @@ import org.apache.log4j.NDC;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

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

 

-import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;

-import uk.co.thebadgerset.junit.extensions.SetupTaskAware;

-import uk.co.thebadgerset.junit.extensions.SetupTaskHandler;

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

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

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

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
index dac826fd5e..d1fcad9cc0 100644
--- 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
@@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.test.framework.localcircuit.LocalAMQPPublisherImpl;

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

 

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

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

 

 import javax.jms.*;

 

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
index f18ba521fa..38a924a4ee 100644
--- 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
@@ -28,7 +28,7 @@ import org.apache.qpid.test.framework.localcircuit.LocalReceiverImpl;
 import org.apache.qpid.test.framework.sequencers.CircuitFactory;

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

 

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 2c0f39d54c..574b4333e0 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,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

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

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

 

 import javax.jms.Session;

 

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
index c9bba54c51..63c7fd61c3 100644
--- 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
@@ -22,7 +22,7 @@ package org.apache.qpid.test.framework;
 

 import org.apache.log4j.Logger;

 

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

+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

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 418776b5cb..994371d4b3 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,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

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

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

 

 /**

  * A Publisher represents the status of the publishing side of a test circuit. Its main purpose is to provide assertions

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 4fd4ffeb48..8f9a246c70 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,7 +20,7 @@
  */

 package org.apache.qpid.test.framework;

 

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

+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

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 6ad6185ece..3d4d9b36ec 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;

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 3a2655340e..1a08fe4b0f 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

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 0b3f6865d6..362236b1b8 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,9 +20,7 @@
  */

 package org.apache.qpid.test.framework.clocksynch;

 

-import org.apache.log4j.Logger;

-

-import uk.co.thebadgerset.junit.extensions.ShutdownHookable;

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

 

 import java.io.IOException;

 import java.net.*;

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 78f05767d3..4f37a655c6 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.*;

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 628729cb51..a26b4b5c11 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 693fd854c7..712dc0ea24 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,7 +23,7 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;

 import org.apache.qpid.test.framework.Publisher;

 

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

+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

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 14782ee5e2..32307ce782 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,7 +23,7 @@ package org.apache.qpid.test.framework.distributedcircuit;
 import org.apache.qpid.test.framework.Assertion;

 import org.apache.qpid.test.framework.Receiver;

 

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

+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

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 845b0a39f6..8446bfa883 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
@@ -25,8 +25,8 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.test.framework.*;

 import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;

 

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

 

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 02fcb7fb55..2975bcc18a 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
@@ -1,32 +1,18 @@
-/*

- *

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

- *

- */

+/* Copyright Rupert Smith, 2005 to 2007, all rights reserved. */

 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;

@@ -34,18 +20,12 @@ import org.apache.qpid.test.framework.TestUtils;
 import org.apache.qpid.test.framework.clocksynch.UDPClockReference;

 import org.apache.qpid.util.ConversationFactory;

 

-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

@@ -137,8 +117,7 @@ public class Coordinator extends TKTestRunner
         String reportDir, String runName, boolean verbose, String brokerUrl, String virtualHost, TestEngine engine,

         boolean terminate, boolean csv, boolean xml, List<TestDecoratorFactory> decoratorFactories)

     {

-        super(repetitions, duration, threads, delay, params, testCaseName, reportDir, runName, csv, xml, verbose,

-            decoratorFactories);

+        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 = "

@@ -480,7 +459,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.");

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 c2f34b44fc..958df63d45 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 995aa5e71d..c68ca5f7ef 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 00285ab37e..e9636e35da 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;

 

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
index b011e52ca7..1c138fe575 100644
--- 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
@@ -30,9 +30,9 @@ import org.apache.qpid.test.framework.clocksynch.UDPClockSynchronizer;
 import org.apache.qpid.util.ReflectionUtils;

 import org.apache.qpid.util.ReflectionUtilsException;

 

-import uk.co.thebadgerset.junit.extensions.SleepThrottle;

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

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

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

 

@@ -154,8 +154,8 @@ public class TestClient implements MessageListener
         // 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(uk.co.thebadgerset.junit.extensions.util.CommandLineParser.processCommandLine(args,

-                    new uk.co.thebadgerset.junit.extensions.util.CommandLineParser(

+            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" },

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 014dd21292..bed6f0dfd6 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
index 44a807ed6d..14ae108da8 100644
--- 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
@@ -24,7 +24,7 @@ import org.apache.qpid.client.AMQNoConsumersException;
 import org.apache.qpid.client.AMQNoRouteException;

 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.MessageConsumer;

 import javax.jms.MessageProducer;

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 9c6220d97f..3cf5276b4d 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
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 

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

 

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 bd15839e41..77d6754f9c 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
@@ -22,7 +22,7 @@ package org.apache.qpid.test.framework.localcircuit;
 

 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.MessageConsumer;

 import javax.jms.MessageProducer;

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 9a86c00a1b..f349a521a1 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,7 +22,7 @@ package org.apache.qpid.test.framework.localcircuit;
 

 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.MessageConsumer;

 import javax.jms.MessageProducer;

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
index 3a44531ad2..4545e3c164 100644
--- 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
@@ -26,7 +26,7 @@ import junit.framework.TestResult;
 import org.apache.qpid.test.framework.FrameworkBaseCase;

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

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

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

 

 /**

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

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
index 2e41e5c0c6..3a048ac042 100644
--- 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
@@ -26,7 +26,7 @@ import junit.framework.TestResult;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

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

 

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

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

 

 /**

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

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
index a7ea9f9c7f..bcf052ea06 100644
--- 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
@@ -29,8 +29,8 @@ import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;

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

 

-import uk.co.thebadgerset.junit.extensions.SetupTaskAware;

-import uk.co.thebadgerset.junit.extensions.WrappedSuiteTestDecorator;

+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

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 ade96427ac..8e9591580f 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,13 +25,9 @@ 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;

 

 /**

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 ff4ee741ad..a82bb7c382 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;

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 4c56a68d8f..77889e8651 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;

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
index c7bbd70e99..845c3ed9c8 100644
--- 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
@@ -27,8 +27,7 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

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

 

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

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

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

 

 /**

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

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
index 7391bf23d2..066b4e24ba 100644
--- 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
@@ -27,8 +27,8 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

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

 

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

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

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

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
index 163a6a67f6..f39d22bc67 100644
--- 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
@@ -26,8 +26,8 @@ import org.apache.qpid.test.framework.MessagingTestConfigProperties;
 import static org.apache.qpid.test.framework.MessagingTestConfigProperties.*;

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

 

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

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

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

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

 

 /**

  * RollbackTest tests the rollback ability of transactional messaging.

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
index f83e6e51cb..8fddf651b4 100644
--- 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
@@ -33,7 +33,9 @@ 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;
@@ -113,7 +115,7 @@ public class AcknowledgeTest extends VMTestCase
         _consumerB = _consumerSession.createConsumer(_queue);
         sendMessages(NUM_MESSAGES/2);
         int count = 0;
-        Message msg = _consumerB.receive(100);
+        Message msg = _consumerB.receive(1500);
         while (msg != null) 
         {
         	if (mode == Session.CLIENT_ACKNOWLEDGE)
@@ -130,7 +132,28 @@ public class AcknowledgeTest extends VMTestCase
         _consumerA.close();
         _consumerB.close();
         _consumerSession.close();
-        assertEquals("Wrong number of messages on queue", NUM_MESSAGES - count, getMessageCount(_queue.getQueueName()));
+        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