NO-JIRA: Moved the mBean focused system tests to broker-plugins/jmx module. Renabled ManagementLoggingTest/ManagementActorLoggingTest and fixed SSL management connections. ApplicationRegistry now sets a default actor early, thus allowing plugins such as JMX to make use operational logging at startup time. MBeanInvocationHandlerImpl now sets/removes a management actor around the mbean invocation.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-config-and-management@1354897 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 100 insertions, 67 deletions

diff --git a/qpid/java/broker-plugins/jmx/MANIFEST.MF b/qpid/java/broker-plugins/jmx/MANIFEST.MF
index 650f1f2f87..b13ff7f132 100644
--- a/qpid/java/broker-plugins/jmx/MANIFEST.MF
+++ b/qpid/java/broker-plugins/jmx/MANIFEST.MF
@@ -59,6 +59,7 @@ Import-Package:  org.apache.qpid,
  javax.management.openmbean;version=1.0.0,
  javax.security.auth.login;version=1.0.0,
  javax.security.auth;version=1.0.0,
+ javax.rmi.ssl;version=1.0.0,
  org.osgi.util.tracker;version=1.0.0,
  org.osgi.framework;version=1.3
 Export-Package: org.apache.qpid.server.jmx;uses:="org.osgi.framework"
diff --git a/qpid/java/broker-plugins/jmx/build.xml b/qpid/java/broker-plugins/jmx/build.xml
index 20d16cd54e..4deb0196e7 100644
--- a/qpid/java/broker-plugins/jmx/build.xml
+++ b/qpid/java/broker-plugins/jmx/build.xml
@@ -17,8 +17,22 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins JMX" default="build">
+
+    <condition property="systests.optional.depends" value="bdbstore" else="">
+      <or>
+        <and>
+            <contains string="${modules.opt}" substring="bdbstore"/>
+            <contains string="${profile}" substring="bdb"/>
+        </and>
+        <and>
+            <istrue value="${optional}"/>
+            <contains string="${profile}" substring="bdb"/>
+        </and>
+      </or>
+    </condition>
+
     <property name="module.depends" value="common broker broker-plugins broker-plugins-jmx management/common" />
-    <property name="module.test.depends" value="systests test broker/test common/test management/common client" />
+    <property name="module.test.depends" value="systests test broker/test common/test management/common client ${systests.optional.depends}" />
     
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
diff --git a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
index 9c1c2ab023..c588b40de7 100644
--- a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
+++ b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
@@ -35,7 +35,6 @@ public class JMXActivator implements  BundleActivator
 {
     private static final Logger LOGGER = Logger.getLogger(JMXActivator.class);
 
-
     private String _bundleName;
     private JMXService _jmxService;
 
@@ -49,10 +48,9 @@ public class JMXActivator implements  BundleActivator
         if (jmxManagementEnabled)
         {
             _jmxService = new JMXService();
-            _jmxService.start();
+            startJmsService(_jmxService);
 
             _bundleName = ctx.getBundle().getSymbolicName();
-            LOGGER.info("Registering jmx plugin: " + _bundleName);
 
             _registeredServices = registerServices(ctx);
         }
@@ -68,7 +66,10 @@ public class JMXActivator implements  BundleActivator
         {
             if (_jmxService != null)
             {
-                LOGGER.info("Stopping jmx plugin: " + _bundleName);
+                if (LOGGER.isInfoEnabled())
+                {
+                    LOGGER.info("Stopping jmx plugin: " + _bundleName);
+                }
                 _jmxService.close();
             }
 
@@ -87,6 +88,11 @@ public class JMXActivator implements  BundleActivator
 
     private List<ServiceRegistration> registerServices(BundleContext ctx)
     {
+        if (LOGGER.isInfoEnabled())
+        {
+            LOGGER.info("Registering jmx plugin: " + _bundleName);
+        }
+
         List<ServiceRegistration> serviceRegistrations = new ArrayList<ServiceRegistration>();
 
         ServiceRegistration jmxServiceRegistration = ctx.registerService(JMXService.class.getName(), _jmxService, null);
@@ -97,6 +103,28 @@ public class JMXActivator implements  BundleActivator
         return serviceRegistrations;
     }
 
+    private void startJmsService(JMXService jmxService) throws Exception
+    {
+        if (LOGGER.isInfoEnabled())
+        {
+            LOGGER.info("Starting JMX service");
+        }
+        boolean startedSuccessfully = false;
+        try
+        {
+            jmxService.start();
+            startedSuccessfully = true;
+        }
+        finally
+        {
+            if (!startedSuccessfully)
+            {
+                LOGGER.error("JMX failed to start normally, closing service");
+                jmxService.close();
+            }
+        }
+    }
+
     private void unregisterServices()
     {
         for (Iterator<ServiceRegistration> iterator = _registeredServices.iterator(); iterator.hasNext();)
diff --git a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
index 48c6f3cad2..7519cea4db 100644
--- a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
+++ b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
@@ -38,9 +38,6 @@ import org.apache.qpid.server.jmx.mbeans.ConfigurationManagementMBean;
 import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;
 import org.apache.qpid.server.jmx.mbeans.Shutdown;
 import org.apache.qpid.server.jmx.mbeans.VirtualHostMBean;
-import org.apache.qpid.server.logging.SystemOutMessageLogger;
-import org.apache.qpid.server.logging.actors.AbstractActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfigurationChangeListener;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -66,17 +63,6 @@ public class JMXService implements ConfigurationChangeListener
 
     public JMXService() throws AMQException, JMException
     {
-        // TODO - logging actor
-        CurrentActor.set(new AbstractActor(new SystemOutMessageLogger())
-        {
-
-            @Override
-            public String getLogMessage()
-            {
-                return "[JMX Service]";
-            }
-        });
-
         _broker = ApplicationRegistry.getInstance().getBroker();
         _objectRegistry = new JMXManagedObjectRegistry();
 
diff --git a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
index 3c468f7909..49f06d5121 100644
--- a/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
+++ b/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.jmx;
 
 import org.apache.log4j.Logger;
 
+import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.ManagementActor;
 import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -199,8 +200,7 @@ public class MBeanInvocationHandlerImpl implements InvocationHandler, Notificati
 
             try
             {
-                // Actually invoke the method
-                return method.invoke(_mbs, args);
+                return doInvokeWrappingWithManagementActor(method, args);
             }
             finally
             {
@@ -216,6 +216,21 @@ public class MBeanInvocationHandlerImpl implements InvocationHandler, Notificati
         }
     }
 
+    private Object doInvokeWrappingWithManagementActor(Method method,
+            Object[] args) throws IllegalAccessException,
+            InvocationTargetException
+    {
+        try
+        {
+            CurrentActor.set(_logActor);
+            return method.invoke(_mbs, args);
+        }
+        finally
+        {
+            CurrentActor.remove();
+        }
+    }
+
     private String getType(Method method, Object[] args)
     {
         if (args[0] instanceof ObjectName)
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
index 59449cacfa..5e6c570e8c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.management.common.mbeans.ManagedBroker;
@@ -31,7 +31,7 @@ import javax.management.ObjectName;
  * Tests the JMX API for the Managed Broker.
  *
  */
-public class ManagedBrokerMBeanTest extends QpidBrokerTestCase
+public class BrokerManagementTest extends QpidBrokerTestCase
 {
     /**
      * Test virtual host
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
index dd24809266..28d7bf4aed 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
 
 import java.io.IOException;
 import java.util.Date;
@@ -42,7 +42,7 @@ import org.apache.qpid.management.common.mbeans.ManagedQueue;
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
-public class ManagedConnectionMBeanTest extends QpidBrokerTestCase
+public class ConnectionManagementTest extends QpidBrokerTestCase
 {
     private static final String VIRTUAL_HOST_NAME = "test";
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
index 0e2875235f..47b38381c5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
 
 import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedConnection;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
index c8a6d02761..6100d5a23e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
@@ -18,10 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.systest.management.jmx;
 
 
 import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.logging.AbstractTestLogging;
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.util.LogMonitor;
 
@@ -177,7 +178,7 @@ public class ManagementLoggingTest extends AbstractTestLogging
         if (isJavaBroker())
         {
             startBrokerAndCreateMonitor(true, false);
-            
+
             List<String> results = waitAndFindMatches("MNG-1002");
             // Validation
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index d433b710ad..ad6777d0ea 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
 
 import org.apache.commons.lang.time.FastDateFormat;
 
@@ -64,10 +64,10 @@ import java.util.concurrent.atomic.AtomicReference;
  * Tests the JMX API for the Managed Queue.
  *
  */
-public class ManagedQueueMBeanTest extends QpidBrokerTestCase
+public class QueueManagementTest extends QpidBrokerTestCase
 {
 
-    private static final Logger LOGGER = Logger.getLogger(ManagedQueueMBeanTest.class);
+    private static final Logger LOGGER = Logger.getLogger(QueueManagementTest.class);
 
     private static final String VIRTUAL_HOST = "test";
     private static final String TEST_QUEUE_DESCRIPTION = "my description";
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
index 57a9478ed1..c3fff94923 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
+++ b/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
@@ -17,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ import org.apache.qpid.management.common.mbeans.ServerInformation;
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
-public class MessageStatisticsTest extends QpidBrokerTestCase
+public class StatisticsTest extends QpidBrokerTestCase
 {
     private static final String TEST_USER = "admin";
     private static final String TEST_PASSWORD = "admin";
@@ -160,7 +160,7 @@ public class MessageStatisticsTest extends QpidBrokerTestCase
         final MessageConsumer consumer = session.createConsumer(queue);
         for (int i = 0 ; i < numberOfMessages ; i++)
         {
-            assertNotNull("an expected message was not recieved", consumer.receive(1500));
+            assertNotNull("an expected message was not received", consumer.receive(1500));
         }
         session.commit();
         consumer.close();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
index e4663a85b2..4677d4b9e6 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
@@ -47,6 +47,8 @@ javax.security.auth.login=1.0.0
 javax.security.sasl=1.0.0
 javax.security=1.0.0
 
+javax.rmi.ssl=1.0.0
+
 org.xml.sax=1.0.0
 org.xml.sax.helpers=1.0.0
  
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 5050c33268..10c69b7f97 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -287,7 +287,9 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         RootMessageLogger[] messageLoggers = {new SystemOutMessageLogger(), _rootMessageLogger};
         _startupMessageLogger = new CompositeStartupMessageLogger(messageLoggers);
 
-        CurrentActor.set(new BrokerActor(_startupMessageLogger));
+        BrokerActor actor = new BrokerActor(_startupMessageLogger);
+        CurrentActor.setDefault(actor);
+        CurrentActor.set(actor);
 
         try
         {
diff --git a/qpid/java/systests/build.xml b/qpid/java/systests/build.xml
index 1d7d60be27..d8ca018ca0 100644
--- a/qpid/java/systests/build.xml
+++ b/qpid/java/systests/build.xml
@@ -32,7 +32,7 @@ nn - or more contributor license agreements.  See the NOTICE file
       </or>
     </condition>
 
-    <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca broker-plugins/management broker-plugins/jmx ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca broker-plugins/management ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
index 3db590552f..c38fcd9199 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.server.stats;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
@@ -27,7 +27,6 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.util.LogMonitor;
 
@@ -41,14 +40,14 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 
 /**
- * Test generation of message statistics reporting.
+ * Test generation of message/data statistics reporting and the ability
+ * to control from the configuration file.
  */
-public class MessageStatisticsReportingTest extends QpidBrokerTestCase
+public class StatisticsReportingTest extends QpidBrokerTestCase
 {
     protected LogMonitor _monitor;
     protected static final String USER = "admin";
 
-    protected JMXTestUtils _jmxUtils;
     protected Connection _test, _dev, _local;
     protected String _queueName = "statistics";
     protected Destination _queue;
@@ -57,9 +56,6 @@ public class MessageStatisticsReportingTest extends QpidBrokerTestCase
     @Override
     public void setUp() throws Exception
     {
-        _jmxUtils = new JMXTestUtils(this, USER, USER);
-        _jmxUtils.setUp();
-
         setConfigurationProperty("statistics.generation.broker", "true");
         setConfigurationProperty("statistics.generation.virtualhosts", "true");
 
@@ -81,14 +77,11 @@ public class MessageStatisticsReportingTest extends QpidBrokerTestCase
         _dev.start();
         _local.start();
 
-        _jmxUtils.open();
     }
 
     @Override
     public void tearDown() throws Exception
     {
-        _jmxUtils.close();
-
         _test.close();
         _dev.close();
         _local.close();
@@ -104,14 +97,14 @@ public class MessageStatisticsReportingTest extends QpidBrokerTestCase
         sendUsing(_test, 10, 100);
         sendUsing(_dev, 20, 100);
         sendUsing(_local, 15, 100);
-        
+
         Thread.sleep(10 * 1000); // 15s
-        
+
         List<String> brokerStatsData = _monitor.findMatches("BRK-1008");
         List<String> brokerStatsMessages = _monitor.findMatches("BRK-1009");
         List<String> vhostStatsData = _monitor.findMatches("VHT-1003");
         List<String> vhostStatsMessages = _monitor.findMatches("VHT-1004");
-        
+
         assertEquals("Incorrect number of broker data stats log messages", 2, brokerStatsData.size());
         assertEquals("Incorrect number of broker message stats log messages", 2, brokerStatsMessages.size());
         assertEquals("Incorrect number of virtualhost data stats log messages", 6, vhostStatsData.size());
@@ -126,14 +119,14 @@ public class MessageStatisticsReportingTest extends QpidBrokerTestCase
         sendUsing(_test, 10, 100);
         sendUsing(_dev, 20, 100);
         sendUsing(_local, 15, 100);
-        
+
         Thread.sleep(10 * 1000); // 15s
-        
+
         List<String> brokerStatsData = _monitor.findMatches("BRK-1008");
         List<String> brokerStatsMessages = _monitor.findMatches("BRK-1009");
         List<String> vhostStatsData = _monitor.findMatches("VHT-1003");
         List<String> vhostStatsMessages = _monitor.findMatches("VHT-1004");
-        
+
         assertEquals("Incorrect number of broker data stats log messages", 0, brokerStatsData.size());
         assertEquals("Incorrect number of broker message stats log messages", 0, brokerStatsMessages.size());
         assertEquals("Incorrect number of virtualhost data stats log messages", 0, vhostStatsData.size());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
index 5b3bca7033..2cd7520ae4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.qpid.AMQConnectionClosedException;
 import org.apache.qpid.AMQDisconnectedException;
 import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.management.jmx.ManagedConnectionMBeanTest;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.transport.ConnectionException;
 
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index f236802545..7c653c73f1 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -101,7 +101,6 @@ org.apache.qpid.server.logging.subjects.*
 org.apache.qpid.server.logging.actors.*
 
 // CPP Broker does not have a JMX interface to test
-org.apache.qpid.management.jmx.*
 org.apache.qpid.server.jmx.mbeans.*
 org.apache.qpid.systest.management.jmx.*
 
@@ -157,8 +156,6 @@ org.apache.qpid.test.unit.transacted.TransactionTimeoutConfigurationTest#*
 org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#*
 
 // Java broker only
-org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#*
-org.apache.qpid.server.management.AMQUserManagementMBeanTest#*
 org.apache.qpid.server.SupportedProtocolVersionsTest#*
 
 
diff --git a/qpid/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
index 9fccf184b7..bff362b07e 100644
--- a/qpid/java/test-profiles/Excludes
+++ b/qpid/java/test-profiles/Excludes
@@ -38,8 +38,3 @@ org.apache.qpid.systest.disttest.controlleronly.*
 org.apache.qpid.systest.disttest.controllerandclient.*
 org.apache.qpid.systest.disttest.endtoend.*
 
-
-//Temp Excludes for branch
-org.apache.qpid.management.jmx.ManagementActorLoggingTest#*
-# Expects management log messages in SystemOut that arent present anymore due to move to plugin
-org.apache.qpid.server.logging.ManagementLoggingTest#*
diff --git a/qpid/java/test-profiles/JavaPre010Excludes b/qpid/java/test-profiles/JavaPre010Excludes
index 578d3473b6..422764bad0 100644
--- a/qpid/java/test-profiles/JavaPre010Excludes
+++ b/qpid/java/test-profiles/JavaPre010Excludes
@@ -71,7 +71,7 @@ org.apache.qpid.ra.QpidRAConnectionTest#*
 org.apache.qpid.ra.QpidRAXAResourceTest#*
 
 // These tests rely on new address syntax
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testGetSetAlternateExchange
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testRemoveAlternateExchange
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testAlternateExchangeSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testGetSetAlternateExchange
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testRemoveAlternateExchange
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
 
diff --git a/qpid/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes
index 44b58655bf..3e42b79d99 100644
--- a/qpid/java/test-profiles/JavaTransientExcludes
+++ b/qpid/java/test-profiles/JavaTransientExcludes
@@ -43,5 +43,5 @@ org.apache.qpid.server.store.berkeleydb.*
 
 org.apache.qpid.server.store.DurableConfigurationStoreTest#*
 
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testAlternateExchangeSurvivesRestart
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testQueueDescriptionSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testQueueDescriptionSurvivesRestart