QPID-2322: remove unused version key from the MBean ObjectName's

merge of r896674 from trunk


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@896682 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 12 insertions, 43 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 5f5fc4cbea..53755ca7ea 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
@@ -85,7 +85,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/configuration/management/ConfigurationManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
index 24f8e8878e..cc402d5b4a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
@@ -32,7 +32,7 @@ public class ConfigurationManagementMBean extends AMQManagedObject implements Co
 
     public ConfigurationManagementMBean() throws NotCompliantMBeanException
     {
-        super(ConfigurationManagement.class, ConfigurationManagement.TYPE, ConfigurationManagement.VERSION);
+        super(ConfigurationManagement.class, ConfigurationManagement.TYPE);
     }
 
     public String getObjectInstanceName()
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 b870941715..5b6339afff 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
@@ -83,7 +83,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/information/management/ServerInformationMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
index 6247404d90..db2cc970b2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
@@ -37,7 +37,7 @@ public class ServerInformationMBean extends AMQManagedObject implements ServerIn
     
     public ServerInformationMBean(String buildVersion, String productVersion) throws JMException
     {
-        super(ServerInformation.class, ServerInformation.TYPE, ServerInformation.VERSION);
+        super(ServerInformation.class, ServerInformation.TYPE);
         this.buildVersion = buildVersion;
         this.productVersion = productVersion;
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
index c36eeb5016..36e8f6cf84 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
@@ -109,7 +109,7 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
     
     public LoggingManagementMBean(String log4jConfigFileName, int log4jLogWatchInterval) throws JMException
     {
-        super(LoggingManagement.class, LoggingManagement.TYPE, LoggingManagement.VERSION);
+        super(LoggingManagement.class, LoggingManagement.TYPE);
         _log4jConfigFileName = log4jConfigFileName;
         _log4jLogWatchInterval = log4jLogWatchInterval;
     }
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 594ae24502..c4ffcd26bf 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
@@ -56,10 +56,10 @@ public abstract class AMQManagedObject extends DefaultManagedObject
 
     protected LogActor _logActor;
 
-    protected AMQManagedObject(Class<?> managementInterface, String typeName, int version)
+    protected AMQManagedObject(Class<?> managementInterface, String typeName)
         throws NotCompliantMBeanException
     {
-        super(managementInterface, typeName, version);
+        super(managementInterface, typeName);
         // CurrentActor will be defined as these objects are created during
         // broker startup.
         _logActor = new ManagementActor(CurrentActor.get().getRootMessageLogger());
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 67aee90ba4..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());
     }
 
@@ -138,9 +132,6 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
             objectName.append(hierarchyName.substring(0, hierarchyName.lastIndexOf(",")));
         }
 
-        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/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index 92b5c7a04e..91d21c57d8 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
@@ -94,7 +94,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/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index 752cb8510b..fd2d5fa36b 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
@@ -99,7 +99,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/security/access/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index 69abac7bd6..45ab57ca90 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
@@ -100,7 +100,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/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 8f035f96b3..17381f8153 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
@@ -117,7 +117,7 @@ public class VirtualHost implements Accessable
     {
         public VirtualHostMBean() throws NotCompliantMBeanException
         {
-            super(ManagedVirtualHost.class, ManagedVirtualHost.TYPE, ManagedVirtualHost.VERSION);
+            super(ManagedVirtualHost.class, ManagedVirtualHost.TYPE);
         }
 
         public String getObjectInstanceName()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
index dab98095c9..fe35cfa3aa 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
@@ -160,19 +160,6 @@ public class AMQUserManagementMBeanTest extends TestCase
         }
     }
 
-    public void testMBeanVersion()
-    {
-        try
-        {
-            ObjectName name = _amqumMBean.getObjectName();
-            assertEquals(AMQUserManagementMBean.VERSION, Integer.parseInt(name.getKeyProperty("version")));
-        }
-        catch (MalformedObjectNameException e)
-        {
-            fail(e.getMessage());
-        }
-    }
-
     public void testSetAccessFileWithMissingFile()
     {
         try
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
index e3495a7df6..a21a6713cc 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
@@ -28,7 +28,6 @@ public interface ConfigurationManagement
 {
 
     String TYPE = "ConfigurationManagement";
-    int VERSION = 1;
     
     /**
      * Reload the 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
index cb3387c6d3..dfdd43ba1a 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
@@ -36,7 +36,6 @@ import javax.management.openmbean.TabularData;
 public interface LoggingManagement
 {
     String TYPE = "LoggingManagement";
-    int VERSION = 2;
     
     //TabularType and contained CompositeType key/description information
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
index dcf77ca2ed..d02b9b89f4 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
@@ -42,8 +42,6 @@ public interface ManagedBroker
 {
     static final String TYPE = "VirtualHostManager";
 
-    static final int VERSION = 1 ;
-
     /**
      * Returns an array of the exchange types available for creation.
      * @since Qpid JMX API 1.3
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
index 5b02c20b7f..ff096aa22b 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
@@ -41,7 +41,6 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParame
 public interface ManagedConnection
 {
     static final String TYPE = "Connection";
-    static final int VERSION = 2;
     
     //TabularType and contained CompositeType key/description information
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
index c8df64549e..1ed09f4456 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
@@ -39,7 +39,6 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParame
 public interface ManagedExchange
 {
     static final String TYPE = "Exchange";
-    static final int VERSION = 1;
     
     //TabularType and contained CompositeType key/description info for DIRECT/TOPIC/FANOUT exchanges.
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
index 7838400cd1..282fc86ced 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
@@ -40,7 +40,6 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParame
 public interface ManagedQueue
 {
     static final String TYPE = "Queue";
-    static final int VERSION = 3;
 
     //TabularType and contained CompositeType key/description information for message list
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
index 9b75945d53..7bc0e717b8 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
@@ -31,7 +31,6 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute;
 public interface ServerInformation
 {
     String TYPE = "ServerInformation";
-    int VERSION = 1;
     
     /* API version info for the brokers JMX management interface
      * 
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
index 6c973b438d..474012bf12 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
@@ -30,7 +30,6 @@ public interface UserManagement
 {
 
     String TYPE = "UserManagement";
-    int VERSION = 2;
     
     //TabularType and contained CompositeType key/description information.
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set.