QPID-2700 Patch for ability to remove bindings from exchanges and additional tests for direct and topic exchange add/remove logic from Andrew Kennedy

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

3 files changed, 20 insertions, 6 deletions

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 1ed09f4456..50acc264e6 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
@@ -32,9 +32,8 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParame
 
 /**
  * The management interface exposed to allow management of an Exchange.
- * @author  Robert J. Greig
- * @author  Bhupendra Bhardwaj
- * @version 0.1
+ *
+ * @version 1.8
  */
 public interface ManagedExchange
 {
@@ -105,5 +104,20 @@ public interface ManagedExchange
     void createNewBinding(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue name") String queueName,
                           @MBeanOperationParameter(name="Binding", description="New binding")String binding)
         throws JMException;
-
+    
+    /**
+     * Removes an exchange binding from a queue.
+     * 
+     * @param exchangeName the Exchange name
+     * @param routingKey the routing key
+     * @throws IOException
+     * @throws JMException
+     * @since 1.8
+     */
+    @MBeanOperation(name="removeBinding",
+                    description="Removes an exchange binding from the Queue",
+                    impact= MBeanOperationInfo.ACTION)
+    void removeBinding(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue name") String queueName,
+                       @MBeanOperationParameter(name="Binding", description="New binding")String binding)
+            throws IOException, JMException;
 }
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 c6f7829e59..f61c41dea9 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
@@ -42,7 +42,7 @@ public interface ServerInformation
      *  Qpid JMX API 1.1 can be assumed.
      */
     int QPID_JMX_API_MAJOR_VERSION = 1;
-    int QPID_JMX_API_MINOR_VERSION = 7;
+    int QPID_JMX_API_MINOR_VERSION = 8;
     
     
     /**
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 13485df718..0d9f2ff678 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
@@ -47,7 +47,7 @@ public abstract class ApplicationRegistry
 
     //max supported broker management interface supported by this release of the management console
     public static final int SUPPORTED_QPID_JMX_API_MAJOR_VERSION = 1;
-    public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 7;
+    public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 8;
     
     public static final String DATA_DIR = System.getProperty("user.home") + File.separator + ".qpidmc";