[jboss-svn-commits] JBL Code SVN: r11602 - in labs/jbossesb/trunk: product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db and 2 other directories.

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

Author: kurt.stam at jboss.com
Date: 2007-05-02 20:09:45 -0400 (Wed, 02 May 2007)
New Revision: 11602

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
Log:
JBESB-418 Switching to getAllMessages

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-05-02 23:57:58 UTC (rev 11601)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java	2007-05-03 00:09:45 UTC (rev 11602)
@@ -80,5 +80,5 @@
      * @param classification
      * @throws MessageStoreException
      */
-    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException;
+    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException;
 }
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-05-02 23:57:58 UTC (rev 11601)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java	2007-05-03 00:09:45 UTC (rev 11602)
@@ -263,9 +263,9 @@
      * @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
      * @throws MessageStoreException
      */
-    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException {
+    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
         HashMap<URI, Message> messages = new HashMap<URI, Message>();
-        String sql = "select uuid from message where delivered='TRUE'";
+        String sql = "select uuid from message";
         if (classification!=null) {
             sql += " and classification='" + classification + "'";
         }

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-02 23:57:58 UTC (rev 11601)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java	2007-05-03 00:09:45 UTC (rev 11602)
@@ -251,7 +251,7 @@
      * 
      * @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
      */
-    public Map<URI, Message> getDeliveredMessages(String classification) throws MessageStoreException {
+    public Map<URI, Message> getAllMessages(String classification) throws MessageStoreException {
         return new HashMap<URI, Message>();
     }
 

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-05-02 23:57:58 UTC (rev 11601)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessagePersisterTest.java	2007-05-03 00:09:45 UTC (rev 11602)
@@ -98,7 +98,7 @@
 			sendMessage(body);
              //now we can check the messageStore to see if our message made it in there.
             MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
-            Map<URI, Message> messages = store.getDeliveredMessages("TEST");
+            Map<URI, Message> messages = store.getAllMessages("TEST");
             assertEquals(1, messages.size());
             
             //Now check if it is the same message