[jboss-cvs] JBoss Messaging SVN: r5306 - in trunk: src/main/org/jboss/messaging/core/message/impl and 3 other directories.

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

Author: timfox
Date: 2008-11-07 05:06:32 -0500 (Fri, 07 Nov 2008)
New Revision: 5306

Modified:
   trunk/build-messaging.xml
   trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
Log:
Re-add dlq and expiry queue tests (currently disabled) plus a few tweaks


Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-11-07 09:37:56 UTC (rev 5305)
+++ trunk/build-messaging.xml	2008-11-07 10:06:32 UTC (rev 5306)
@@ -715,6 +715,8 @@
             <formatter type="plain" usefile="${junit.formatter.usefile}"/>
             <fileset dir="${test.classes.dir}">
                <include name="${tests.param}"/>
+	       <exclude name="**/jms/ExpiryQueueTest.class"/>
+	       <exclude name="**/jms/DLQTest.class"/>
             </fileset>
          </batchtest>
       </junit>

Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java	2008-11-07 09:37:56 UTC (rev 5305)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java	2008-11-07 10:06:32 UTC (rev 5306)
@@ -56,9 +56,11 @@
 
    private static final Logger log = Logger.getLogger(MessageImpl.class);
 
-   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("JBMActualExpiryTime");
+   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("JBM_ACTUAL_EXPIRY");
 
-   public static final SimpleString HDR_ORIGIN_QUEUE = new SimpleString("JBMOriginQueue");
+   public static final SimpleString HDR_ORIGIN_QUEUE = new SimpleString("JBM_ORIG_DESTINATION");
+   
+   public static final SimpleString HDR_ORIG_MESSAGE_ID = new SimpleString("JBM_ORIG_MESSAGE_ID");
 
    public static final SimpleString GROUP_ID = new SimpleString("JBMGroupID");
 

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-11-07 09:37:56 UTC (rev 5305)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-11-07 10:06:32 UTC (rev 5306)
@@ -22,6 +22,10 @@
 
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.message.impl.MessageImpl.HDR_ACTUAL_EXPIRY_TIME;
+import static org.jboss.messaging.core.message.impl.MessageImpl.HDR_ORIGIN_QUEUE;
+import static org.jboss.messaging.core.message.impl.MessageImpl.HDR_ORIG_MESSAGE_ID;
+
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.message.impl.MessageImpl;
 import org.jboss.messaging.core.persistence.StorageManager;
@@ -173,7 +177,11 @@
       }
       else
       {
-         throw new IllegalStateException("No DLQ configured for queue " + queue.getName() + ", so dropping it");
+         log.warn("Message has exceeded max delivery attempts. No DLQ configured for queue " + queue.getName() + " so dropping it");
+         
+         Transaction tx = new TransactionImpl(persistenceManager, postOffice);
+         tx.addAcknowledgement(this);
+         tx.commit();
       }
    }
 
@@ -198,7 +206,7 @@
       }
       else
       {
-         log.warn("Message has expired, no expiry queue is configured so dropping it");
+         log.warn("Message has expired. No expiry queue configured for queue " + queue.getName() + " so dropping it");
 
          Transaction tx = new TransactionImpl(persistenceManager, postOffice);
          tx.addAcknowledgement(this);
@@ -263,7 +271,8 @@
       copy.setMessageID(newMessageId);
 
       SimpleString originalQueue = copy.getDestination();
-      copy.putStringProperty(MessageImpl.HDR_ORIGIN_QUEUE, originalQueue);
+      copy.putStringProperty(HDR_ORIGIN_QUEUE, originalQueue);
+      copy.putLongProperty(HDR_ORIG_MESSAGE_ID, message.getMessageID());
 
       // reset expiry
       copy.setExpiration(0);
@@ -271,7 +280,7 @@
       {
          long actualExpiryTime = System.currentTimeMillis();
 
-         copy.putLongProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime);
+         copy.putLongProperty(HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime);
       }
 
       return copy;

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java	2008-11-07 09:37:56 UTC (rev 5305)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java	2008-11-07 10:06:32 UTC (rev 5306)
@@ -321,7 +321,7 @@
          int count = 0;
          while (true)
          {
-            Message m = consumer.receive(200);
+            Message m = consumer.receive(1000);
             if (m == null)
             {
                break;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java	2008-11-07 09:37:56 UTC (rev 5305)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java	2008-11-07 10:06:32 UTC (rev 5306)
@@ -51,8 +51,7 @@
 public class ScheduledMessageTest extends UnitTestCase
 {
    private static final Logger log = Logger.getLogger(ScheduledMessageTest.class);
-
-   
+  
    private static final String ACCEPTOR_FACTORY = "org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory";
 
    private static final String CONNECTOR_FACTORY = "org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory";