Merged revisions 534473-534477,534479-534763 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r534473 | bhupendrab | 2007-05-02 15:19:52 +0100 (Wed, 02 May 2007) | 2 lines
  
  Exchange MBeans updated - init method moved to super class. 
  Exception handling of management console updated for SecurityException.
........
  r534763 | bhupendrab | 2007-05-03 10:35:11 +0100 (Thu, 03 May 2007) | 1 line
  
  Management console users list display is updated.
........


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

6 files changed, 36 insertions, 71 deletions

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 ff120e6a92..868ac31a54 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
@@ -23,6 +23,13 @@ package org.apache.qpid.server.exchange;
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.TabularType;
+import javax.management.openmbean.TabularDataSupport;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.ArrayType;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
@@ -60,11 +67,33 @@ public abstract class AbstractExchange implements Exchange, Managable
      */
     protected abstract class ExchangeMBean extends AMQManagedObject implements ManagedExchange
     {
+        // open mbean data types for representing exchange bindings
+        protected String[] _bindingItemNames;
+        protected String[] _bindingItemIndexNames;
+        protected OpenType[] _bindingItemTypes;
+        protected CompositeType _bindingDataType;
+        protected TabularType _bindinglistDataType;
+        protected TabularDataSupport _bindingList;
+        
         public ExchangeMBean() throws NotCompliantMBeanException
         {
             super(ManagedExchange.class, ManagedExchange.TYPE);
         }
 
+        protected void init() throws OpenDataException
+        {
+            _bindingItemNames = new String[]{"Binding Key", "Queue Names"};
+            _bindingItemIndexNames = new String[]{_bindingItemNames[0]};
+            
+            _bindingItemTypes = new OpenType[2];
+            _bindingItemTypes[0] = SimpleType.STRING;
+            _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
+            _bindingDataType = new CompositeType("Exchange Binding", "Binding key and Queue names",
+                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);
+            _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
+                                                   _bindingDataType, _bindingItemIndexNames);
+        }
+
         public ManagedObject getParentObject()
         {
             return _virtualHost.getManagedObject();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
index de3905268e..ab103fbd2a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
@@ -64,14 +64,6 @@ public class DestNameExchange extends AbstractExchange
     @MBeanDescription("Management Bean for Direct Exchange")
     private final class DestNameExchangeMBean extends ExchangeMBean
     {
-        // open mbean data types for representing exchange bindings
-        private String[]   _bindingItemNames = {"Routing Key", "Queue Names"};
-        private String[]   _bindingItemIndexNames = {_bindingItemNames[0]};
-        private OpenType[] _bindingItemTypes = new OpenType[2];
-        private CompositeType      _bindingDataType = null;
-        private TabularType        _bindinglistDataType = null;
-        private TabularDataSupport _bindingList = null;
-
         @MBeanConstructor("Creates an MBean for AMQ direct exchange")
         public DestNameExchangeMBean()  throws JMException
         {
@@ -80,19 +72,6 @@ public class DestNameExchange extends AbstractExchange
             init();
         }
 
-        /**
-         * initialises the OpenType objects.
-         */
-        private void init() throws OpenDataException
-        {
-            _bindingItemTypes[0] = SimpleType.STRING;
-            _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-            _bindingDataType = new CompositeType("Exchange Binding", "Routing key and Queue names",
-                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);
-            _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
-                                                 _bindingDataType, _bindingItemIndexNames);
-        }
-
         public TabularData bindings() throws OpenDataException
         {
             Map<AMQShortString, List<AMQQueue>> bindings = _index.getBindingsMap();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
index 605a4bcb61..386cfd2349 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
@@ -61,14 +61,6 @@ public class DestWildExchange extends AbstractExchange
     @MBeanDescription("Management Bean for Topic Exchange")
     private final class DestWildExchangeMBean extends ExchangeMBean
     {
-        // open mbean data types for representing exchange bindings
-        private String[] _bindingItemNames = {"Routing Key", "Queue Names"};
-        private String[] _bindingItemIndexNames = {_bindingItemNames[0]};
-        private OpenType[] _bindingItemTypes = new OpenType[2];
-        private CompositeType _bindingDataType = null;
-        private TabularType _bindinglistDataType = null;
-        private TabularDataSupport _bindingList = null;
-
         @MBeanConstructor("Creates an MBean for AMQ topic exchange")
         public DestWildExchangeMBean() throws JMException
         {
@@ -77,17 +69,6 @@ public class DestWildExchange extends AbstractExchange
             init();
         }
 
-        /** initialises the OpenType objects. */
-        private void init() throws OpenDataException
-        {
-            _bindingItemTypes[0] = SimpleType.STRING;
-            _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-            _bindingDataType = new CompositeType("Exchange Binding", "Routing key and Queue names",
-                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);
-            _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
-                                                   _bindingDataType, _bindingItemIndexNames);
-        }
-
         /** returns exchange bindings in tabular form */
         public TabularData bindings() throws OpenDataException
         {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index 095fd2b7e9..b3690d3e10 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
@@ -41,14 +41,6 @@ public class FanoutExchange extends AbstractExchange
     @MBeanDescription("Management Bean for Fanout Exchange")

     private final class FanoutExchangeMBean extends ExchangeMBean

     {

-        // open mbean data types for representing exchange bindings

-        private String[]   _bindingItemNames = {"Routing Key", "Queue Names"};

-        private String[]   _bindingItemIndexNames = {_bindingItemNames[0]};

-        private OpenType[] _bindingItemTypes = new OpenType[2];

-        private CompositeType _bindingDataType = null;

-        private TabularType _bindinglistDataType = null;

-        private TabularDataSupport _bindingList = null;

-

         @MBeanConstructor("Creates an MBean for AMQ fanout exchange")

         public FanoutExchangeMBean()  throws JMException

         {

@@ -57,19 +49,6 @@ public class FanoutExchange extends AbstractExchange
             init();

         }

 

-        /**

-         * initialises the OpenType objects.

-         */

-        private void init() throws OpenDataException

-        {

-            _bindingItemTypes[0] = SimpleType.STRING;

-            _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);

-            _bindingDataType = new CompositeType("Exchange Binding", "Routing key and Queue names",

-                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);

-            _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),

-                                                 _bindingDataType, _bindingItemIndexNames);

-        }

-

         public TabularData bindings() throws OpenDataException

         {

 

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 204e2f9f93..b4b2bc20bc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
@@ -90,14 +90,6 @@ public class HeadersExchange extends AbstractExchange
     @MBeanDescription("Management Bean for Headers Exchange")
     private final class HeadersExchangeMBean extends ExchangeMBean
     {
-        // open mbean data types for representing exchange bindings
-        private String[]   _bindingItemNames = {"S.No.", "Queue Name", "Header Bindings"};
-        private String[]   _bindingItemIndexNames = {_bindingItemNames[0]};
-        private OpenType[] _bindingItemTypes = new OpenType[3];
-        private CompositeType      _bindingDataType = null;
-        private TabularType        _bindinglistDataType = null;
-        private TabularDataSupport _bindingList = null;
-
         @MBeanConstructor("Creates an MBean for AMQ Headers exchange")
         public HeadersExchangeMBean()  throws JMException
         {
@@ -105,11 +97,16 @@ public class HeadersExchange extends AbstractExchange
             _exchangeType = "headers";
             init();
         }
+        
         /**
          * initialises the OpenType objects.
          */
-        private void init() throws OpenDataException
+        protected void init() throws OpenDataException
         {
+            _bindingItemNames = new String[]{"Binding No", "Queue  Name", "Queue Bindings"};
+            _bindingItemIndexNames = new String[]{_bindingItemNames[0]};
+
+            _bindingItemTypes = new OpenType[3];
             _bindingItemTypes[0] = SimpleType.INTEGER;
             _bindingItemTypes[1] = SimpleType.STRING;
             _bindingItemTypes[2] = new ArrayType(1, SimpleType.STRING);
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
index fbb80494c1..155afa961e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
@@ -72,7 +72,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
     static TabularType _userlistDataType; // Datatype for representing User Lists
 
     static CompositeType _userDataType; // Composite type for representing User
-    static String[] _userItemNames = {"Username", "Read", "Write", "Admin"};
+    static String[] _userItemNames = {"Username", "read", "write", "admin"};
 
     static
     {