Update from trunk r1375509 through r1450773asyncstore

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

1 files changed, 28 insertions, 34 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
index 43b80b45fb..6e6e3271f0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
@@ -24,7 +24,6 @@ import junit.framework.TestCase;
 import org.apache.commons.configuration.ConfigurationException;
 
 import org.apache.qpid.management.common.JMXConnnectionFactory;
-import org.apache.qpid.management.common.mbeans.ConfigurationManagement;
 import org.apache.qpid.management.common.mbeans.LoggingManagement;
 import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedConnection;
@@ -32,6 +31,8 @@ import org.apache.qpid.management.common.mbeans.ManagedExchange;
 import org.apache.qpid.management.common.mbeans.ManagedQueue;
 import org.apache.qpid.management.common.mbeans.ServerInformation;
 import org.apache.qpid.management.common.mbeans.UserManagement;
+import org.apache.qpid.server.model.Plugin;
+import org.apache.qpid.server.plugin.PluginFactory;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
@@ -46,7 +47,9 @@ import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -78,7 +81,7 @@ public class JMXTestUtils
 
     public void setUp() throws IOException, ConfigurationException, Exception
     {
-        _test.setConfigurationProperty("management.enabled", "true");       
+        _test.getBrokerConfiguration().addJmxManagementConfiguration();
     }
 
     public void open() throws Exception
@@ -287,9 +290,7 @@ public class JMXTestUtils
     public ObjectName getQueueObjectName(String virtualHostName, String queue)
     {
         // Get the name of the test manager
-        String query = "org.apache.qpid:type=VirtualHost.Queue,VirtualHost="
-                       + ObjectName.quote(virtualHostName) + ",name="
-                       + ObjectName.quote(queue) + ",*";
+        String query = getQueueObjectNameString(virtualHostName, queue);
 
         Set<ObjectName> objectNames = queryObjects(query);
 
@@ -302,32 +303,20 @@ public class JMXTestUtils
         return objectName;
     }
 
+	public String getQueueObjectNameString(String virtualHostName, String queue) {
+	    return "org.apache.qpid:type=VirtualHost.Queue,VirtualHost="
+                       + ObjectName.quote(virtualHostName) + ",name="
+                       + ObjectName.quote(queue) + ",*";
+    }
+
     /**
-     * Retrive the ObjectName for the given Exchange on a VirtualHost.
-     *
-     * This is then used to create a proxy to the ManagedExchange MBean.
-     *
-     * @param virtualHostName the VirtualHost the Exchange is on
-     * @param exchange the Exchange to retireve e.g. 'direct'
-     * @return the ObjectName for the given Exchange on the VirtualHost
+     * Generate the ObjectName for the given Exchange on a VirtualHost.
      */
-    @SuppressWarnings("static-access")
-    public ObjectName getExchangeObjectName(String virtualHostName, String exchange)
+    public String getExchangeObjectName(String virtualHostName, String exchange)
     {
-        // Get the name of the test manager
-        String query = "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost="
+        return "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost="
                        + ObjectName.quote(virtualHostName) + ",name="
                        + ObjectName.quote(exchange) + ",*";
-
-        Set<ObjectName> objectNames = queryObjects(query);
-
-        _test.assertNotNull("Null ObjectName Set returned", objectNames);
-        _test.assertEquals("Incorrect number of exchange with name '" + exchange + "' returned", 1, objectNames.size());
-
-        // We have verified we have only one value in objectNames so return it
-        ObjectName objectName = objectNames.iterator().next();
-        _test.getLogger().info("Loading: " + objectName);
-        return objectName;
     }
 
     @SuppressWarnings("static-access")
@@ -343,7 +332,7 @@ public class JMXTestUtils
         return getManagedObject(managedClass, objectName);
     }
 
-    public boolean isManagedObjectExist(String query)
+    public boolean doesManagedObjectExist(String query)
     {
         return !queryObjects(query).isEmpty();
     }
@@ -373,9 +362,20 @@ public class JMXTestUtils
         return getManagedObject(ManagedBroker.class, getVirtualHostManagerObjectName(virtualHost));
     }
 
+    @SuppressWarnings("static-access")
     public ManagedExchange getManagedExchange(String exchangeName)
     {
-        ObjectName objectName = getExchangeObjectName("test", exchangeName);
+        String query = getExchangeObjectName("test", exchangeName);
+
+        Set<ObjectName> objectNames = queryObjects(query);
+
+        _test.assertNotNull("Null ObjectName Set returned", objectNames);
+        _test.assertEquals("Incorrect number of exchange with name '" + exchangeName + "' returned", 1, objectNames.size());
+
+        // We have verified we have only one value in objectNames so return an mbean proxy for it
+        ObjectName objectName = objectNames.iterator().next();
+        _test.getLogger().info("Loading: " + objectName);
+
         return MBeanServerInvocationHandler.newProxyInstance(_mbsc, objectName, ManagedExchange.class, false);
     }
 
@@ -391,12 +391,6 @@ public class JMXTestUtils
         return getManagedObject(LoggingManagement.class, objectName);
     }
 
-    public ConfigurationManagement getConfigurationManagement() throws MalformedObjectNameException
-    {
-        ObjectName objectName = new ObjectName("org.apache.qpid:type=ConfigurationManagement,name=ConfigurationManagement");
-        return getManagedObject(ConfigurationManagement.class, objectName);
-    }
-
     public UserManagement getUserManagement() throws MalformedObjectNameException
     {
         ObjectName objectName = new ObjectName("org.apache.qpid:type=UserManagement,name=UserManagement");