QPID-3998, QPID-3999, QPID-4093: add new management plugins for jmx/rest/webui functionality, partial merge from the java-config-and-management branch at r1355039

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

23 files changed, 642 insertions, 2921 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java b/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
deleted file mode 100644
index c06ce5e31a..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
+++ /dev/null
@@ -1,395 +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.log4j.xml;
-
-
-import junit.framework.TestCase;
-import org.apache.log4j.xml.QpidLog4JConfigurator.IllegalLoggerLevelException;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class QpidLog4JConfiguratorTest extends TestCase
-{
-    private static final String NEWLINE = System.getProperty("line.separator");
-
-    private File _testConfigFile;
-
-    private File createTempTestLog4JConfig(String loggerLevel,String rootLoggerLevel, boolean missingTagClose, boolean incorrectAttribute)
-    {
-        File tmpFile = null;
-        try
-        {
-            tmpFile = File.createTempFile("QpidLog4JConfiguratorTestLog4jConfig", ".tmp");
-            tmpFile.deleteOnExit();
-
-            FileWriter fstream = new FileWriter(tmpFile);
-            BufferedWriter writer = new BufferedWriter(fstream);
-
-            writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+NEWLINE);
-            writer.write("<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">"+NEWLINE);
-
-            writer.write("<log4j:configuration xmlns:log4j=\"http://jakarta.apache.org/log4j/\" debug=\"null\" " +
-                    "threshold=\"null\">"+NEWLINE);
-
-            writer.write("  <appender class=\"org.apache.log4j.ConsoleAppender\" name=\"STDOUT\">"+NEWLINE);
-            writer.write("      <layout class=\"org.apache.log4j.PatternLayout\">"+NEWLINE);
-            writer.write("          <param name=\"ConversionPattern\" value=\"%d %-5p [%t] %C{2} (%F:%L) - %m%n\"/>"+NEWLINE);
-            writer.write("      </layout>"+NEWLINE);
-            writer.write("  </appender>"+NEWLINE);
-            
-            String closeTag="/";
-            if(missingTagClose)
-            {
-                closeTag="";
-            }
-
-            //Example of a 'category' with a 'priority'
-            writer.write("  <category additivity=\"true\" name=\"logger1\">"+NEWLINE);
-            writer.write("      <priority value=\"" + loggerLevel+ "\"" + closeTag + ">"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </category>"+NEWLINE);
-
-            String attributeName="value";
-            if(incorrectAttribute)
-            {
-                attributeName="values";
-            }
-            
-            //Example of a 'category' with a 'level'
-            writer.write("  <category additivity=\"true\" name=\"logger2\">"+NEWLINE);
-            writer.write("      <level " + attributeName + "=\"" + loggerLevel+ "\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </category>"+NEWLINE);
-
-            //Example of a 'logger' with a 'level'
-            writer.write("  <logger additivity=\"true\" name=\"logger3\">"+NEWLINE);
-            writer.write("      <level value=\"" + loggerLevel+ "\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </logger>"+NEWLINE);
-
-            //'root' logger
-            writer.write("  <root>"+NEWLINE);
-            writer.write("      <priority value=\"" + rootLoggerLevel+ "\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </root>"+NEWLINE);
-
-            writer.write("</log4j:configuration>"+NEWLINE);
-
-            writer.flush();
-            writer.close();
-        }
-        catch (IOException e)
-        {
-            fail("Unable to create temporary test log4j configuration");
-        }
-
-        return tmpFile;
-    }
-
-
-
-    //******* Test Methods ******* //
-
-    public void testCheckLevelsAndStrictParser()
-    {
-        //try the valid logger levels
-        _testConfigFile = createTempTestLog4JConfig("all", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("trace", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("debug", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("warn", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("error", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("fatal", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("off", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("null", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("inherited", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        //now try an invalid logger level
-        _testConfigFile = createTempTestLog4JConfig("madeup", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-            fail("IllegalLoggerLevelException expected, invalid levels used");
-        }
-        catch (IllegalLoggerLevelException e)
-        {
-            //expected, ignore
-        }
-        catch (IOException e)
-        {
-            fail("Incorrect Exception, expected an IllegalLoggerLevelException");
-        }
-        
-        
-        
-        //now try the valid rootLogger levels
-        _testConfigFile = createTempTestLog4JConfig("info", "all", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "trace", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "debug", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "info", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "warn", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "error", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "fatal", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "off", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "null", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "inherited", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "debug", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-        }
-        catch (Exception e)
-        {
-            fail("No exception expected, valid levels and xml were used");
-        }
-        
-        //now try an invalid logger level
-        _testConfigFile = createTempTestLog4JConfig("info", "madeup", false, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-            fail("IllegalLoggerLevelException expected, invalid levels used");
-        }
-        catch (IllegalLoggerLevelException e)
-        {
-            //expected, ignore
-        }
-        catch (IOException e)
-        {
-            fail("Incorrect Exception, expected an IllegalLoggerLevelException");
-        }
-        
-        
-        
-        //now try invalid xml
-        _testConfigFile = createTempTestLog4JConfig("info", "info", true, false);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-            fail("IOException expected, malformed XML used");
-        }
-        catch (IllegalLoggerLevelException e)
-        {
-            fail("Incorrect Exception, expected an IOException");
-        }
-        catch (IOException e)
-        {
-            //expected, ignore
-        }
-        
-        _testConfigFile = createTempTestLog4JConfig("info", "info", false, true);
-        try
-        {
-            QpidLog4JConfigurator.checkLoggerLevels(_testConfigFile.getAbsolutePath());
-            fail("IOException expected, malformed XML used");
-        }
-        catch (IllegalLoggerLevelException e)
-        {
-            //expected, ignore
-        }
-        catch (IOException e)
-        {
-            fail("Incorrect Exception, expected an IllegalLoggerLevelException");
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
deleted file mode 100644
index d34d1bbef3..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ /dev/null
@@ -1,194 +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.server;
-
-import org.apache.commons.configuration.XMLConfiguration;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.management.common.mbeans.ManagedBroker;
-import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.logging.SystemOutMessageLogger;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.TestLogActor;
-import org.apache.qpid.server.queue.AMQPriorityQueue;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-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.TestableMemoryMessageStore;
-import org.apache.qpid.server.util.TestApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class AMQBrokerManagerMBeanTest extends QpidTestCase
-{
-    private QueueRegistry _queueRegistry;
-    private ExchangeRegistry _exchangeRegistry;
-    private VirtualHost _vHost;
-
-    public void testExchangeOperations() throws Exception
-    {
-        String exchange1 = "testExchange1_" + System.currentTimeMillis();
-        String exchange2 = "testExchange2_" + System.currentTimeMillis();
-        String exchange3 = "testExchange3_" + System.currentTimeMillis();
-
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
-
-
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
-        mbean.createNewExchange(exchange1, "direct", false);
-        mbean.createNewExchange(exchange2, "topic", false);
-        mbean.createNewExchange(exchange3, "headers", false);
-
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) != null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) != null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) != null);
-
-        mbean.unregisterExchange(exchange1);
-        mbean.unregisterExchange(exchange2);
-        mbean.unregisterExchange(exchange3);
-
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
-        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
-    }
-
-    public void testQueueOperations() throws Exception
-    {
-        String queueName = "testQueue_" + System.currentTimeMillis();
-
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
-
-        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
-
-        mbean.createNewQueue(queueName, "test", false);
-        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null);
-
-        mbean.deleteQueue(queueName);
-        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
-    }
-
-    public void testCreateNewQueueBindsToDefaultExchange() throws Exception
-    {
-        String queueName = "testQueue_" + System.currentTimeMillis();
-
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
-        ExchangeRegistry exReg = _vHost.getExchangeRegistry();
-        Exchange defaultExchange =  exReg.getDefaultExchange();
-
-        mbean.createNewQueue(queueName, "test", false);
-        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null);
-
-        assertTrue("New queue should be bound to default exchange", defaultExchange.isBound(new AMQShortString(queueName)));
-    }
-
-    /**
-     * Tests that setting the {@link AMQQueueFactory#X_QPID_MAXIMUM_DELIVERY_COUNT} argument does cause the
-     * maximum delivery count to be set on the Queue.
-     */
-    public void testCreateNewQueueWithMaximumDeliveryCount() throws Exception
-    {
-        final Map<String,Object> args = new HashMap<String, Object>();
-        args.put(AMQQueueFactory.X_QPID_MAXIMUM_DELIVERY_COUNT, 5);
-
-        final AMQShortString queueName = new AMQShortString("testCreateNewQueueWithMaximumDeliveryCount");
-
-        final QueueRegistry qReg = _vHost.getQueueRegistry();
-
-        assertNull("The queue should not yet exist", qReg.getQueue(queueName));
-
-        final ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
-        mbean.createNewQueue(queueName.asString(), "test", false, args);
-
-        final AMQQueue createdQueue = qReg.getQueue(queueName);
-        assertNotNull("The queue was not registered as expected", createdQueue);
-        assertEquals("Unexpected maximum delivery count", 5, createdQueue.getMaximumDeliveryCount());
-    }
-
-    /**
-     * Tests that setting the {@link AMQQueueFactory#X_QPID_PRIORITIES} argument prompts creation of
-     * a Priority Queue.
-     */
-    public void testCreatePriorityQueue() throws Exception
-    {
-        int numPriorities = 7;
-        Map<String,Object> args = new HashMap<String, Object>();
-        args.put(AMQQueueFactory.X_QPID_PRIORITIES, numPriorities);
-
-        AMQShortString queueName = new AMQShortString("testCreatePriorityQueue");
-
-        QueueRegistry qReg = _vHost.getQueueRegistry();
-
-        assertNull("The queue should not yet exist", qReg.getQueue(queueName));
-
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHostImpl.VirtualHostMBean) _vHost.getManagedObject());
-        mbean.createNewQueue(queueName.asString(), "test", false, args);
-
-        AMQQueue queue = qReg.getQueue(queueName);
-        assertEquals("Queue is not a priorty queue", AMQPriorityQueue.class, queue.getClass());
-        assertEquals("Number of priorities supported was not as expected", numPriorities, ((AMQPriorityQueue)queue).getPriorities());
-    }
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
-
-        XMLConfiguration configXml = new XMLConfiguration();
-        configXml.addProperty("virtualhosts.virtualhost(-1).name", "test");
-        configXml.addProperty("virtualhosts.virtualhost(-1).test.store.class", TestableMemoryMessageStore.class.getName());
-
-        ServerConfiguration configuration = new ServerConfiguration(configXml);
-
-        ApplicationRegistry registry = new TestApplicationRegistry(configuration);
-        ApplicationRegistry.initialise(registry);
-        registry.getVirtualHostRegistry().setDefaultVirtualHostName("test");
-
-        IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        _vHost = appRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _queueRegistry = _vHost.getQueueRegistry();
-        _exchangeRegistry = _vHost.getExchangeRegistry();
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        try
-        {
-            super.tearDown();
-        }
-        finally
-        {
-            ApplicationRegistry.remove();
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index 36f131a30f..9225f7810a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
@@ -204,6 +204,18 @@ public class QueueConfigurationTest extends TestCase
         assertEquals("test-sort-key", qConf.getQueueSortKey());
     }
 
+    public void testQueueDescription() throws ConfigurationException
+    {
+        //Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
+        assertNull(qConf.getDescription());
+
+        // Check explicit value
+        final VirtualHostConfiguration vhostConfig = overrideConfiguration("description", "mydescription");
+        qConf = new QueueConfiguration("test", vhostConfig);
+        assertEquals("mydescription", qConf.getDescription());
+    }
+
     private VirtualHostConfiguration overrideConfiguration(String property, Object value)
             throws ConfigurationException
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index c2d2eb37c1..2ee02430c8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -252,13 +252,13 @@ public class ServerConfigurationTest extends QpidTestCase
     {
         // Check default
         _serverConfig.initialise();
-        assertEquals(true, _serverConfig.getManagementSSLEnabled());
+        assertEquals(false, _serverConfig.getManagementSSLEnabled());
 
         // Check value we set
-        _config.setProperty("management.ssl.enabled", false);
+        _config.setProperty("management.ssl.enabled", true);
         _serverConfig = new ServerConfiguration(_config);
         _serverConfig.initialise();
-        assertEquals(false, _serverConfig.getManagementSSLEnabled());
+        assertEquals(true, _serverConfig.getManagementSSLEnabled());
     }
 
     public void testGetManagementKeystorePassword() throws ConfigurationException
@@ -287,25 +287,17 @@ public class ServerConfigurationTest extends QpidTestCase
         assertEquals(false, _serverConfig.getQueueAutoRegister());
     }
 
-    public void testGetManagementEnabled() throws ConfigurationException
+    public void testGetJMXManagementEnabled() throws ConfigurationException
     {
         // Check default
         _serverConfig.initialise();
-        assertEquals(true, _serverConfig.getManagementEnabled());
+        assertEquals(true, _serverConfig.getJMXManagementEnabled());
 
         // Check value we set
         _config.setProperty("management.enabled", false);
         _serverConfig = new ServerConfiguration(_config);
         _serverConfig.initialise();
-        assertEquals(false, _serverConfig.getManagementEnabled());
-    }
-
-    public void testSetManagementEnabled() throws ConfigurationException
-    {
-        // Check value we set
-        _serverConfig.initialise();
-        _serverConfig.setManagementEnabled(false);
-        assertEquals(false, _serverConfig.getManagementEnabled());
+        assertEquals(false, _serverConfig.getJMXManagementEnabled());
     }
 
     public void testGetManagementRightsInferAllAccess() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
deleted file mode 100644
index 9034bf9c3a..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ /dev/null
@@ -1,235 +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.server.exchange;
-
-import org.apache.commons.lang.ArrayUtils;
-
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.management.common.mbeans.ManagedExchange;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-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.util.InternalBrokerBaseCase;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.TabularData;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Unit test class for testing different Exchange MBean operations
- */
-public class ExchangeMBeanTest  extends InternalBrokerBaseCase
-{
-    private AMQQueue _queue;
-    private QueueRegistry _queueRegistry;
-    private VirtualHost _virtualHost;
-
-    public void testGeneralProperties() throws Exception
-    {
-        DirectExchange exchange = new DirectExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        // test general exchange properties
-        assertEquals("Unexpected exchange name", "amq.direct", mbean.getName());
-        assertEquals("Unexpected exchange type", "direct", mbean.getExchangeType());
-        assertEquals("Unexpected ticket number", Integer.valueOf(0), mbean.getTicketNo());
-        assertFalse("Unexpected durable flag", mbean.isDurable());
-        assertTrue("Unexpected auto delete flag", mbean.isAutoDelete());
-    }
-
-    public void testDirectExchangeMBean() throws Exception
-    {
-        DirectExchange exchange = new DirectExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "binding1");
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "binding2");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertTrue(list.size() == 2);
-    }
-
-    public void testTopicExchangeMBean() throws Exception
-    {
-        TopicExchange exchange = new TopicExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost,ExchangeDefaults.TOPIC_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "binding1");
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "binding2");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertTrue(list.size() == 2);
-    }
-
-    public void testHeadersExchangeMBean() throws Exception
-    {
-        HeadersExchange exchange = new HeadersExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost,ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "x-match=any,key1=binding1,key2=binding2");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertEquals("Unexpected number of bindings", 1, list.size());
-
-        final Iterator<CompositeDataSupport> rowItr = (Iterator<CompositeDataSupport>) data.values().iterator();
-        CompositeDataSupport row = rowItr.next();
-        assertBinding(1, _queue.getName(), new String[]{"x-match=any","key1=binding1","key2=binding2"}, row);
-    }
-
-    /**
-     * Included to ensure 0-10 Specification compliance:
-     * 2.3.1.4 "the field in the bind arguments has no value and a field of the same name is present in the message headers
-     */
-    public void testHeadersExchangeMBeanMatchPropertyNoValue() throws Exception
-    {
-        HeadersExchange exchange = new HeadersExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost,ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getNameShortString().toString(), "x-match=any,key4,key5=");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertEquals("Unexpected number of bindings", 1, list.size());
-
-        final Iterator<CompositeDataSupport> rowItr = (Iterator<CompositeDataSupport>) data.values().iterator();
-        CompositeDataSupport row = rowItr.next();
-        assertBinding(1, _queue.getName(), new String[]{"x-match=any","key4=","key5="}, row);
-    }
-
-    public void testInvalidHeaderBindingMalformed() throws Exception
-    {
-        HeadersExchange exchange = new HeadersExchange();
-        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost,ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, 0, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        try
-        {
-            mbean.createNewBinding(_queue.getNameShortString().toString(), "x-match=any,=value4");
-            fail("Exception not thrown");
-        }
-        catch (JMException jme)
-        {
-            //pass
-        }
-    }
-
-    private void assertBinding(final int expectedBindingNo, final String expectedQueueName, final String[] expectedBindingArray,
-                                final CompositeDataSupport row)
-    {
-        final Number bindingNumber = (Number) row.get(ManagedExchange.HDR_BINDING_NUMBER);
-        final String queueName = (String) row.get(ManagedExchange.HDR_QUEUE_NAME);
-        final String[] bindings = (String[]) row.get(ManagedExchange.HDR_QUEUE_BINDINGS);
-        assertEquals("Unexpected binding number", expectedBindingNo, bindingNumber);
-        assertEquals("Unexpected queue name", expectedQueueName, queueName);
-        assertEquals("Unexpected no of bindings", expectedBindingArray.length, bindings.length);
-        for(String binding : bindings)
-        {
-            assertTrue("Expected binding not found: " + binding, ArrayUtils.contains(expectedBindingArray, binding));
-        }
-    }
-
-    /**
-     * Test adding bindings and removing them from the default exchange via JMX.
-     * <p>
-     * QPID-2700
-     */
-    public void testDefaultBindings() throws Exception
-    {
-        int bindings = _queue.getBindingCount();
-        
-        Exchange exchange = _queue.getVirtualHost().getExchangeRegistry().getDefaultExchange();
-        ManagedExchange mbean = (ManagedExchange) ((AbstractExchange) exchange).getManagedObject();
-        
-        mbean.createNewBinding(_queue.getName(), "robot");
-        mbean.createNewBinding(_queue.getName(), "kitten");
-
-        assertEquals("Should have added two bindings", bindings + 2, _queue.getBindingCount());
-        
-        mbean.removeBinding(_queue.getName(), "robot");
-
-        assertEquals("Should have one extra binding", bindings + 1, _queue.getBindingCount());
-        
-        mbean.removeBinding(_queue.getName(), "kitten");
-
-        assertEquals("Should have original number of binding", bindings, _queue.getBindingCount());
-    }
-    
-    /**
-     * Test adding bindings and removing them from the topic exchange via JMX.
-     * <p>
-     * QPID-2700
-     */
-    public void testTopicBindings() throws Exception
-    {
-        int bindings = _queue.getBindingCount();
-        
-        Exchange exchange = _queue.getVirtualHost().getExchangeRegistry().getExchange(new AMQShortString("amq.topic"));
-        ManagedExchange mbean = (ManagedExchange) ((AbstractExchange) exchange).getManagedObject();
-        
-        mbean.createNewBinding(_queue.getName(), "robot.#");
-        mbean.createNewBinding(_queue.getName(), "#.kitten");
-
-        assertEquals("Should have added two bindings", bindings + 2, _queue.getBindingCount());
-        
-        mbean.removeBinding(_queue.getName(), "robot.#");
-
-        assertEquals("Should have one extra binding", bindings + 1, _queue.getBindingCount());
-        
-        mbean.removeBinding(_queue.getName(), "#.kitten");
-
-        assertEquals("Should have original number of binding", bindings, _queue.getBindingCount());
-    }
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _queueRegistry = _virtualHost.getQueueRegistry();
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, false,
-                                                    _virtualHost, null);
-        _queueRegistry.registerQueue(_queue);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 4305cdadc6..833df34fd8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
@@ -7,9 +7,9 @@
  * 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
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
+import java.util.Collection;
 import junit.framework.TestCase;
 
 import org.apache.qpid.server.binding.Binding;
@@ -50,6 +51,16 @@ public class HeadersBindingTest extends TestCase
             return 0;
         }
 
+        public String getUserId()
+        {
+            return null;
+        }
+
+        public String getAppId()
+        {
+            return null;
+        }
+
         public String getMessageId()
         {
             return null;
@@ -57,7 +68,7 @@ public class HeadersBindingTest extends TestCase
 
         public String getMimeType()
         {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            return null;
         }
 
         public String getEncoding()
@@ -105,6 +116,12 @@ public class HeadersBindingTest extends TestCase
             return _headers.keySet().containsAll(names);
         }
 
+        @Override
+        public Collection<String> getHeaderNames()
+        {
+            return _headers.keySet();
+        }
+
         public boolean containsHeader(String name)
         {
             return _headers.containsKey(name);
@@ -125,13 +142,13 @@ public class HeadersBindingTest extends TestCase
     private MockHeader matchHeaders = new MockHeader();
     private int _count = 0;
     private MockAMQQueue _queue;
-    
+
     protected void setUp()
     {
         _count++;
         _queue = new MockAMQQueue(getQueueName());
     }
-    
+
     protected String getQueueName()
     {
         return "Queue" + _count;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
deleted file mode 100644
index f9ad81ae74..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
+++ /dev/null
@@ -1,428 +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.server.logging.management;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-
-import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
-import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
-
-import javax.management.JMException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularDataSupport;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
-{
-    private static final String TEST_LOGGER = "LoggingManagementMBeanTestLogger";
-    private static final String TEST_LOGGER_CHILD1 = "LoggingManagementMBeanTestLogger.child1";
-    private static final String TEST_LOGGER_CHILD2 = "LoggingManagementMBeanTestLogger.child2";
-
-    private static final String TEST_CATEGORY_PRIORITY = "LogManMBeanTest.category.priority";
-    private static final String TEST_CATEGORY_LEVEL = "LogManMBeanTest.category.level";
-    private static final String TEST_LOGGER_LEVEL = "LogManMBeanTest.logger.level";
-
-    private static final String NEWLINE = System.getProperty("line.separator");
-
-    private File _testConfigFile;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        _testConfigFile = createTempTestLog4JConfig();
-    }
-    
-    @Override
-    public void tearDown() throws Exception
-    {
-        File oldTestConfigFile = new File(_testConfigFile.getAbsolutePath() + ".old");
-        if(oldTestConfigFile.exists())
-        {
-            oldTestConfigFile.delete();
-        }
-        
-        _testConfigFile.delete();
-        
-        super.tearDown();
-    }
-
-    private File createTempTestLog4JConfig()
-    {
-        File tmpFile = null;
-        try
-        {
-            tmpFile = File.createTempFile("LogManMBeanTestLog4jConfig", ".tmp");
-            tmpFile.deleteOnExit();
-
-            FileWriter fstream = new FileWriter(tmpFile);
-            BufferedWriter writer = new BufferedWriter(fstream);
-
-            writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+NEWLINE);
-            writer.write("<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">"+NEWLINE);
-
-            writer.write("<log4j:configuration xmlns:log4j=\"http://jakarta.apache.org/log4j/\" debug=\"null\" " +
-            		                                                                "threshold=\"null\">"+NEWLINE);
-
-            writer.write("  <appender class=\"org.apache.log4j.ConsoleAppender\" name=\"STDOUT\">"+NEWLINE);
-            writer.write("      <layout class=\"org.apache.log4j.PatternLayout\">"+NEWLINE);
-            writer.write("          <param name=\"ConversionPattern\" value=\"%d %-5p [%t] %C{2} (%F:%L) - %m%n\"/>"+NEWLINE);
-            writer.write("      </layout>"+NEWLINE);
-            writer.write("  </appender>"+NEWLINE);
-
-            //Example of a 'category' with a 'priority'
-            writer.write("  <category additivity=\"true\" name=\"" + TEST_CATEGORY_PRIORITY +"\">"+NEWLINE);
-            writer.write("      <priority value=\"info\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </category>"+NEWLINE);
-
-            //Example of a 'category' with a 'level'
-            writer.write("  <category additivity=\"true\" name=\"" + TEST_CATEGORY_LEVEL +"\">"+NEWLINE);
-            writer.write("      <level value=\"warn\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </category>"+NEWLINE);
-
-            //Example of a 'logger' with a 'level'
-            writer.write("  <logger additivity=\"true\" name=\"" + TEST_LOGGER_LEVEL + "\">"+NEWLINE);
-            writer.write("      <level value=\"error\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </logger>"+NEWLINE);
-
-            //'root' logger
-            writer.write("  <root>"+NEWLINE);
-            writer.write("      <priority value=\"info\"/>"+NEWLINE);
-            writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
-            writer.write("  </root>"+NEWLINE);
-
-            writer.write("</log4j:configuration>"+NEWLINE);
-
-            writer.flush();
-            writer.close();
-        }
-        catch (IOException e)
-        {
-            fail("Unable to create temporary test log4j configuration");
-        }
-
-        return tmpFile;
-    }
-
-
-
-    //******* Test Methods ******* //
-   
-    public void testSetRuntimeLoggerLevel()
-    {
-        LoggingManagementMBean lm = null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        //create a parent test logger, set its level explicitly
-        Logger log = Logger.getLogger(TEST_LOGGER);
-        log.setLevel(Level.toLevel("info"));
-
-        //create child1 test logger, check its *effective* level is the same as the parent, "info"
-        Logger log1 = Logger.getLogger(TEST_LOGGER_CHILD1);
-        assertTrue("Test logger's level was not the expected value", 
-                    log1.getEffectiveLevel().toString().equalsIgnoreCase("info"));
-
-        //now change its level to "warn"
-        assertTrue("Failed to set logger level", lm.setRuntimeLoggerLevel(TEST_LOGGER_CHILD1, "warn"));
-
-        //check the change, see its actual level is "warn
-        assertTrue("Test logger's level was not the expected value", 
-                    log1.getLevel().toString().equalsIgnoreCase("warn"));
-
-        //try an invalid level
-        assertFalse("Trying to set an invalid level succeded", lm.setRuntimeLoggerLevel(TEST_LOGGER_CHILD1, "made.up.level"));
-    }
-    
-    public void testSetRuntimeRootLoggerLevel()
-    {
-        LoggingManagementMBean lm = null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        Logger log = Logger.getRootLogger();
-        
-        //get current root logger level
-        Level origLevel = log.getLevel();
-        
-        //change level twice to ensure a new level is actually selected
-        
-        //set root loggers level to info
-        assertTrue("Failed to set root logger level", lm.setRuntimeRootLoggerLevel("debug"));
-        //check it is now actually info
-        Level currentLevel = log.getLevel();
-        assertTrue("Logger level was not expected value", currentLevel.equals(Level.toLevel("debug")));
-        
-        //try an invalid level
-        assertFalse("Trying to set an invalid level succeded", lm.setRuntimeRootLoggerLevel("made.up.level"));
-        
-        //set root loggers level to warn
-        assertTrue("Failed to set logger level", lm.setRuntimeRootLoggerLevel("info"));
-        //check it is now actually warn
-        currentLevel = log.getLevel();
-        assertTrue("Logger level was not expected value", currentLevel.equals(Level.toLevel("info")));
-        
-        //restore original level
-        log.setLevel(origLevel);
-    }
-
-    public void testGetRuntimeRootLoggerLevel()
-    {
-        LoggingManagementMBean lm = null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        Logger log = Logger.getRootLogger();
-        
-        //get current root logger level
-        Level origLevel = log.getLevel();
-        
-        //change level twice to ensure a new level is actually selected
-        
-        //set root loggers level to debug
-        log.setLevel(Level.toLevel("debug"));
-        //check it is now actually debug
-        assertTrue("Logger level was not expected value", lm.getRuntimeRootLoggerLevel().equalsIgnoreCase("debug"));
-        
-        
-        //set root loggers level to warn
-        log.setLevel(Level.toLevel("info"));
-        //check it is now actually warn
-        assertTrue("Logger level was not expected value", lm.getRuntimeRootLoggerLevel().equalsIgnoreCase("info"));
-
-        //restore original level
-        log.setLevel(origLevel);
-    }
-    
-    public void testViewEffectiveRuntimeLoggerLevels()
-    {
-        LoggingManagementMBean lm = null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        //(re)create a parent test logger, set its level explicitly
-        Logger log = Logger.getLogger(TEST_LOGGER);
-        log.setLevel(Level.toLevel("info"));
-        
-        //retrieve the current effective runtime logger level values
-        TabularDataSupport levels = (TabularDataSupport) lm.viewEffectiveRuntimeLoggerLevels();
-        Collection<Object> records = levels.values();
-        Map<String,String> list = new HashMap<String,String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
-        }
-        
-        //check child2 does not exist already
-        assertFalse("Did not expect this logger to exist already", list.containsKey(TEST_LOGGER_CHILD2));
-
-        //create child2 test logger
-        Logger log2 = Logger.getLogger(TEST_LOGGER_CHILD2);
-        
-        //retrieve the current effective runtime logger level values
-        levels = (TabularDataSupport) lm.viewEffectiveRuntimeLoggerLevels();
-        records = levels.values();
-        list = new HashMap<String,String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
-        }
-
-        //verify the parent and child2 loggers are present in returned values
-        assertTrue(TEST_LOGGER + " logger was not in the returned list", list.containsKey(TEST_LOGGER));
-        assertTrue(TEST_LOGGER_CHILD2 + " logger was not in the returned list", list.containsKey(TEST_LOGGER_CHILD2));
-        
-        //check child2's effective level is the same as the parent, "info"
-        assertTrue("Test logger's level was not the expected value", 
-                    list.get(TEST_LOGGER_CHILD2).equalsIgnoreCase("info"));
-
-        //now change its level explicitly to "warn"
-        log2.setLevel(Level.toLevel("warn"));
-        
-        //retrieve the current effective runtime logger level values
-        levels = (TabularDataSupport) lm.viewEffectiveRuntimeLoggerLevels();
-        records = levels.values();
-        list = new HashMap<String,String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
-        }
-
-        //check child2's effective level is now "warn"
-        assertTrue("Test logger's level was not the expected value", 
-                    list.get(TEST_LOGGER_CHILD2).equalsIgnoreCase("warn"));
-    }
-
-    public void testViewAndSetConfigFileLoggerLevel() throws Exception
-    {
-        LoggingManagementMBean lm =null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        //retrieve the current values
-        TabularDataSupport levels = (TabularDataSupport) lm.viewConfigFileLoggerLevels();
-        Collection<Object> records = levels.values();
-        Map<String,String> list = new HashMap<String,String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
-        }
-
-        //check the 3 different types of logger definition are successfully retrieved before update
-        assertTrue("Wrong number of items in returned list", list.size() == 3);
-        assertTrue(TEST_CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_PRIORITY));
-        assertTrue(TEST_CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_LEVEL));
-        assertTrue(TEST_LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(TEST_LOGGER_LEVEL));
-
-        //check that their level is as expected
-        assertTrue(TEST_CATEGORY_PRIORITY + " logger's level was incorrect", list.get(TEST_CATEGORY_PRIORITY).equalsIgnoreCase("info"));
-        assertTrue(TEST_CATEGORY_LEVEL + " logger's level was incorrect", list.get(TEST_CATEGORY_LEVEL).equalsIgnoreCase("warn"));
-        assertTrue(TEST_LOGGER_LEVEL + " logger's level was incorrect", list.get(TEST_LOGGER_LEVEL).equalsIgnoreCase("error"));
-
-        //increase their levels a notch to test the 3 different types of logger definition are successfully updated
-        //change the category+priority to warn
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_CATEGORY_PRIORITY, "warn"));
-        //change the category+level to error
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_CATEGORY_LEVEL, "error"));
-        //change the logger+level to trace
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_LOGGER_LEVEL, "trace"));
-
-        //try an invalid level
-        assertFalse("Use of an invalid logger level was successfull", lm.setConfigFileLoggerLevel(TEST_LOGGER_LEVEL, "made.up.level"));
-
-        //try an invalid logger name
-        assertFalse("Use of an invalid logger name was successfull", lm.setConfigFileLoggerLevel("made.up.logger.name", "info"));
-
-        //retrieve the new values from the file and check them
-        levels = (TabularDataSupport) lm.viewConfigFileLoggerLevels();
-        records = levels.values();
-        list = new HashMap<String,String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
-        }
-
-        //check the 3 different types of logger definition are successfully retrieved after update
-        assertTrue("Wrong number of items in returned list", list.size() == 3);
-        assertTrue(TEST_CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_PRIORITY));
-        assertTrue(TEST_CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_LEVEL));
-        assertTrue(TEST_LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(TEST_LOGGER_LEVEL));
-
-        //check that their level is as expected after the changes
-        assertTrue(TEST_CATEGORY_PRIORITY + " logger's level was incorrect", list.get(TEST_CATEGORY_PRIORITY).equalsIgnoreCase("warn"));
-        assertTrue(TEST_CATEGORY_LEVEL + " logger's level was incorrect", list.get(TEST_CATEGORY_LEVEL).equalsIgnoreCase("error"));
-        assertTrue(TEST_LOGGER_LEVEL + " logger's level was incorrect", list.get(TEST_LOGGER_LEVEL).equalsIgnoreCase("trace"));
-    }
-    
-    public void testGetAndSetConfigFileRootLoggerLevel() throws Exception
-    {
-        LoggingManagementMBean lm =null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 0);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        //retrieve the current value
-        String level = lm.getConfigFileRootLoggerLevel();
-
-        //check the value was successfully retrieved before update
-        assertTrue("Retrieved RootLogger level was incorrect", level.equalsIgnoreCase("info"));
-
-        //try an invalid level
-        assertFalse("Use of an invalid RootLogger level was successfull", lm.setConfigFileRootLoggerLevel("made.up.level"));
-        
-        //change the level to warn
-        assertTrue("Failed to set new RootLogger level", lm.setConfigFileRootLoggerLevel("warn"));
-
-        //retrieve the current value
-        level = lm.getConfigFileRootLoggerLevel();
-
-        //check the value was successfully retrieved after update
-        assertTrue("Retrieved RootLogger level was incorrect", level.equalsIgnoreCase("warn"));
-    }
-
-    public void testGetLog4jLogWatchInterval()
-    {
-        LoggingManagementMBean lm =null;
-        try
-        {
-            lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(), 5000);
-        }
-        catch (JMException e)
-        {
-            fail("Could not create test LoggingManagementMBean");
-        }
-
-        assertTrue("Wrong value returned for logWatch period", lm.getLog4jLogWatchInterval() == 5000);
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
deleted file mode 100644
index f7d85c11a8..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
+++ /dev/null
@@ -1,153 +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.server.management;
-
-import org.apache.qpid.management.common.mbeans.UserManagement;
-import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
-import org.apache.qpid.server.security.auth.management.AMQUserManagementMBean;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-/** 
- * 
- * Tests the AMQUserManagementMBean and its interaction with the PrincipalDatabase.
- *
- */
-public class AMQUserManagementMBeanTest extends InternalBrokerBaseCase
-{
-    private PlainPasswordFilePrincipalDatabase _database;
-    private AMQUserManagementMBean _amqumMBean;
-    
-    private File _passwordFile;
-
-    private static final String TEST_USERNAME = "testuser";
-    private static final String TEST_PASSWORD = "password";
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        _database = new PlainPasswordFilePrincipalDatabase();
-        _amqumMBean = new AMQUserManagementMBean();
-        loadFreshTestPasswordFile();
-    }
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        //clean up test password/access files
-        File _oldPasswordFile = new File(_passwordFile.getAbsolutePath() + ".old");
-        _oldPasswordFile.delete();
-        _passwordFile.delete();
-
-        super.tearDown();
-    }
-
-    public void testDeleteUser()
-    {
-        assertEquals("Unexpected number of users before test", 1,_amqumMBean.viewUsers().size());
-        assertTrue("Delete should return true to flag successful delete", _amqumMBean.deleteUser(TEST_USERNAME));
-        assertEquals("Unexpected number of users after test", 0,_amqumMBean.viewUsers().size());
-    }
-
-    public void testDeleteUserWhereUserDoesNotExist()
-    {
-        assertEquals("Unexpected number of users before test", 1,_amqumMBean.viewUsers().size());
-        assertFalse("Delete should return false to flag unsuccessful delete", _amqumMBean.deleteUser("made.up.username"));
-        assertEquals("Unexpected number of users after test", 1,_amqumMBean.viewUsers().size());
-
-    }
-    
-    public void testCreateUser()
-    {
-        assertEquals("Unexpected number of users before test", 1,_amqumMBean.viewUsers().size());
-        assertTrue("Create should return true to flag successful create", _amqumMBean.createUser("newuser", "mypass"));
-        assertEquals("Unexpected number of users before test", 2,_amqumMBean.viewUsers().size());
-    }
-
-    public void testCreateUserWhereUserAlreadyExists()
-    {
-        assertEquals("Unexpected number of users before test", 1,_amqumMBean.viewUsers().size());
-        assertFalse("Create should return false to flag unsuccessful create", _amqumMBean.createUser(TEST_USERNAME, "mypass"));
-        assertEquals("Unexpected number of users before test", 1,_amqumMBean.viewUsers().size());
-    }
-
-    public void testSetPassword()
-    {
-        assertTrue("Set password should return true to flag successful change", _amqumMBean.setPassword(TEST_USERNAME, "newpassword"));
-    }
-    
-    public void testSetPasswordWhereUserDoesNotExist()
-    {
-        assertFalse("Set password should return false to flag successful change", _amqumMBean.setPassword("made.up.username", "newpassword"));
-    }
-
-    public void testViewUsers()
-    {
-        TabularData userList = _amqumMBean.viewUsers();
-
-        assertNotNull(userList);
-        assertEquals("Unexpected number of users in user list", 1, userList.size());
-        assertTrue(userList.containsKey(new Object[]{TEST_USERNAME}));
-        
-        // Check the deprecated read, write and admin items continue to exist but return false.
-        CompositeData userRec = userList.get(new Object[]{TEST_USERNAME});
-        assertTrue(userRec.containsKey(UserManagement.RIGHTS_READ_ONLY));
-        assertEquals(false, userRec.get(UserManagement.RIGHTS_READ_ONLY));
-        assertEquals(false, userRec.get(UserManagement.RIGHTS_READ_WRITE));
-        assertTrue(userRec.containsKey(UserManagement.RIGHTS_READ_WRITE));
-        assertTrue(userRec.containsKey(UserManagement.RIGHTS_ADMIN));
-        assertEquals(false, userRec.get(UserManagement.RIGHTS_ADMIN));
-    }
-
-    // ============================ Utility methods =========================
-
-    private void loadFreshTestPasswordFile()
-    {
-        try
-        {
-            if(_passwordFile == null)
-            {
-                _passwordFile = File.createTempFile(this.getClass().getName(),".password");
-            }
-
-            BufferedWriter passwordWriter = new BufferedWriter(new FileWriter(_passwordFile, false));
-            passwordWriter.write(TEST_USERNAME + ":" + TEST_PASSWORD);
-            passwordWriter.newLine();
-            passwordWriter.flush();
-            passwordWriter.close();
-            _database.setPasswordFile(_passwordFile.toString());
-            _amqumMBean.setPrincipalDatabase(_database);
-        }
-        catch (IOException e)
-        {
-            fail("Unable to create test password file: " + e.getMessage());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
deleted file mode 100644
index fe9bcc57a6..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ /dev/null
@@ -1,146 +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.server.protocol;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.management.common.mbeans.ManagedConnection;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-
-
-/** Test class to test MBean operations for AMQMinaProtocolSession. */
-public class AMQProtocolSessionMBeanTest extends InternalBrokerBaseCase
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(AMQProtocolSessionMBeanTest.class);
-
-    private MessageStore _messageStore = new TestableMemoryMessageStore();
-    private AMQProtocolEngine _protocolSession;
-    private AMQChannel _channel;
-    private AMQProtocolSessionMBean _mbean;
-
-    public void testChannels() throws Exception
-    {
-        // check the channel count is correct
-        int channelCount = _mbean.channels().size();
-        assertTrue(channelCount == 1);
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue_" + System.currentTimeMillis()),
-                                                            false,
-                                                            new AMQShortString("test"),
-                                                            true,
-                                                            false, _protocolSession.getVirtualHost(), null);
-        AMQChannel channel = new AMQChannel(_protocolSession, 2, _messageStore);
-        channel.setDefaultQueue(queue);
-        _protocolSession.addChannel(channel);
-        channelCount = _mbean.channels().size();
-        assertTrue(channelCount == 2);
-
-        // general properties test
-        _protocolSession.setMaximumNumberOfChannels(1000L);
-        assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L);
-
-        // check APIs
-        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _messageStore);
-        channel3.setLocalTransactional();
-        _protocolSession.addChannel(channel3);
-        _mbean.rollbackTransactions(2);
-        _mbean.rollbackTransactions(3);
-        _mbean.commitTransactions(2);
-        _mbean.commitTransactions(3);
-
-        // This should throw exception, because the channel does't exist
-        try
-        {
-            _mbean.commitTransactions(4);
-            fail();
-        }
-        catch (JMException ex)
-        {
-            log.debug("expected exception is thrown :" + ex.getMessage());
-        }
-
-        // check channels() return type conveys flow control blocking status correctly
-        AMQChannel channel4 = new AMQChannel(_protocolSession, 4, _messageStore);
-        _protocolSession.addChannel(channel4);
-        channel4.setDefaultQueue(queue);
-        
-        final String blocking = ManagedConnection.FLOW_BLOCKED;
-        TabularData channels = _mbean.channels();
-        CompositeData chan4result = channels.get(new Integer[]{4});
-        assertNotNull(chan4result);
-        assertEquals("Flow should not have been blocked", false, chan4result.get(blocking));
-        
-        channel4.block(queue);
-        channels = _mbean.channels();
-        chan4result = channels.get(new Integer[]{4});
-        assertNotNull(chan4result);
-        assertEquals("Flow should have been blocked", true, chan4result.get(blocking));    
-        
-        channel4.unblock(queue);
-        channels = _mbean.channels();
-        chan4result = channels.get(new Integer[]{4});
-        assertNotNull(chan4result);
-        assertEquals("Flow should have been unblocked", false, chan4result.get(blocking));  
-        
-        // check if closing of session works
-        _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));
-            fail();
-        }
-        catch (AMQException ex)
-        {
-            log.debug("expected exception is thrown :" + ex.getMessage());
-        }
-    }
-
-    @Override
-    public  void setUp() throws Exception
-    {
-        super.setUp();
-
-        VirtualHost vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
-        _protocolSession = new InternalTestProtocolSession(vhost);
-
-        _channel = new AMQChannel(_protocolSession, 1, _messageStore);
-        _protocolSession.addChannel(_channel);
-        _mbean = (AMQProtocolSessionMBean) _protocolSession.getManagedObject();
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
deleted file mode 100644
index 25d35aab16..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ /dev/null
@@ -1,348 +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.server.queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.message.AMQMessage;
-import org.apache.qpid.server.message.MessageMetaData;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-
-import javax.management.Notification;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
-/** This class tests all the alerts an AMQQueue can throw based on threshold values of different parameters */
-public class AMQQueueAlertTest extends InternalBrokerBaseCase
-{
-    private final static long MAX_MESSAGE_COUNT = 50;
-    private final static long MAX_MESSAGE_AGE = 250;   // 0.25 sec
-    private final static long MAX_MESSAGE_SIZE = 2000;  // 2 KB
-    private final static long MAX_QUEUE_DEPTH = 10000;  // 10 KB
-    private AMQQueueMBean _queueMBean;
-    private static final SubscriptionFactoryImpl SUBSCRIPTION_FACTORY = SubscriptionFactoryImpl.INSTANCE;
-
-    /**
-     * Tests if the alert gets thrown when message count increases the threshold limit
-     *
-     * @throws Exception
-     */
-    public void testMessageCountAlert() throws Exception
-    {
-        setSession(new InternalTestProtocolSession(getVirtualHost()));
-        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
-        getSession().addChannel(channel);
-
-        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, false,
-                getVirtualHost(), null));
-        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
-
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-
-        sendMessages(channel, MAX_MESSAGE_COUNT, 256l);
-        assertTrue(_queueMBean.getMessageCount() == MAX_MESSAGE_COUNT);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_COUNT_ALERT.name()));
-    }
-
-    /**
-     * Tests if the Message Size alert gets thrown when message of higher than threshold limit is sent
-     *
-     * @throws Exception
-     */
-    public void testMessageSizeAlert() throws Exception
-    {
-        setSession(new InternalTestProtocolSession(getVirtualHost()));
-        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
-        getSession().addChannel(channel);
-
-        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, false,
-                getVirtualHost(), null));
-        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumMessageSize(MAX_MESSAGE_SIZE);
-
-        sendMessages(channel, 1, MAX_MESSAGE_SIZE * 2);
-        assertTrue(_queueMBean.getMessageCount() == 1);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_SIZE_ALERT.name()));
-    }
-
-    /**
-     * Tests if Queue Depth alert is thrown when queue depth reaches the threshold value
-     *
-     * Based on FT-402 subbmitted by client
-     *
-     * @throws Exception
-     */
-    public void testQueueDepthAlertNoSubscriber() throws Exception
-    {
-        setSession(new InternalTestProtocolSession(getVirtualHost()));
-        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
-        getSession().addChannel(channel);
-
-        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, false,
-                getVirtualHost(), null));
-        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
-
-        while (getQueue().getQueueDepth() < MAX_QUEUE_DEPTH)
-        {
-            sendMessages(channel, 1, MAX_MESSAGE_SIZE);
-        }
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.QUEUE_DEPTH_ALERT.name()));
-    }
-
-    /**
-     * Tests if MESSAGE AGE alert is thrown, when a message is in the queue for time higher than threshold value of
-     * message age
-     *
-     * Alternative test to FT-401 provided by client
-     *
-     * @throws Exception
-     */
-    public void testMessageAgeAlert() throws Exception
-    {
-        setSession(new InternalTestProtocolSession(getVirtualHost()));
-        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
-        getSession().addChannel(channel);
-
-        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, false,
-                getVirtualHost(), null));
-        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumMessageAge(MAX_MESSAGE_AGE);
-
-        sendMessages(channel, 1, MAX_MESSAGE_SIZE);
-
-        // Ensure message sits on queue long enough to age.
-        Thread.sleep(MAX_MESSAGE_AGE * 2);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull("Last notification was null", lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_AGE_ALERT.name()));
-    }
-
-    /*
-     This test sends some messages to the queue with subscribers needing message to be acknowledged.
-     The messages will not be acknowledged and will be required twice. Why we are checking this is because
-     the bug reported said that the queueDepth keeps increasing when messages are requeued.
-     // TODO - queue depth now includes unacknowledged messages so does not go down when messages are delivered
-
-     The QueueDepth should decrease when messages are delivered from the queue (QPID-408)
-    */
-    public void testQueueDepthAlertWithSubscribers() throws Exception
-    {
-        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
-        getSession().addChannel(channel);
-
-        // Create queue
-        setQueue(getNewQueue());
-        Subscription subscription =
-                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), getSession(), new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
-
-        getQueue().registerSubscription(
-                subscription, false);
-
-        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
-        _queueMBean.setMaximumMessageCount(9999l);   // Set a high value, because this is not being tested
-        _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
-
-        // Send messages(no of message to be little more than what can cause a Queue_Depth alert)
-        int messageCount = Math.round(MAX_QUEUE_DEPTH / MAX_MESSAGE_SIZE) + 10;
-        long totalSize = (messageCount * MAX_MESSAGE_SIZE);
-        sendMessages(channel, messageCount, MAX_MESSAGE_SIZE);
-
-        // Check queueDepth. There should be no messages on the queue and as the subscriber is listening
-        // so there should be no Queue_Deoth alert raised
-        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-        Notification lastNotification = _queueMBean.getLastNotification();
-//        assertNull(lastNotification);
-
-        // Kill the subscriber and check for the queue depth values.
-        // Messages are unacknowledged, so those should get requeued. All messages should be on the Queue
-        getQueue().unregisterSubscription(subscription);
-        channel.requeue();
-
-        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-
-        lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.QUEUE_DEPTH_ALERT.name()));
-
-        // Connect a consumer again and check QueueDepth values. The queue should get emptied.
-        // Messages will get delivered but still are unacknowledged.
-        Subscription subscription2 =
-                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), getSession(), new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
-
-        getQueue().registerSubscription(
-                subscription2, false);
-
-        while (getQueue().getUndeliveredMessageCount()!= 0)
-        {
-            Thread.sleep(100);
-        }
-//        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
-
-        // Kill the subscriber again. Now those messages should get requeued again. Check if the queue depth
-        // value is correct.
-        getQueue().unregisterSubscription(subscription2);
-        channel.requeue();
-
-        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-        getSession().closeSession();
-
-        // Check the clear queue
-        _queueMBean.clearQueue();
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
-    }
-
-    protected IncomingMessage message(final boolean immediate, long size) throws AMQException
-    {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
-        ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-        contentHeaderBody.setProperties(props);
-        contentHeaderBody.setBodySize(size);   // in bytes
-        IncomingMessage message = new IncomingMessage(publish);
-        message.setContentHeaderBody(contentHeaderBody);
-
-        return message;
-    }
-
-    @Override
-    protected void configure()
-    {
-        // Increase Alert Check period
-        getConfiguration().setHousekeepingCheckPeriod(200);
-    }
-
-    private void sendMessages(AMQChannel channel, long messageCount, final long size) throws AMQException
-    {
-        IncomingMessage[] messages = new IncomingMessage[(int) messageCount];
-        MessageMetaData[] metaData = new MessageMetaData[(int) messageCount];
-        for (int i = 0; i < messages.length; i++)
-        {
-            messages[i] = message(false, size);
-            ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-            qs.add(getQueue());
-            metaData[i] = messages[i].headersReceived(System.currentTimeMillis());
-            messages[i].setStoredMessage(getMessageStore().addMessage(metaData[i]));
-
-            messages[i].enqueue(qs);
-
-        }
-
-        for (int i = 0; i < messageCount; i++)
-        {
-            ContentChunk contentChunk = new ContentChunk()
-            {
-                private byte[] _data = new byte[(int)size];
-
-                public int getSize()
-                {
-                    return (int) size;
-                }
-
-                public byte[] getData()
-                {
-                    return _data;
-                }
-
-                public void reduceToFit()
-                {
-                }
-            };
-
-            messages[i].addContentBodyFrame(contentChunk);
-            messages[i].getStoredMessage().addContent(0, ByteBuffer.wrap(contentChunk.getData()));
-
-            getQueue().enqueue(new AMQMessage(messages[i].getStoredMessage()));
-        }
-    }
-
-    private AMQQueue getNewQueue() throws AMQException
-    {
-        return AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue" + Math.random()),
-                            false,
-                            new AMQShortString("AMQueueAlertTest"),
-                            false,
-                            false, getVirtualHost(), null);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
deleted file mode 100644
index 89c14c40a0..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ /dev/null
@@ -1,546 +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.server.queue;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import javax.management.JMException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.TabularData;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.management.common.mbeans.ManagedQueue;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.message.AMQMessage;
-import org.apache.qpid.server.message.MessageMetaData;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.subscription.SubscriptionFactory;
-import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-
-/**
- * Test class to test AMQQueueMBean attributes and operations
- */
-public class AMQQueueMBeanTest extends InternalBrokerBaseCase
-{
-    private static long MESSAGE_SIZE = 1000;
-    private AMQQueueMBean _queueMBean;
-    private static final SubscriptionFactoryImpl SUBSCRIPTION_FACTORY = SubscriptionFactoryImpl.INSTANCE;
-
-    public void testMessageCountTransient() throws Exception
-    {
-        int messageCount = 10;
-        sendMessages(messageCount, false);
-        assertTrue(_queueMBean.getMessageCount() == messageCount);
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        long queueDepth = (messageCount * MESSAGE_SIZE);
-        assertTrue(_queueMBean.getQueueDepth() == queueDepth);
-
-        _queueMBean.deleteMessageFromTop();
-        assertTrue(_queueMBean.getMessageCount() == (messageCount - 1));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        _queueMBean.clearQueue();
-        assertEquals(0,(int)_queueMBean.getMessageCount());
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        //Ensure that the data has been removed from the Store
-        verifyBrokerState();
-    }
-
-    public void testMessageCountPersistent() throws Exception
-    {
-        int messageCount = 10;
-        sendMessages(messageCount, true);
-        assertEquals("", messageCount, _queueMBean.getMessageCount().intValue());
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        long queueDepth = (messageCount * MESSAGE_SIZE);
-        assertTrue(_queueMBean.getQueueDepth() == queueDepth);
-
-        _queueMBean.deleteMessageFromTop();
-        assertTrue(_queueMBean.getMessageCount() == (messageCount - 1));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        _queueMBean.clearQueue();
-        assertTrue(_queueMBean.getMessageCount() == 0);
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        //Ensure that the data has been removed from the Store
-        verifyBrokerState();
-    }
-
-    public void testDeleteMessages() throws Exception
-    {
-        int messageCount = 10;
-        sendMessages(messageCount, true);
-        assertEquals("", messageCount, _queueMBean.getMessageCount().intValue());
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        long queueDepth = (messageCount * MESSAGE_SIZE);
-        assertTrue(_queueMBean.getQueueDepth() == queueDepth);
-
-        //delete first message
-        _queueMBean.deleteMessages(1L,1L);
-        assertTrue(_queueMBean.getMessageCount() == (messageCount - 1));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        try
-        {
-            _queueMBean.viewMessageContent(1L);
-            fail("Message should no longer be on the queue");
-        }
-        catch(Exception e)
-        {
-
-        }
-
-        //delete last message, leaving 2nd to 9th
-        _queueMBean.deleteMessages(10L,10L);
-        assertTrue(_queueMBean.getMessageCount() == (messageCount - 2));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        try
-        {
-            _queueMBean.viewMessageContent(10L);
-            fail("Message should no longer be on the queue");
-        }
-        catch(Exception e)
-        {
-
-        }
-
-        //delete remaining messages, leaving none
-        _queueMBean.deleteMessages(2L,9L);
-        assertTrue(_queueMBean.getMessageCount() == (0));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        //Ensure that the data has been removed from the Store
-        verifyBrokerState();
-    }
-
-
-    // todo: collect to a general testing class -duplicated from Systest/MessageReturntest
-    private void verifyBrokerState()
-    {
-
-        TestableMemoryMessageStore store = (TestableMemoryMessageStore) getVirtualHost().getMessageStore();
-
-        // Unlike MessageReturnTest there is no need for a delay as there this thread does the clean up.
-
-        assertEquals("Store should have no messages:" + store.getMessageCount(), 0, store.getMessageCount());
-    }
-
-    public void testConsumerCount() throws AMQException
-    {
-
-        assertTrue(getQueue().getActiveConsumerCount() == 0);
-        assertTrue(_queueMBean.getActiveConsumerCount() == 0);
-
-
-        InternalTestProtocolSession protocolSession = new InternalTestProtocolSession(getVirtualHost());
-
-        AMQChannel channel = new AMQChannel(protocolSession, 1, getMessageStore());
-        protocolSession.addChannel(channel);
-
-        Subscription subscription =
-                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), protocolSession, new AMQShortString("test"), false, null, false, channel.getCreditManager());
-
-        getQueue().registerSubscription(subscription, false);
-        assertEquals(1,(int)_queueMBean.getActiveConsumerCount());
-
-
-        SubscriptionFactory subscriptionFactory = SUBSCRIPTION_FACTORY;
-        Subscription s1 = subscriptionFactory.createSubscription(channel.getChannelId(),
-                                                                 protocolSession,
-                                                                 new AMQShortString("S1"),
-                                                                 false,
-                                                                 null,
-                                                                 true,
-                channel.getCreditManager());
-
-        Subscription s2 = subscriptionFactory.createSubscription(channel.getChannelId(),
-                                                                 protocolSession,
-                                                                 new AMQShortString("S2"),
-                                                                 false,
-                                                                 null,
-                                                                 true,
-                channel.getCreditManager());
-        getQueue().registerSubscription(s1,false);
-        getQueue().registerSubscription(s2,false);
-        assertTrue(_queueMBean.getActiveConsumerCount() == 3);
-        assertTrue(_queueMBean.getConsumerCount() == 3);
-
-        s1.close();
-        assertEquals(2, (int) _queueMBean.getActiveConsumerCount());
-        assertTrue(_queueMBean.getConsumerCount() == 3);
-    }
-
-    public void testGeneralProperties() throws Exception
-    {
-        long maxQueueDepth = 1000; // in bytes
-        _queueMBean.setMaximumMessageCount(50000l);
-        _queueMBean.setMaximumMessageSize(2000l);
-        _queueMBean.setMaximumQueueDepth(maxQueueDepth);
-
-        assertEquals("Max MessageCount not set",50000,_queueMBean.getMaximumMessageCount().longValue());
-        assertEquals("Max MessageSize not set",2000, _queueMBean.getMaximumMessageSize().longValue());
-        assertEquals("Max QueueDepth not set",maxQueueDepth, _queueMBean.getMaximumQueueDepth().longValue());
-
-        assertEquals("Queue Name does not match", new AMQShortString(getName()), _queueMBean.getName());
-        assertFalse("AutoDelete should not be set.",_queueMBean.isAutoDelete());
-        assertFalse("Queue should not be durable.",_queueMBean.isDurable());
-
-        //set+get exclusivity using the mbean, and also verify it is actually updated in the queue
-        _queueMBean.setExclusive(true);
-        assertTrue("Exclusive property should be true.",_queueMBean.isExclusive());
-        assertTrue("Exclusive property should be true.", getQueue().isExclusive());
-        _queueMBean.setExclusive(false);
-        assertFalse("Exclusive property should be false.",_queueMBean.isExclusive());
-        assertFalse("Exclusive property should be false.", getQueue().isExclusive());
-    }
-
-    /**
-     * Tests view messages with two test messages.  The first message is non-persistent, the second persistent
-     * and has timestamp/expiration.
-     *
-     */
-    public void testViewMessages() throws Exception
-    {
-        sendMessages(1, false);
-        final Date msg2Timestamp = new Date();
-        final Date msg2Expiration  = new Date(msg2Timestamp.getTime() + 1000);
-        sendMessages(1, true, msg2Timestamp.getTime(), msg2Expiration.getTime());
-
-        final TabularData tab = _queueMBean.viewMessages(1l, 2l);
-        assertEquals("Unexpected number of rows in table", 2, tab.size());
-        final Iterator<CompositeDataSupport> rowItr = (Iterator<CompositeDataSupport>) tab.values().iterator();
-
-        // Check row1
-        final CompositeDataSupport row1 = rowItr.next();
-        assertEquals("Message should have AMQ message id",  1l, row1.get(ManagedQueue.MSG_AMQ_ID));
-        assertNotNull("Expected message header array", row1.get(ManagedQueue.MSG_HEADER));
-        final Map<String, String> row1Headers = headerArrayToMap((String[])row1.get(ManagedQueue.MSG_HEADER));
-        assertEquals("Unexpected JMSPriority within header", "Non_Persistent", row1Headers.get("JMSDeliveryMode"));
-        assertEquals("Unexpected JMSTimestamp within header",  "null",  row1Headers.get("JMSTimestamp"));
-        assertEquals("Unexpected JMSExpiration within header", "null", row1Headers.get("JMSExpiration"));
-
-        final CompositeDataSupport row2 = rowItr.next();
-        assertEquals("Message should have AMQ message id",  2l, row2.get(ManagedQueue.MSG_AMQ_ID));
-        assertNotNull("Expected message header array", row2.get(ManagedQueue.MSG_HEADER));
-        final Map<String, String> row2Headers = headerArrayToMap((String[])row2.get(ManagedQueue.MSG_HEADER));
-        assertEquals("Unexpected JMSPriority within header", "Persistent", row2Headers.get("JMSDeliveryMode"));
-        final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(AMQQueueMBean.JMSTIMESTAMP_DATETIME_FORMAT);
-        assertEquals("Unexpected JMSTimestamp within header", msg2Timestamp,
-                     simpleDateFormat.parse(row2Headers.get("JMSTimestamp")));
-        assertEquals("Unexpected JMSExpiration within header", msg2Expiration,
-                     simpleDateFormat.parse(row2Headers.get("JMSExpiration")));
-    }
-
-    public void testViewMessageWithIllegalStartEndRanges() throws Exception
-    {
-        try
-        {
-            _queueMBean.viewMessages(0L, 3L);
-            fail();
-        }
-        catch (JMException ex)
-        {
-            // PASS
-        }
-
-        try
-        {
-            _queueMBean.viewMessages(2L, 1L);
-            fail();
-        }
-        catch (JMException ex)
-        {
-            // PASS
-        }
-
-        try
-        {
-            _queueMBean.viewMessages(-1L, 1L);
-            fail();
-        }
-        catch (JMException ex)
-        {
-            // PASS
-        }
-
-        try
-        {
-            long end = Integer.MAX_VALUE;
-            end+=2;
-            _queueMBean.viewMessages(1L, end);
-            fail("Expected Exception due to oversized(> 2^31) message range");
-        }
-        catch (JMException ex)
-        {
-            // PASS
-        }
-    }
-
-    public void testViewMessageContent() throws Exception
-    {
-        final List<AMQMessage> sentMessages = sendMessages(1, true);
-        final Long id = sentMessages.get(0).getMessageId();
-
-        final CompositeData messageData = _queueMBean.viewMessageContent(id);
-        assertNotNull(messageData);
-    }
-
-    public void testViewMessageContentWithUnknownMessageId() throws Exception
-    {
-        final List<AMQMessage> sentMessages = sendMessages(1, true);
-        final Long id = sentMessages.get(0).getMessageId();
-
-        try
-        {
-            _queueMBean.viewMessageContent(id + 1);
-            fail();
-        }
-        catch (JMException ex)
-        {
-            // PASS
-        }
-    }
-
-    public void testFlowControlProperties() throws Exception
-    {
-        assertTrue(_queueMBean.getCapacity() == 0);
-        assertTrue(_queueMBean.getFlowResumeCapacity() == 0);
-        assertFalse(_queueMBean.isFlowOverfull());
-
-        //capacity currently 0, try setting FlowResumeCapacity above this
-        try
-        {
-            _queueMBean.setFlowResumeCapacity(1L);
-            fail("Should have failed to allow setting FlowResumeCapacity above Capacity");
-        }
-        catch (IllegalArgumentException ex)
-        {
-            //expected exception
-            assertTrue(_queueMBean.getFlowResumeCapacity() == 0);
-        }
-
-        //add a message to the queue
-        sendMessages(1, true);
-
-        //(FlowResume)Capacity currently 0, set both to 2
-        _queueMBean.setCapacity(2L);
-        assertTrue(_queueMBean.getCapacity() == 2L);
-        _queueMBean.setFlowResumeCapacity(2L);
-        assertTrue(_queueMBean.getFlowResumeCapacity() == 2L);
-
-        //Try setting Capacity below FlowResumeCapacity
-        try
-        {
-            _queueMBean.setCapacity(1L);
-            fail("Should have failed to allow setting Capacity below FlowResumeCapacity");
-        }
-        catch (IllegalArgumentException ex)
-        {
-            //expected exception
-            assertTrue(_queueMBean.getCapacity() == 2);
-        }
-
-        //create a channel and use it to exercise the capacity check mechanism
-        AMQChannel channel = new AMQChannel(getSession(), 1, getMessageStore());
-        getQueue().checkCapacity(channel);
-
-        assertTrue(_queueMBean.isFlowOverfull());
-        assertTrue(channel.getBlocking());
-
-        //set FlowResumeCapacity to MESSAGE_SIZE and check queue is now underfull and channel unblocked
-        _queueMBean.setCapacity(MESSAGE_SIZE);//must increase capacity too
-        _queueMBean.setFlowResumeCapacity(MESSAGE_SIZE);
-
-        assertFalse(_queueMBean.isFlowOverfull());
-        assertFalse(channel.getBlocking());
-    }
-
-    public void testMaximumDeliveryCount() throws IOException
-    {
-        assertEquals("Unexpected default maximum delivery count", Integer.valueOf(0), _queueMBean.getMaximumDeliveryCount());
-    }
-
-    public void testViewAllMessages() throws Exception
-    {
-        final int messageCount = 5;
-        sendPersistentMessages(messageCount);
-
-
-        final TabularData messageTable = _queueMBean.viewMessages(1L, 5L);
-        assertNotNull("Message table should not be null", messageTable);
-        assertEquals("Unexpected number of rows", messageCount, messageTable.size());
-
-
-        final Iterator rowIterator = messageTable.values().iterator();
-        // Get its message ID
-        final CompositeDataSupport row1 = (CompositeDataSupport) rowIterator.next();
-        final Long msgId = (Long) row1.get("AMQ MessageId");
-        final Long queuePosition = (Long) row1.get("Queue Position");
-        final Integer deliveryCount = (Integer) row1.get("Delivery Count");
-
-        assertNotNull("Row should have value for queue position", queuePosition);
-        assertNotNull("Row should have value for msgid", msgId);
-        assertNotNull("Row should have value for deliveryCount", deliveryCount);
-    }
-
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        _queueMBean = new AMQQueueMBean(getQueue());
-    }
-
-    public void tearDown()
-    {
-        ApplicationRegistry.remove();
-    }
-
-    private void sendPersistentMessages(int messageCount) throws AMQException
-    {
-        sendMessages(messageCount, true);
-        assertEquals("Expected " + messageCount + " messages in the queue", messageCount, _queueMBean
-                .getMessageCount().intValue());
-    }
-
-    private List<AMQMessage> sendMessages(int messageCount, boolean persistent) throws AMQException
-    {
-        return sendMessages(messageCount, persistent, 0l, 0l);
-    }
-
-    private List<AMQMessage> sendMessages(int messageCount, boolean persistent, long timestamp, long expiration) throws AMQException
-    {
-        final List<AMQMessage> sentMessages = new ArrayList<AMQMessage>();
-
-        for (int i = 0; i < messageCount; i++)
-        {
-            IncomingMessage currentMessage = createIncomingMessage(false, persistent, timestamp, expiration);
-            ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-            qs.add(getQueue());
-            currentMessage.enqueue(qs);
-
-            // route header
-            MessageMetaData mmd = currentMessage.headersReceived(System.currentTimeMillis());
-
-            // Add the message to the store so we have something to test later
-            currentMessage.setStoredMessage(getMessageStore().addMessage(mmd));
-            ContentChunk chunk = getSession().getMethodRegistry()
-                                               .getProtocolVersionMethodConverter()
-                                               .convertToContentChunk(
-                                               new ContentBody(new byte[(int) MESSAGE_SIZE]));
-            currentMessage.addContentBodyFrame(chunk);
-            currentMessage.getStoredMessage().addContent(0, ByteBuffer.wrap(chunk.getData()));
-
-            AMQMessage m = new AMQMessage(currentMessage.getStoredMessage());
-            for(BaseQueue q : currentMessage.getDestinationQueues())
-            {
-                q.enqueue(m);
-            }
-
-           sentMessages.add(m);
-        }
-
-        return sentMessages;
-    }
-
-    private IncomingMessage createIncomingMessage(final boolean immediate, boolean persistent, long timestamp, long expiration) throws AMQException
-    {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
-        ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
-        contentHeaderBody.setBodySize(MESSAGE_SIZE);   // in bytes
-        final BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-        contentHeaderBody.setProperties(props);
-        props.setDeliveryMode((byte) (persistent ? 2 : 1));
-        if (timestamp > 0)
-        {
-            props.setTimestamp(timestamp);
-        }
-        if (expiration > 0)
-        {
-            props.setExpiration(expiration);
-        }
-        IncomingMessage msg = new IncomingMessage(publish);
-        msg.setContentHeaderBody(contentHeaderBody);
-        return msg;
-    }
-
-    /**
-    *
-    * Utility method to convert array of Strings in the form x = y into a
-    * map with key/value x =&gt; y.
-    *
-    */
-   private Map<String,String> headerArrayToMap(final String[] headerArray)
-   {
-       final Map<String, String> headerMap = new HashMap<String, String>();
-       final List<String> headerList = Arrays.asList(headerArray);
-       for (Iterator<String> iterator = headerList.iterator(); iterator.hasNext();)
-       {
-           final String nameValuePair = iterator.next();
-           final String[] nameValue = nameValuePair.split(" *= *", 2);
-           headerMap.put(nameValue[0], nameValue[1]);
-       }
-       return headerMap;
-   }
-
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index afaa417415..d3eb61a544 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -29,13 +29,14 @@ import org.apache.qpid.server.configuration.QueueConfigType;
 import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.security.AuthorizationHolder;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -51,7 +52,6 @@ public class MockAMQQueue implements AMQQueue
     private AuthorizationHolder _authorizationHolder;
 
     private AMQSessionModel _exclusiveOwner;
-    private AMQShortString _owner;
     private List<Binding> _bindings = new CopyOnWriteArrayList<Binding>();
     private boolean _autoDelete;
 
@@ -98,7 +98,12 @@ public class MockAMQQueue implements AMQQueue
                 return "[MockAMQQueue]";
             }
 
-        }; 
+        };
+    }
+
+    public long getUnackedMessageBytes()
+    {
+        return 0;
     }
 
     public ConfigStore getConfigStore()
@@ -121,6 +126,16 @@ public class MockAMQQueue implements AMQQueue
         return 0;
     }
 
+    public long getTotalDequeueCount()
+    {
+        return 0;
+    }
+
+    public long getTotalEnqueueCount()
+    {
+        return 0;
+    }
+
     public int getBindingCountHigh()
     {
         return 0;
@@ -219,12 +234,27 @@ public class MockAMQQueue implements AMQQueue
 
     public void registerSubscription(Subscription subscription, boolean exclusive) throws AMQException
     {
-      
+
     }
 
     public void unregisterSubscription(Subscription subscription) throws AMQException
     {
-      
+
+    }
+
+    public Collection<Subscription> getConsumers()
+    {
+        return Collections.emptyList();
+    }
+
+    public void addSubscriptionRegistrationListener(final SubscriptionRegistrationListener listener)
+    {
+
+    }
+
+    public void removeSubscriptionRegistrationListener(final SubscriptionRegistrationListener listener)
+    {
+
     }
 
     public int getConsumerCount()
@@ -283,7 +313,7 @@ public class MockAMQQueue implements AMQQueue
     }
 
     public int delete() throws AMQException
-    {        
+    {
        _deleted = true;
        return getMessageCount();
     }
@@ -356,21 +386,6 @@ public class MockAMQQueue implements AMQQueue
         return null;
     }
 
-    public void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
-    {
-      
-    }
-
-    public void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
-    {
-      
-    }
-
-    public void removeMessagesFromQueue(long fromMessageId, long toMessageId)
-    {
-      
-    }
-
     public long getMaximumMessageSize()
     {
         return 0;
@@ -378,7 +393,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setMaximumMessageSize(long value)
     {
-      
+
     }
 
     public long getMaximumMessageCount()
@@ -388,7 +403,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setMaximumMessageCount(long value)
     {
-      
+
     }
 
     public long getMaximumQueueDepth()
@@ -398,7 +413,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setMaximumQueueDepth(long value)
     {
-      
+
     }
 
     public long getMaximumMessageAge()
@@ -408,7 +423,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setMaximumMessageAge(long maximumMessageAge)
     {
-      
+
     }
 
     public long getMinimumAlertRepeatGap()
@@ -418,7 +433,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void deleteMessageFromTop()
     {
-      
+
     }
 
     public long clearQueue()
@@ -429,7 +444,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void checkMessageStatus() throws AMQException
     {
-      
+
     }
 
     public Set<NotificationCheck> getNotificationChecks()
@@ -439,22 +454,22 @@ public class MockAMQQueue implements AMQQueue
 
     public void flushSubscription(Subscription sub) throws AMQException
     {
-      
+
     }
 
     public void deliverAsync(Subscription sub)
     {
-      
+
     }
 
     public void deliverAsync()
     {
-      
+
     }
 
     public void stop()
     {
-      
+
     }
 
     public boolean isExclusive()
@@ -469,7 +484,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setAlternateExchange(Exchange exchange)
     {
-      
+
     }
 
     public Map<String, Object> getArguments()
@@ -481,11 +496,6 @@ public class MockAMQQueue implements AMQQueue
     {
     }
 
-    public ManagedObject getManagedObject()
-    {
-        return null;
-    }
-
     public int compareTo(AMQQueue o)
     {
         return 0;
@@ -503,7 +513,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setCapacity(long capacity)
     {
-      
+
     }
 
     public long getFlowResumeCapacity()
@@ -513,7 +523,7 @@ public class MockAMQQueue implements AMQQueue
 
     public void setFlowResumeCapacity(long flowResumeCapacity)
     {
-      
+
     }
 
     public void configure(ConfigurationPlugin config)
@@ -546,12 +556,6 @@ public class MockAMQQueue implements AMQQueue
         _exclusiveOwner = exclusiveOwner;
     }
 
-
-    public String getResourceName()
-    {
-        return _name.toString();
-    }
-
     public boolean isOverfull()
     {
         return false;
@@ -582,7 +586,7 @@ public class MockAMQQueue implements AMQQueue
         return 0;
     }
 
-    public void decrementUnackedMsgCount()
+    public void decrementUnackedMsgCount(QueueEntry queueEntry)
     {
 
     }
@@ -599,7 +603,6 @@ public class MockAMQQueue implements AMQQueue
 
     public void setExclusive(boolean exclusive)
     {
-
     }
 
     public int getMaximumDeliveryCount()
@@ -611,11 +614,23 @@ public class MockAMQQueue implements AMQQueue
     {
     }
 
-    public void setAlternateExchange(String exchangeName)
+    public void visit(final QueueEntryVisitor visitor)
+    {
+    }
+
+    @Override
+    public void setNotificationListener(NotificationListener listener)
     {
     }
 
-    public void visit(final Visitor visitor)
+    @Override
+    public void setDescription(String description)
     {
     }
+
+    @Override
+    public String getDescription()
+    {
+        return null;
+    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
new file mode 100644
index 0000000000..df2de7f0e0
--- /dev/null
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
@@ -0,0 +1,106 @@
+/*
+ *
+ * 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.queue;
+
+import static org.mockito.Matchers.contains;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_AGE_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_COUNT_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_SIZE_ALERT;
+import static org.apache.qpid.server.queue.NotificationCheck.QUEUE_DEPTH_ALERT;
+
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.queue.AMQQueue.NotificationListener;
+
+public class NotificationCheckTest extends TestCase
+{
+
+    private ServerMessage<?> _message = mock(ServerMessage.class);
+    private AMQQueue _queue = mock(AMQQueue.class);
+    private NotificationListener _listener = mock(NotificationListener.class);
+
+    public void testMessageCountAlertFires() throws Exception
+    {
+        when(_queue.getMaximumMessageCount()).thenReturn(1000l);
+        when(_queue.getMessageCount()).thenReturn(999, 1000, 1001);
+
+        MESSAGE_COUNT_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verifyZeroInteractions(_listener);
+
+        MESSAGE_COUNT_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(MESSAGE_COUNT_ALERT), eq(_queue), eq("1000: Maximum count on queue threshold (1000) breached."));
+
+        MESSAGE_COUNT_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(MESSAGE_COUNT_ALERT), eq(_queue), eq("1001: Maximum count on queue threshold (1000) breached."));
+    }
+
+    public void testMessageSizeAlertFires() throws Exception
+    {
+        when(_queue.getMaximumMessageSize()).thenReturn(1024l);
+        when(_message.getSize()).thenReturn(1023l, 1024l, 1025l);
+
+        MESSAGE_SIZE_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verifyZeroInteractions(_listener);
+
+        MESSAGE_SIZE_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(MESSAGE_SIZE_ALERT), eq(_queue), contains("1024b : Maximum message size threshold (1024) breached."));
+
+        MESSAGE_SIZE_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(MESSAGE_SIZE_ALERT), eq(_queue), contains("1025b : Maximum message size threshold (1024) breached."));
+    }
+
+    public void testMessageAgeAlertFires() throws Exception
+    {
+        long now = System.currentTimeMillis();
+        when(_queue.getMaximumMessageAge()).thenReturn(1000l);
+        when(_queue.getOldestMessageArrivalTime()).thenReturn(now, now - 15000);
+
+        MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verifyZeroInteractions(_listener);
+
+        MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        // Uses contains as first part of message is nondeterministic
+        verify(_listener).notifyClients(eq(MESSAGE_AGE_ALERT), eq(_queue), contains("s : Maximum age on queue threshold (1s) breached."));
+    }
+
+    public void testQueueDepthAlertFires() throws Exception
+    {
+        when(_queue.getMaximumQueueDepth()).thenReturn(1024l);
+        when(_queue.getQueueDepth()).thenReturn(1023l, 1024l, 2048l);
+
+        QUEUE_DEPTH_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verifyZeroInteractions(_listener);
+
+        QUEUE_DEPTH_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(QUEUE_DEPTH_ALERT), eq(_queue), eq("1Kb : Maximum queue depth threshold (1Kb) breached."));
+
+        QUEUE_DEPTH_ALERT.notifyIfNecessary(_message, _queue, _listener);
+        verify(_listener).notifyClients(eq(QUEUE_DEPTH_ALERT), eq(_queue), eq("2Kb : Maximum queue depth threshold (1Kb) breached."));
+    }
+}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index a8fad96063..d2fe529856 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -21,6 +21,13 @@
 
 package org.apache.qpid.server.queue;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Matchers.contains;
+import static org.mockito.Matchers.eq;
+
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 import org.apache.qpid.AMQException;
@@ -79,7 +86,6 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
 
         public void setExchange(AMQShortString exchange)
         {
-            //To change body of implemented methods use File | Settings | File Templates.
         }
 
         public boolean isImmediate()
@@ -839,120 +845,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         }
     }
 
-    /**
-     * Tests that dequeued message is not copied as part of invocation of
-     * {@link SimpleAMQQueue#copyMessagesToAnotherQueue(long, long, String)}
-     */
-    public void testCopyMessagesWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-        String anotherQueueName = "testQueue2";
 
-        // put test messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // create another queue
-        SimpleAMQQueue queue = createQueue(anotherQueueName);
-
-        // copy messages into another queue
-        _queue.copyMessagesToAnotherQueue(0, messageNumber, anotherQueueName);
-
-        // get messages on another queue
-        List<QueueEntry> entries = queue.getMessagesOnTheQueue();
-
-        // assert another queue entries
-        assertEquals(messageNumber - 1, entries.size());
-        int expectedId = 0;
-        for (int i = 0; i < messageNumber - 1; i++)
-        {
-            Long id = ((AMQMessage)entries.get(i).getMessage()).getMessageId();
-            if (i == dequeueMessageIndex)
-            {
-                assertFalse("Message with id " + dequeueMessageIndex
-                        + " was dequeued and should not been copied into another queue!",
-                        new Long(expectedId).equals(id));
-                expectedId++;
-            }
-            assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
-                    new Long(expectedId), id);
-            expectedId++;
-        }
-    }
-
-    /**
-     * Tests that dequeued message is not moved as part of invocation of
-     * {@link SimpleAMQQueue#moveMessagesToAnotherQueue(long, long, String)}
-     */
-    public void testMovedMessagesWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-        String anotherQueueName = "testQueue2";
-
-        // put messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // create another queue
-        SimpleAMQQueue queue = createQueue(anotherQueueName);
-
-        // move messages into another queue
-        _queue.moveMessagesToAnotherQueue(0, messageNumber, anotherQueueName);
-
-        // get messages on another queue
-        List<QueueEntry> entries = queue.getMessagesOnTheQueue();
-
-        // assert another queue entries
-        assertEquals(messageNumber - 1, entries.size());
-        int expectedId = 0;
-        for (int i = 0; i < messageNumber - 1; i++)
-        {
-            Long id = ((AMQMessage)entries.get(i).getMessage()).getMessageId();
-            if (i == dequeueMessageIndex)
-            {
-                assertFalse("Message with id " + dequeueMessageIndex
-                        + " was dequeued and should not been copied into another queue!",
-                        new Long(expectedId).equals(id));
-                expectedId++;
-            }
-            assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
-                    new Long(expectedId), id);
-            expectedId++;
-        }
-    }
-
-    /**
-     * Tests that messages in given range including dequeued one are deleted
-     * from the queue on invocation of
-     * {@link SimpleAMQQueue#removeMessagesFromQueue(long, long)}
-     */
-    public void testRemoveMessagesFromQueueWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-
-        // put messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // remove messages
-        _queue.removeMessagesFromQueue(0, messageNumber);
-
-        // get queue entries
-        List<QueueEntry> entries = _queue.getMessagesOnTheQueue();
-
-        // assert queue entries
-        assertNotNull("Null is returned from getMessagesOnTheQueue", entries);
-        assertEquals("Queue should be empty", 0, entries.size());
-    }
 
     /**
      * Tests that dequeued message on the top is not accounted and next message
@@ -1096,7 +989,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     /**
      * Tests that entry in dequeued state are not enqueued and not delivered to subscription
      */
-    public void testEqueueDequeuedEntry()
+    public void testEnqueueDequeuedEntry()
     {
         // create a queue where each even entry is considered a dequeued
         SimpleAMQQueue queue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), new AMQShortString("test"), false,
@@ -1231,6 +1124,39 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
     }
 
+    public void testNotificationFiredOnEnqueue() throws Exception
+    {
+        AMQQueue.NotificationListener listener = mock(AMQQueue.NotificationListener.class);
+
+        _queue.setNotificationListener(listener);
+        _queue.setMaximumMessageCount(2);
+
+        _queue.enqueue(createMessage(new Long(24)));
+        verifyZeroInteractions(listener);
+
+        _queue.enqueue(createMessage(new Long(25)));
+
+        verify(listener, atLeastOnce()).notifyClients(eq(NotificationCheck.MESSAGE_COUNT_ALERT), eq(_queue), contains("Maximum count on queue threshold"));
+    }
+
+    public void testNotificationFiredAsync() throws Exception
+    {
+        AMQQueue.NotificationListener listener = mock(AMQQueue.NotificationListener.class);
+
+        _queue.enqueue(createMessage(new Long(24)));
+        _queue.enqueue(createMessage(new Long(25)));
+        _queue.enqueue(createMessage(new Long(26)));
+
+        _queue.setNotificationListener(listener);
+        _queue.setMaximumMessageCount(2);
+
+        verifyZeroInteractions(listener);
+
+        _queue.checkMessageStatus();
+
+        verify(listener, atLeastOnce()).notifyClients(eq(NotificationCheck.MESSAGE_COUNT_ALERT), eq(_queue), contains("Maximum count on queue threshold"));
+    }
+
     /**
      * A helper method to create a queue with given name
      *
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
index f6675e917e..c0c55de92a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
@@ -32,6 +32,7 @@ import javax.management.remote.JMXPrincipal;
 import javax.security.auth.Subject;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
+import java.net.InetSocketAddress;
 import java.util.Collections;
 
 /**
@@ -47,7 +48,7 @@ public class RMIPasswordAuthenticatorTest extends TestCase
 
     protected void setUp() throws Exception
     {
-        _rmipa = new RMIPasswordAuthenticator();
+        _rmipa = new RMIPasswordAuthenticator(new InetSocketAddress(5672));
 
         _credentials = new String[] {USERNAME, PASSWORD};
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
index 48e631a0f4..8ab32d9710 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
 package org.apache.qpid.server.store;
 
 import static org.mockito.Matchers.any;
@@ -78,7 +98,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _exchangeId = UUIDGenerator.generateUUID();
 
         _storeName = getName();
-        _storePath = TMP_FOLDER + "/" + _storeName;
+        _storePath = TMP_FOLDER + File.separator + _storeName;
         FileUtils.delete(new File(_storePath), true);
         setTestSystemProperty("QPID_WORK", TMP_FOLDER);
         _configuration = mock(Configuration.class);
@@ -172,7 +192,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _store.createQueue(queue);
 
         reopenStore();
-        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null);
+        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, null);
     }
 
     public void testCreateQueueAMQQueueFieldTable() throws Exception
@@ -186,10 +206,29 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _store.createQueue(queue, arguments);
 
         reopenStore();
-        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, arguments);
+        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, arguments, null);
     }
 
-    public void testUpdateQueue() throws Exception
+    public void testCreateQueueAMQQueueWithAlternateExchange() throws Exception
+    {
+        Exchange alternateExchange = createTestAlternateExchange();
+
+        AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange);
+        _store.createQueue(queue);
+
+        reopenStore();
+        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, alternateExchange.getId());
+    }
+
+    private Exchange createTestAlternateExchange()
+    {
+        UUID exchUuid = UUID.randomUUID();
+        Exchange alternateExchange = mock(Exchange.class);
+        when(alternateExchange.getId()).thenReturn(exchUuid);
+        return alternateExchange;
+    }
+
+    public void testUpdateQueueExclusivity() throws Exception
     {
         // create queue
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true);
@@ -204,7 +243,26 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _store.updateQueue(queue);
 
         reopenStore();
-        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments);
+        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, null);
+    }
+
+    public void testUpdateQueueAlternateExchange() throws Exception
+    {
+        // create queue
+        AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true);
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
+        attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
+        FieldTable arguments = FieldTable.convertToFieldTable(attributes);
+        _store.createQueue(queue, arguments);
+
+        // update the queue to have exclusive=false
+        Exchange alternateExchange = createTestAlternateExchange();
+        queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange);
+        _store.updateQueue(queue);
+
+        reopenStore();
+        verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, alternateExchange.getId());
     }
 
     public void testRemoveQueue() throws Exception
@@ -221,17 +279,23 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _store.removeQueue(queue);
         reopenStore();
         verify(_queueRecoveryHandler, never()).queue(any(UUID.class), anyString(), anyString(), anyBoolean(),
-                any(FieldTable.class));
+                any(FieldTable.class), any(UUID.class));
     }
 
     private AMQQueue createTestQueue(String queueName, String queueOwner, boolean exclusive) throws AMQStoreException
     {
+        return createTestQueue(queueName, queueOwner, exclusive, null);
+    }
+
+    private AMQQueue createTestQueue(String queueName, String queueOwner, boolean exclusive, Exchange alternateExchange) throws AMQStoreException
+    {
         AMQQueue queue = mock(AMQQueue.class);
         when(queue.getName()).thenReturn(queueName);
         when(queue.getNameShortString()).thenReturn(AMQShortString.valueOf(queueName));
         when(queue.getOwner()).thenReturn(AMQShortString.valueOf(queueOwner));
         when(queue.isExclusive()).thenReturn(exclusive);
         when(queue.getId()).thenReturn(_queueId);
+        when(queue.getAlternateExchange()).thenReturn(alternateExchange);
         return queue;
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 64048d294b..93f3701c85 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -99,7 +99,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
     {
         super.setUp();
 
-        String storePath = System.getProperty("QPID_WORK") + "/" + getName();
+        String storePath = System.getProperty("QPID_WORK") + File.separator + getName();
         
         _config = new PropertiesConfiguration();
         _config.addProperty("store.class", getTestProfileMessageStoreClassName());
@@ -267,15 +267,9 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         //Validate normally expected properties of Queues/Topics
         validateDurableQueueProperties();
 
-        //Update the durable exclusive queue's exclusivity and verify it is persisted and recovered correctly
+        //Update the durable exclusive queue's exclusivity
         setQueueExclusivity(false);
         validateQueueExclusivityProperty(false);
-
-        //Reload the Virtualhost to recover the queues again
-        reloadVirtualHost();
-
-        //verify the change was persisted and recovered correctly
-        validateQueueExclusivityProperty(false);
     }
 
     /**
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
index c6ef35d255..24e8b591e0 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/OperationalLoggingListenerTest.java
@@ -147,6 +147,12 @@ public class OperationalLoggingListenerTest extends TestCase
         {
             _eventManager.addEventListener(eventListener, events);
         }
+
+        @Override
+        public String getStoreType()
+        {
+            return "TEST";
+        }
     }
 
     private static class TestActor implements LogActor
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
index 5ba9c0c015..0aa0569b07 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
@@ -1,5 +1,3 @@
-package org.apache.qpid.server.subscription;
-
 /*
 *
 * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,16 +19,24 @@ package org.apache.qpid.server.subscription;
 *
 */
 
+package org.apache.qpid.server.subscription;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.logging.LogSubject;
+import org.apache.qpid.server.message.InboundMessage;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
+import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.queue.QueueEntry.SubscriptionAcquiredState;
+import org.apache.qpid.server.stats.StatisticsCounter;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -76,19 +82,9 @@ public class MockSubscription implements Subscription
         _state = State.CLOSED;
     }
 
-    public boolean filtersMessages()
-    {
-        return false;
-    }
-
-    public AMQChannel getChannel()
-    {
-        return null;
-    }
-
-    public AMQShortString getConsumerTag()
+    public String getConsumerName()
     {
-        return tag;
+        return tag == null ? null : tag.asString();
     }
 
     public long getSubscriptionID()
@@ -121,11 +117,36 @@ public class MockSubscription implements Subscription
         return false;
     }
 
+    public long getBytesOut()
+    {
+        return 0;  // TODO - Implement
+    }
+
+    public long getMessagesOut()
+    {
+        return 0;  // TODO - Implement
+    }
+
+    public long getUnacknowledgedBytes()
+    {
+        return 0;  // TODO - Implement
+    }
+
+    public long getUnacknowledgedMessages()
+    {
+        return 0;  // TODO - Implement
+    }
+
     public AMQQueue getQueue()
     {
         return queue;
     }
 
+    public AMQSessionModel getSessionModel()
+    {
+        return new MockSessionModel();
+    }
+
     public boolean trySendLock()
     {
         return _stateChangeLock.tryLock();
@@ -154,11 +175,6 @@ public class MockSubscription implements Subscription
         return _isActive ;
     }
 
-    public void confirmAutoClose()
-    {
-
-    }
-
     public void set(String key, Object value)
     {
     }
@@ -173,11 +189,6 @@ public class MockSubscription implements Subscription
         return false;
     }
 
-    public boolean isBrowser()
-    {
-        return false;
-    }
-
     public boolean isClosed()
     {
         return _closed;
@@ -207,10 +218,6 @@ public class MockSubscription implements Subscription
         _stateChangeLock.unlock();
     }
 
-    public void resend(QueueEntry entry) throws AMQException
-    {
-    }
-
     public void onDequeue(QueueEntry queueEntry)
     {
     }
@@ -232,7 +239,6 @@ public class MockSubscription implements Subscription
         messages.add(entry);
     }
 
-    @Override
     public void flushBatched()
     {
 
@@ -249,7 +255,7 @@ public class MockSubscription implements Subscription
     }
 
     public void setNoLocal(boolean noLocal)
-    {        
+    {
     }
 
     public void setStateListener(StateListener listener)
@@ -285,4 +291,259 @@ public class MockSubscription implements Subscription
     {
         _isActive = isActive;
     }
+
+    private static class MockSessionModel implements AMQSessionModel
+    {
+
+        @Override
+        public int compareTo(AMQSessionModel o)
+        {
+            return 0;
+        }
+
+        @Override
+        public UUID getId()
+        {
+            return null;
+        }
+
+        @Override
+        public AMQConnectionModel getConnectionModel()
+        {
+            return new MockConnectionModel();
+        }
+
+        @Override
+        public String getClientID()
+        {
+            return null;
+        }
+
+        @Override
+        public void close() throws AMQException
+        {
+        }
+
+        @Override
+        public LogSubject getLogSubject()
+        {
+            return null;
+        }
+
+        @Override
+        public void checkTransactionStatus(long openWarn, long openClose,
+                long idleWarn, long idleClose) throws AMQException
+        {
+        }
+
+        @Override
+        public void block(AMQQueue queue)
+        {
+        }
+
+        @Override
+        public void unblock(AMQQueue queue)
+        {
+        }
+
+        @Override
+        public void block()
+        {
+        }
+
+        @Override
+        public void unblock()
+        {
+        }
+
+        @Override
+        public boolean getBlocking()
+        {
+            return false;
+        }
+
+        @Override
+        public boolean onSameConnection(InboundMessage inbound)
+        {
+            return false;
+        }
+
+        @Override
+        public int getUnacknowledgedMessageCount()
+        {
+            return 0;
+        }
+
+        @Override
+        public Long getTxnCount()
+        {
+            return null;
+        }
+
+        @Override
+        public Long getTxnStart()
+        {
+            return null;
+        }
+
+        @Override
+        public Long getTxnCommits()
+        {
+            return null;
+        }
+
+        @Override
+        public Long getTxnRejects()
+        {
+            return null;
+        }
+
+        @Override
+        public int getChannelId()
+        {
+            return 0;
+        }
+    }
+
+    private static class MockConnectionModel implements AMQConnectionModel
+    {
+        @Override
+        public void initialiseStatistics()
+        {
+        }
+
+        @Override
+        public void registerMessageReceived(long messageSize, long timestamp)
+        {
+        }
+
+        @Override
+        public void registerMessageDelivered(long messageSize)
+        {
+        }
+
+        @Override
+        public StatisticsCounter getMessageDeliveryStatistics()
+        {
+            return null;
+        }
+
+        @Override
+        public StatisticsCounter getMessageReceiptStatistics()
+        {
+            return null;
+        }
+
+        @Override
+        public StatisticsCounter getDataDeliveryStatistics()
+        {
+            return null;
+        }
+
+        @Override
+        public StatisticsCounter getDataReceiptStatistics()
+        {
+            return null;
+        }
+
+        @Override
+        public void resetStatistics()
+        {
+
+        }
+
+        @Override
+        public UUID getId()
+        {
+            return null;
+        }
+
+        @Override
+        public void close(AMQConstant cause, String message)
+                throws AMQException
+        {
+        }
+
+        @Override
+        public void closeSession(AMQSessionModel session, AMQConstant cause,
+                String message) throws AMQException
+        {
+        }
+
+        @Override
+        public long getConnectionId()
+        {
+            return 0;
+        }
+
+        @Override
+        public List<AMQSessionModel> getSessionModels()
+        {
+            return null;
+        }
+
+        @Override
+        public void block()
+        {
+        }
+
+        @Override
+        public void unblock()
+        {
+        }
+
+        @Override
+        public LogSubject getLogSubject()
+        {
+            return null;
+        }
+
+        @Override
+        public String getUserName()
+        {
+            return null;
+        }
+
+        @Override
+        public boolean isSessionNameUnique(byte[] name)
+        {
+            return false;
+        }
+
+        @Override
+        public String getRemoteAddressString()
+        {
+            return "remoteAddress:1234";
+        }
+
+        @Override
+        public String getClientId()
+        {
+            return null;
+        }
+
+        @Override
+        public String getClientVersion()
+        {
+            return null;
+        }
+
+        @Override
+        public String getPrincipalAsString()
+        {
+            return null;
+        }
+
+        @Override
+        public long getSessionCountLimit()
+        {
+            return 0;
+        }
+
+        @Override
+        public long getLastIoTime()
+        {
+            return 0;
+        }
+    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
deleted file mode 100644
index b0b81355ac..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
+++ /dev/null
@@ -1,231 +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.server.transport;
-
-import org.apache.qpid.management.common.mbeans.ManagedConnection;
-import org.apache.qpid.server.configuration.MockConnectionConfig;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.Binary;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.Session;
-
-import javax.management.JMException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class ServerConnectionMBeanTest extends InternalBrokerBaseCase
-{
-    private ServerConnection _serverConnection;
-    private ServerSessionMock _serverSession;
-    private ServerConnectionMBean _mbean;
-    private List<Session> _sessions = new ArrayList<Session>();
-
-    @Override
-    public  void setUp() throws Exception
-    {
-        super.setUp();
-
-        final VirtualHost vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
-        _serverConnection = new ServerConnection(1)
-        {
-            protected Collection<Session> getChannels()
-            {
-                return _sessions;
-            }
-            public Session getSession(int channelId)
-            {
-                for(Session session : _sessions)
-                {
-                    if (session.getChannel() == channelId)
-                    {
-                        return session;
-                    }
-                }
-                return null;
-            }
-            @Override
-            public AtomicLong getLastIoTime()
-            {
-                return new AtomicLong(1);
-            }
-        };
-        final MockConnectionConfig config = new MockConnectionConfig(UUID.randomUUID(), null, null,
-                                                                    false, 1, vhost, "address", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE,
-                                                                    "authid", "remoteProcessName", new Integer(1967), new Integer(1970), vhost.getConfigStore(), Boolean.FALSE);
-        _serverConnection.setConnectionConfig(config);
-        _serverConnection.setVirtualHost(vhost);
-        _serverConnection.setConnectionDelegate(new ServerConnectionDelegate(getRegistry(), "", getRegistry().getAuthenticationManager(new InetSocketAddress(5672))));
-        _serverSession = new ServerSessionMock(_serverConnection, 1);
-        _mbean = (ServerConnectionMBean) _serverConnection.getManagedObject();
-    }
-
-    public void testChannels() throws Exception
-    {
-        // check the channel count is correct
-        TabularData tabularData = _mbean.channels();
-
-        int channelCount = tabularData.size();
-        assertEquals("Unexpected number of channels",1,channelCount);
-        _sessions.add(new ServerSession(_serverConnection, new ServerSessionDelegate(),
-                        new Binary(getName().getBytes()), 2 , _serverConnection.getConfig()));
-
-        channelCount = _mbean.channels().size();
-        assertEquals("Unexpected number of channels",2,channelCount);
-
-        final CompositeData chanresult = tabularData.get(new Integer[]{1});
-        assertNotNull(chanresult);
-        assertEquals("Unexpected channel id", new Integer(1),(Integer)chanresult.get(ManagedConnection.CHAN_ID));
-        assertNull("Unexpected default queue", chanresult.get(ManagedConnection.DEFAULT_QUEUE));
-        assertFalse("Unexpected transactional flag", (Boolean)chanresult.get(ManagedConnection.TRANSACTIONAL));
-        assertFalse("Flow should have been blocked", (Boolean)chanresult.get(ManagedConnection.FLOW_BLOCKED));
-        assertEquals("Unexpected unack'd count", new Integer(1967), (Integer)chanresult.get(ManagedConnection.UNACKED_COUNT));
-    }
-
-    public void testMaxChannels() throws Exception
-    {
-        _serverConnection.getConnectionDelegate().setChannelMax(10001);
-        assertEquals("Max channels not got correctly", new Long(10001), _mbean.getMaximumNumberOfChannels());
-    }
-
-    public void testRollback() throws Exception
-    {
-        _mbean.rollbackTransactions(1);
-        assertFalse("Rollback performed despite not being transacted", _serverSession.isRolledback());
-
-        _serverSession.setTransactional(true);
-        _mbean.rollbackTransactions(1);
-        assertTrue("Rollback not performed", _serverSession.isRolledback());
-
-        try
-        {
-            _mbean.rollbackTransactions(2);
-            fail("Exception expected");
-        }
-        catch (JMException jme)
-        {
-            //pass
-        }
-    }
-
-    public void testCommit() throws Exception
-    {
-        _mbean.commitTransactions(1);
-        assertFalse("Commit performed despite not being transacted", _serverSession.isCommitted());
-
-        _serverSession.setTransactional(true);
-        _mbean.commitTransactions(1);
-        assertTrue("Commit not performed", _serverSession.isCommitted());
-
-        try
-        {
-            _mbean.commitTransactions(2);
-            fail("Exception expected");
-        }
-        catch (JMException jme)
-        {
-            //pass
-        }
-    }
-
-    public void testGetName()
-    {
-        assertEquals("Unexpected Object Instance Name", "\"address\"", _mbean.getObjectInstanceName());
-    }
-
-    public void testEnableStatistics()
-    {
-        assertFalse("Unexpected statistics enable flag", _mbean.isStatisticsEnabled());
-        _mbean.setStatisticsEnabled(true);
-        assertTrue("Unexpected statistics enable flag", _mbean.isStatisticsEnabled());
-    }
-
-    public void testLastIOTime()
-    {
-        assertEquals("Unexpected last IO time", new Date(1), _mbean.getLastIoTime());
-    }
-
-    private class ServerSessionMock extends ServerSession
-    {
-        private int _channelId = 0;
-        private boolean _committed = false;
-        private boolean _rolledback = false;
-        private boolean _transacted = false;
-
-        ServerSessionMock(Connection connection, int channelId)
-        {
-            super(connection, new ServerSessionDelegate(), new Binary(String.valueOf(channelId).getBytes()), 1 , _serverConnection.getConfig());
-            _channelId = channelId;
-            _sessions.add(this);
-        }
-
-        public int getChannel()
-        {
-            return _channelId;
-        }
-
-        @Override
-        public void commit()
-        {
-            _committed = true;
-        }
-
-        @Override
-        public void rollback()
-        {
-            _rolledback = true;
-        }
-
-        public boolean isCommitted()
-        {
-            return _committed;
-        }
-
-        public boolean isRolledback()
-        {
-            return _rolledback;
-        }
-
-        @Override
-        public int getUnacknowledgedMessageCount()
-        {
-            return 1967;
-        }
-
-        public boolean isTransactional()
-        {
-            return _transacted;
-        }
-
-        public void setTransactional(boolean transacted)
-        {
-            _transacted = transacted;
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
index af49238998..0221f3d509 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
@@ -124,6 +124,12 @@ class MockStoreTransaction implements Transaction
                 storeTransaction.setState(TransactionState.STARTED);
                 return storeTransaction;
             }
+
+            @Override
+            public String getStoreType()
+            {
+                return "TEST";
+            }
        };
     }
 }
\ No newline at end of file
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index 9bd69e3889..a64ab620ab 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -21,6 +21,8 @@
 package org.apache.qpid.server.util;
 
 import java.net.SocketAddress;
+import java.util.Collections;
+import java.util.Map;
 import org.apache.commons.configuration.ConfigurationException;
 
 import org.apache.qpid.server.configuration.ServerConfiguration;
@@ -101,6 +103,17 @@ public class TestApplicationRegistry extends ApplicationRegistry
             {
                 return pdam;
             }
+
+            @Override
+            public Map<String, AuthenticationManager> getAvailableAuthenticationManagers()
+            {
+                return Collections.singletonMap(pdam.getClass().getName(), pdam);
+            }
+
+            @Override
+            public void addRegistryChangeListener(RegistryChangeListener listener)
+            {
+            }
         };
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index 58c7625ad6..df31845798 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -32,7 +32,6 @@ import org.apache.qpid.server.connection.IConnectionRegistry;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.federation.BrokerLink;
-import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -141,11 +140,6 @@ public class MockVirtualHost implements VirtualHost
         return 0;
     }
 
-    public ManagedObject getManagedObject()
-    {
-        return null;
-    }
-
     public MessageStore getMessageStore()
     {
         return null;
@@ -257,11 +251,6 @@ public class MockVirtualHost implements VirtualHost
 
     }
 
-    public boolean isStatisticsEnabled()
-    {
-        return false;
-    }
-
     public void registerMessageDelivered(long messageSize)
     {
 
@@ -277,11 +266,6 @@ public class MockVirtualHost implements VirtualHost
 
     }
 
-    public void setStatisticsEnabled(boolean enabled)
-    {
-
-    }
-
     public State getState()
     {
         return State.ACTIVE;