7 files changed, 14 insertions, 14 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
index b236581cbf..4bd21c737b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 
-@AmqpManagement( creatable = false )
+@ManagedObject( creatable = false, category = false )
 /**
  * An object that can be "managed" (eg via the web interface) and usually read from configuration.
  */
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 5e86f83dfb..061d82fe5e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
-@AmqpManagement( creatable = false )
+@ManagedObject( creatable = false )
 public interface Connection<X extends Connection<X>> extends ConfiguredObject<X>
 {
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index 792453b13f..f788a07c4b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-@AmqpManagement
+@ManagedObject
 
 public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>
 {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AmqpManagement.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java
index a7ef6e4e4e..f3370ff354 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AmqpManagement.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java
@@ -25,9 +25,9 @@ import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 
-public @interface AmqpManagement
+public @interface ManagedObject
 {
-    String[] attributes() default {};
+    boolean category() default true;
     String[] operations() default {};
     boolean managesChildren() default false; // for objects that manage children, a management node needs to be created
     boolean creatable() default true;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 9f806caa93..9a4f9d6af1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import org.apache.qpid.server.queue.QueueEntryVisitor;
 
-@AmqpManagement
+@ManagedObject
 
 public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
 {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index e24b048870..8fb1a306e9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -30,7 +30,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-@AmqpManagement( managesChildren = true )
+@ManagedObject( managesChildren = true )
 
 public interface VirtualHost<X extends VirtualHost<X>> extends ConfiguredObject<X>
 {
diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 9a6dfa3b7e..9c9e2a011f 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -32,7 +32,7 @@ import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.message.internal.InternalMessage;
 import org.apache.qpid.server.message.internal.InternalMessageHeader;
-import org.apache.qpid.server.model.AmqpManagement;
+import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.ConfigurationChangeListener;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -145,7 +145,7 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
         allClasses.add(objectClass.getSuperclass());
         for(Class clazz : allClasses)
         {
-            AmqpManagement annotation = (AmqpManagement) clazz.getAnnotation(AmqpManagement.class);
+            ManagedObject annotation = (ManagedObject) clazz.getAnnotation(ManagedObject.class);
             if(annotation != null)
             {
                 return clazz;
@@ -159,7 +159,7 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
         Class clazz = getManagementClass(objectClass);
         if( clazz != null)
         {
-            AmqpManagement annotation = (AmqpManagement) clazz.getAnnotation(AmqpManagement.class);
+            ManagedObject annotation = (ManagedObject) clazz.getAnnotation(ManagedObject.class);
             populateTypeMetaData(clazz, annotation);
             return true;
         }
@@ -170,7 +170,7 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
     }
 
     private ManagedEntityType populateTypeMetaData(Class clazz,
-                                                   final AmqpManagement entityType)
+                                                   final ManagedObject entityType)
     {
 
         ManagedEntityType managedEntityType = _entityTypes.get(clazz.getName());
@@ -203,11 +203,11 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
 
             for(Class parentClazz : allClasses)
             {
-                if(parentClazz.getAnnotation(AmqpManagement.class) != null)
+                if(parentClazz.getAnnotation(ManagedObject.class) != null)
                 {
                     ManagedEntityType parentType = populateTypeMetaData(parentClazz,
-                                                                        (AmqpManagement) parentClazz.getAnnotation(
-                                                                                AmqpManagement.class)
+                                                                        (ManagedObject) parentClazz.getAnnotation(
+                                                                                ManagedObject.class)
                                                                        );
                     parentSet.add(parentType);
                     parentSet.addAll(Arrays.asList(parentType.getParents()));