QPID-1537 : Reverted r727070

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

14 files changed, 21 insertions, 25 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 12efaec777..fc6057afd2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -42,8 +42,12 @@ import javax.management.MBeanException;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
+import org.apache.commons.configuration.Configuration;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.configuration.Configurator;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
@@ -75,7 +79,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
     @MBeanConstructor("Creates the Broker Manager MBean")
     public AMQBrokerManagerMBean(VirtualHost.VirtualHostMBean virtualHostMBean) throws JMException
     {
-        super(ManagedBroker.class, ManagedBroker.TYPE, ManagedBroker.VERSION);
+        super(ManagedBroker.class, ManagedBroker.TYPE);
 
         _virtualHostMBean = virtualHostMBean;
         VirtualHost virtualHost = virtualHostMBean.getVirtualHost();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index b6c741bbec..8d24626b73 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -38,9 +38,13 @@ import org.apache.qpid.server.management.Managable;
 import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+import java.util.List;
+import java.util.Map;
+
 public abstract class AbstractExchange implements Exchange, Managable
 {
     private AMQShortString _name;
@@ -77,7 +81,7 @@ public abstract class AbstractExchange implements Exchange, Managable
         
         public ExchangeMBean() throws NotCompliantMBeanException
         {
-            super(ManagedExchange.class, ManagedExchange.TYPE, ManagedExchange.VERSION);
+            super(ManagedExchange.class, ManagedExchange.TYPE);
         }
 
         protected void init() throws OpenDataException
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
index 317ff385ab..5d6d68b3c8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
@@ -40,7 +40,6 @@ import org.apache.qpid.server.queue.ManagedQueue;
 public interface ManagedExchange
 {
     static final String TYPE = "Exchange";
-    static final int VERSION = 1;
 
     /**
      * Returns the name of the managed exchange.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index c6e07f6f48..a2c2bd62a2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
@@ -50,10 +50,10 @@ public abstract class AMQManagedObject extends DefaultManagedObject
 
     protected MBeanInfo _mbeanInfo;
 
-    protected AMQManagedObject(Class<?> managementInterface, String typeName, int version)
+    protected AMQManagedObject(Class<?> managementInterface, String typeName)
         throws NotCompliantMBeanException
     {
-        super(managementInterface, typeName, version);
+        super(managementInterface, typeName);
         buildMBeanInfo();
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index d0b96afe6f..84526dbc11 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
@@ -39,15 +39,13 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
     private Class<?> _managementInterface;
 
     private String _typeName;
-    private int _version;
 
-    protected DefaultManagedObject(Class<?> managementInterface, String typeName, int version)
+    protected DefaultManagedObject(Class<?> managementInterface, String typeName)
         throws NotCompliantMBeanException
     {
         super(managementInterface);
         _managementInterface = managementInterface;
         _typeName = typeName;
-        _version = version;
     }
 
     public String getType()
@@ -117,10 +115,6 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
         objectName.append(getHierarchicalName(this));
         objectName.append("name=").append(name);
 
-        objectName.append(",");
-        objectName.append("version=").append(_version);
-
-
         return new ObjectName(objectName.toString());
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
index c18417fc43..45e2e91ed7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
@@ -40,13 +40,12 @@ public interface ManagedBroker
 {
     static final String TYPE = "VirtualHostManager";
 
-    static final int VERSION = 1 ;
-
     /**
      * Creates a new Exchange.
      * @param name
      * @param type
      * @param durable
+     * @param passive
      * @throws IOException
      * @throws JMException
      */
@@ -74,6 +73,7 @@ public interface ManagedBroker
      * @param queueName
      * @param durable
      * @param owner
+     * @param autoDelete
      * @throws IOException
      * @throws JMException
      */
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index 5dd3cc075a..bd072985c4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
@@ -37,6 +37,7 @@
  */
 package org.apache.qpid.server.protocol;
 
+import java.security.Principal;
 import java.util.Date;
 import java.util.List;
 
@@ -57,6 +58,7 @@ import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQFrame;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ConnectionCloseBody;
 import org.apache.qpid.framing.MethodRegistry;
@@ -91,7 +93,7 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed
     @MBeanConstructor("Creates an MBean exposing an AMQ Broker Connection")
     public AMQProtocolSessionMBean(AMQMinaProtocolSession session) throws NotCompliantMBeanException, OpenDataException
     {
-        super(ManagedConnection.class, ManagedConnection.TYPE, ManagedConnection.VERSION);
+        super(ManagedConnection.class, ManagedConnection.TYPE);
         _session = session;
         String remote = getRemoteAddress();
         remote = "anonymous".equals(remote) ? (remote + hashCode()) : remote;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
index e75b09a0cb..e6e713ac6d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
@@ -41,7 +41,6 @@ import org.apache.qpid.server.management.MBeanOperationParameter;
 public interface ManagedConnection
 {
     static final String TYPE = "Connection";
-    static final int VERSION = 1;
 
     @MBeanAttribute(name = "ClientId", description = "Client Id")
     String getClientId();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index 9745257c79..2ed6be77c6 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -100,7 +100,7 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
     @MBeanConstructor("Creates an MBean exposing an AMQQueue")
     public AMQQueueMBean(AMQQueue queue) throws JMException
     {
-        super(ManagedQueue.class, ManagedQueue.TYPE, ManagedQueue.VERSION);
+        super(ManagedQueue.class, ManagedQueue.TYPE);
         _queue = queue;
         _queueName = jmxEncode(new StringBuffer(queue.getName()), 0).toString();
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
index e0d131a5d9..2bc94995e9 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
@@ -41,7 +41,6 @@ import org.apache.qpid.server.management.MBeanOperationParameter;
 public interface ManagedQueue
 {
     static final String TYPE = "Queue";
-    static final int VERSION = 1;
 
     /**
      * Returns the Name of the ManagedQueue.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index b0de873cb2..32ec3a3bbc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
@@ -104,7 +104,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
 
     public AMQUserManagementMBean() throws JMException
     {
-        super(UserManagement.class, UserManagement.TYPE, UserManagement.VERSION);
+        super(UserManagement.class, UserManagement.TYPE);
     }
 
     public String getObjectInstanceName()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java
index d125fd6be4..658d7ebbd3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java
@@ -33,11 +33,8 @@ import java.io.IOException;
 
 public interface UserManagement
 {
-
     String TYPE = "UserManagement";
 
-    int VERSION = 2;
-
     //********** Operations *****************//
     /**
      * set password for user
@@ -118,5 +115,4 @@ public interface UserManagement
                     impact = MBeanOperationInfo.INFO)
     TabularData viewUsers();
 
-
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
index f4c81fbbb8..85d804457e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
@@ -31,7 +31,6 @@ import org.apache.qpid.server.management.MBeanAttribute;
 public interface ManagedVirtualHost

 {

     static final String TYPE = "VirtualHost";

-    static final int VERSION = 1;

 

     /**

      * Returns the name of the managed virtualHost.

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 9b8c97872a..9229863c35 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -104,7 +104,7 @@ public class VirtualHost implements Accessable
     {
         public VirtualHostMBean() throws NotCompliantMBeanException
         {
-            super(ManagedVirtualHost.class, ManagedVirtualHost.TYPE, ManagedVirtualHost.VERSION);
+            super(ManagedVirtualHost.class, "VirtualHost");
         }
 
         public String getObjectInstanceName()