[hornetq-commits] JBoss hornetq SVN: r11844 - in branches/Branch_2_2_EAP: src/main/org/hornetq/jms/management/impl and 1 other directories.

Author: clebert.suconic(a)jboss.com Date: 2011-12-05 18:34:09 -0500 (Mon, 05 Dec 2011) New Revision: 11844 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/JMSQueueControl.java branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/TopicControl.java branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java Log: JBPAPP-7541 - just adding missing methods to the JMX Control Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/JMSQueueControl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2011-12-05 22:58:28 UTC (rev 11843) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2011-12-05 23:34:09 UTC (rev 11844) @@ -77,6 +77,10 @@ */ @Operation(desc = "Adds the queue to another JNDI binding") void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception; + + @Operation(desc = "Adds the queue to another JNDI binding") + void removeJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception; + /** * Lists all the JMS messages in this queue matching the specified filter. Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/TopicControl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/TopicControl.java 2011-12-05 22:58:28 UTC (rev 11843) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/jms/management/TopicControl.java 2011-12-05 23:34:09 UTC (rev 11844) @@ -13,7 +13,6 @@ package org.hornetq.api.jms.management; -import java.util.List; import java.util.Map; import javax.management.MBeanOperationInfo; @@ -64,8 +63,13 @@ /** * Add the JNDI binding to this destination */ - @Operation(desc = "Adds the queue to another JNDI binding") + @Operation(desc = "Add the queue to another JNDI binding") void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception; + + @Operation(desc = "Add the queue to another JNDI binding") + void removeJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception; + + Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2011-12-05 22:58:28 UTC (rev 11843) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2011-12-05 23:34:09 UTC (rev 11844) @@ -173,6 +173,11 @@ { jmsServerManager.addQueueToJndi(managedQueue.getName(), jndi); } + + public void removeJNDI(String jndi) throws Exception + { + jmsServerManager.removeQueueFromJNDI(managedQueue.getName(), jndi); + } public String[] getJNDIBindings() { Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2011-12-05 22:58:28 UTC (rev 11843) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2011-12-05 23:34:09 UTC (rev 11844) @@ -91,7 +91,17 @@ { jmsServerManager.addTopicToJndi(managedTopic.getName(), jndi); } + + /* (non-Javadoc) + * @see org.hornetq.api.jms.management.TopicControl#removeJNDI(java.lang.String) + */ + public void removeJNDI(String jndi) throws Exception + { + jmsServerManager.removeTopicFromJNDI(managedTopic.getName(), jndi); + } + + public String[] getJNDIBindings() { return jmsServerManager.getJNDIOnTopic(managedTopic.getName()); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2011-12-05 22:58:28 UTC (rev 11843) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2011-12-05 23:34:09 UTC (rev 11844) @@ -298,6 +298,12 @@ { return (String)proxy.invokeOperation("listConsumersAsJSON"); } + + public void removeJNDI(String jndi) throws Exception + { + // TODO Auto-generated method stub + + } }; }