[jboss-cvs] JBoss Messaging SVN: r6866 - in trunk: src/main/org/jboss/messaging/jms/server/management/impl and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-05-19 05:05:43 -0400 (Tue, 19 May 2009)
New Revision: 6866

Modified:
   trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
   trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
   trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
Log:
JMSQueueControlMBean refactoring

* renamed sendMessageToDLQ to sendMessageToDeadLetterAddress

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -96,7 +96,7 @@
    String messageID) throws Exception;
 
    @Operation(desc = "Send the message corresponding to the given messageID to the queue's Dead Letter Queue", impact = ACTION)
-   boolean sendMessageToDLQ(@Parameter(name = "messageID", desc = "A message ID")
+   boolean sendMessageToDeadLetterAddress(@Parameter(name = "messageID", desc = "A message ID")
    String messageID) throws Exception;
 
    @Operation(desc = "Change the priority of the message corresponding to the given messageID", impact = ACTION)

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -231,7 +231,7 @@
       return coreQueueControl.expireMessages(filter);
    }
 
-   public boolean sendMessageToDLQ(final String messageID) throws Exception
+   public boolean sendMessageToDeadLetterAddress(final String messageID) throws Exception
    {
       String filter = createFilterForJMSMessageID(messageID);
       int dead = coreQueueControl.sendMessagesToDeadLetterAddress(filter);

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -204,9 +204,9 @@
       return (Boolean)replicationAwareInvoke("removeMessage", messageID);
    }
 
-   public boolean sendMessageToDLQ(final String messageID) throws Exception
+   public boolean sendMessageToDeadLetterAddress(final String messageID) throws Exception
    {
-      return (Boolean)replicationAwareInvoke("sendMessageToDLQ", messageID);
+      return (Boolean)replicationAwareInvoke("sendMessageToDeadLetterAddress", messageID);
    }
 
    public void setExpiryAddress(final String expiryAddress) throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -271,7 +271,7 @@
       assertEquals(1, liveQueueControl.getMessageCount());
       assertEquals(1, backupQueueControl.getMessageCount());
 
-      assertTrue(liveQueueControl.sendMessageToDLQ(message.getJMSMessageID()));
+      assertTrue(liveQueueControl.sendMessageToDeadLetterAddress(message.getJMSMessageID()));
       
       // check the message is no longer in the queue on both live & backup nodes
       assertEquals(0, liveQueueControl.getMessageCount());

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -464,7 +464,7 @@
       assertEquals(deadLetterAddress, queueControl.getDeadLetterAddress());
    }
 
-   public void testSendMessageToDLQ() throws Exception
+   public void testSendMessageToDeadLetterAddress() throws Exception
    {
       String deadLetterQueue = randomString();
       serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true);
@@ -489,7 +489,7 @@
 
       queueControl.setDeadLetterAddress(dlq.getAddress());
 
-      boolean movedToDeadLetterAddress = queueControl.sendMessageToDLQ(message.getJMSMessageID());
+      boolean movedToDeadLetterAddress = queueControl.sendMessageToDeadLetterAddress(message.getJMSMessageID());
       assertTrue(movedToDeadLetterAddress);
       assertEquals(1, queueControl.getMessageCount());
       assertEquals(1, dlqControl.getMessageCount());
@@ -503,7 +503,7 @@
       serverManager.destroyQueue(deadLetterQueue);
    }
 
-   public void testSendMessageToDLQWithUnknownMessageID() throws Exception
+   public void testSendMessageToDeadLetterAddressWithUnknownMessageID() throws Exception
    {
       String unknownMessageID = randomString();
 
@@ -511,7 +511,7 @@
 
       try
       {
-         queueControl.sendMessageToDLQ(unknownMessageID);
+         queueControl.sendMessageToDeadLetterAddress(unknownMessageID);
          fail();
       }
       catch (Exception e)

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java	2009-05-19 08:59:33 UTC (rev 6865)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java	2009-05-19 09:05:43 UTC (rev 6866)
@@ -141,7 +141,7 @@
 
       assertEquals(2, proxy.retrieveAttributeValue("MessageCount"));
 
-      Object[] maps = (Object[])proxy.invokeOperation("listAllMessages", null);
+      Object[] maps = (Object[])proxy.invokeOperation("listAllMessages");
       assertEquals(2, maps.length);
 
       // retrieve the first message info
@@ -453,7 +453,7 @@
       assertEquals(deadLetterAddress, proxy.retrieveAttributeValue("DeadLetterAddress"));
    }
 
-   public void testSendMessageToDLQ() throws Exception
+   public void testSendMessageToDeadLetterAddress() throws Exception
    {
       String deadLetterQueue = randomString();
       serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true);
@@ -478,7 +478,7 @@
 
       proxy.invokeOperation("setDeadLetterAddress", dlq.getAddress());
 
-      boolean movedToDeadLetterAddress = (Boolean)proxy.invokeOperation("sendMessageToDLQ", message.getJMSMessageID());
+      boolean movedToDeadLetterAddress = (Boolean)proxy.invokeOperation("sendMessageToDeadLetterAddress", message.getJMSMessageID());
       assertTrue(movedToDeadLetterAddress);
       assertEquals(1, proxy.retrieveAttributeValue("MessageCount"));
       assertEquals(1, dlqControl.getMessageCount());
@@ -492,7 +492,7 @@
       serverManager.destroyQueue(deadLetterQueue);
    }
 
-   public void testSendMessageToDLQWithUnknownMessageID() throws Exception
+   public void testSendMessageToDeadLetterAddressWithUnknownMessageID() throws Exception
    {
       String unknownMessageID = randomString();
 
@@ -500,7 +500,7 @@
 
       try
       {
-         proxy.invokeOperation("sendMessageToDLQ", unknownMessageID);
+         proxy.invokeOperation("sendMessageToDeadLetterAddress", unknownMessageID);
          fail();
       }
       catch (Exception e)