QPID-319

management console view updated for virtual host hierarchy

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

5 files changed, 41 insertions, 27 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 2e6293081d..204b5674ce 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -202,12 +202,9 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
         return _virtualHostMBean;
     }
 
-//    public ObjectName getObjectName() throws MalformedObjectNameException
-//    {
-//        StringBuffer objectName = new StringBuffer(ManagedObject.DOMAIN);
-//        objectName.append(".").append(getVirtualHost().getName());
-//        objectName.append(":type=").append(getType());
-//
-//        return new ObjectName(objectName.toString());
-//    }
+    // This will have a single instance for a virtual host, so not having the name property in the ObjectName
+    public ObjectName getObjectName() throws MalformedObjectNameException
+    {        
+        return getObjectNameForSingleInstanceMBean();
+    }
 } // End of MBean class
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index caafb83568..8b4f41a7a0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -100,12 +100,13 @@ public abstract class AbstractExchange implements Exchange, Managable
             return _autoDelete;
         }
 
-//        public ObjectName getObjectName() throws MalformedObjectNameException
-//        {
-//            String objNameString = super.getObjectName().toString();
-//            objNameString = objNameString + ",VirtualHost="+ _virtualHost.getName() +",ExchangeType=" + _exchangeType;
-//            return new ObjectName(objNameString);
-//        }
+        // Added exchangetype in the object name lets maangement apps to do any customization required
+        public ObjectName getObjectName() throws MalformedObjectNameException
+        {
+            String objNameString = super.getObjectName().toString();
+            objNameString = objNameString + ",ExchangeType=" + _exchangeType;
+            return new ObjectName(objNameString);
+        }
 
         protected ManagedObjectRegistry getManagedObjectRegistry()
         {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index 46bac52e78..4fb091df75 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
@@ -103,8 +103,7 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
      * @return ObjectName
      * @throws MalformedObjectNameException
      */
-    public ObjectName getObjectName()
-        throws MalformedObjectNameException
+    public ObjectName getObjectName() throws MalformedObjectNameException
     {
         String name = getObjectInstanceName();
         StringBuffer objectName = new StringBuffer(ManagedObject.DOMAIN);
@@ -119,26 +118,41 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
         return new ObjectName(objectName.toString());
     }
 
-    private String getHierarchicalType(ManagedObject obj)
+    protected ObjectName getObjectNameForSingleInstanceMBean() throws MalformedObjectNameException
+    {
+        StringBuffer objectName = new StringBuffer(ManagedObject.DOMAIN);
+
+        objectName.append(":type=");
+        objectName.append(getHierarchicalType(this));
+
+        String hierarchyName = getHierarchicalName(this);
+        if (hierarchyName != null)
+        {
+            objectName.append(",");
+            objectName.append(hierarchyName.substring(0, hierarchyName.lastIndexOf(",")));
+        }
+
+        return new ObjectName(objectName.toString());
+    }
+
+    protected String getHierarchicalType(ManagedObject obj)
     {
-        String parentType = null;
         if (obj.getParentObject() != null)
         {
-            parentType = getHierarchicalType(obj.getParentObject()).toString();
+            String parentType = getHierarchicalType(obj.getParentObject()).toString();
             return parentType + "." + obj.getType();
         }
         else
             return obj.getType();
     }
 
-    private String getHierarchicalName(ManagedObject obj)
+    protected String getHierarchicalName(ManagedObject obj)
     {
-        String parentName = null;
         if (obj.getParentObject() != null)
         {
-            parentName = obj.getParentObject().getType() + "=" +
-                         obj.getParentObject().getObjectInstanceName() + ","+
-                         getHierarchicalName(obj.getParentObject());
+            String parentName = obj.getParentObject().getType() + "=" +
+                                obj.getParentObject().getObjectInstanceName() + ","+
+                                getHierarchicalName(obj.getParentObject());
 
             return parentName;
         }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
index aec7d6cb73..87d9a577e5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
@@ -37,7 +37,7 @@ import java.io.IOException;
  */
 public interface ManagedBroker
 {
-    static final String TYPE = "BrokerManager";
+    static final String TYPE = "VirtualHostManager";
 
     /**
      * Creates a new Exchange.
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 9c14be897f..1ce5146416 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -90,7 +90,8 @@ public class VirtualHost
         _name = name;

 

         _virtualHostMBean = new VirtualHostMBean();

-        _virtualHostMBean.register();

+        // This isn't needed to be registered

+        //_virtualHostMBean.register();

 

         _queueRegistry = new DefaultQueueRegistry(this);

         _exchangeFactory = new DefaultExchangeFactory(this);

@@ -107,7 +108,8 @@ public class VirtualHost
         _name = name;

 

         _virtualHostMBean = new VirtualHostMBean();

-        _virtualHostMBean.register();

+        // This isn't needed to be registered

+        //_virtualHostMBean.register();

         

         _queueRegistry = new DefaultQueueRegistry(this);

         _exchangeFactory = new DefaultExchangeFactory(this);