[jboss-cvs] JBoss Messaging SVN: r5332 - in branches/Branch_1416_merge: src/main/org/jboss/jms/delegate and 1 other directories.

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

Author: gaohoward
Date: 2008-11-11 04:24:58 -0500 (Tue, 11 Nov 2008)
New Revision: 5332

Modified:
   branches/Branch_1416_merge/integration/EAP4/etc/aop-messaging-client.xml
   branches/Branch_1416_merge/src/main/org/jboss/jms/delegate/ProducerDelegate.java
   branches/Branch_1416_merge/src/main/org/jboss/jms/message/JBossMessage.java
Log:
JBMESSAGING-1416 (clean up)


Modified: branches/Branch_1416_merge/integration/EAP4/etc/aop-messaging-client.xml
===================================================================
--- branches/Branch_1416_merge/integration/EAP4/etc/aop-messaging-client.xml	2008-11-11 06:29:27 UTC (rev 5331)
+++ branches/Branch_1416_merge/integration/EAP4/etc/aop-messaging-client.xml	2008-11-11 09:24:58 UTC (rev 5332)
@@ -260,6 +260,12 @@
    <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->close())">
       <advice name="handleClose" aspect="org.jboss.jms.client.container.ProducerAspect"/>
    </bind>    
+   <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->enableOrderingGroup(..))">
+      <advice name="handleEnableOrderingGroup" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+   </bind>    
+   <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->disableOrderingGroup())">
+      <advice name="handleDisableOrderingGroup" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+   </bind>    
    <!-- Producers never go to the server - so no need for a failover interceptor -->   
 
    <!--

Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/delegate/ProducerDelegate.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/delegate/ProducerDelegate.java	2008-11-11 06:29:27 UTC (rev 5331)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/delegate/ProducerDelegate.java	2008-11-11 09:24:58 UTC (rev 5332)
@@ -32,6 +32,7 @@
  * 
  * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
  * @version <tt>$Revision$</tt>
  */
 public interface ProducerDelegate extends Closeable
@@ -75,4 +76,8 @@
              int deliveryMode,
              int priority,
              long timeToLive, boolean keepOriginalID) throws JMSException;
+   
+   void enableOrderingGroup(String ogrpName) throws JMSException;
+   
+   void disableOrderingGroup() throws JMSException;
 }

Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/message/JBossMessage.java	2008-11-11 06:29:27 UTC (rev 5331)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/message/JBossMessage.java	2008-11-11 09:24:58 UTC (rev 5332)
@@ -68,6 +68,7 @@
  * @author Hiram Chirino (Cojonudo14 at hotmail.com)
  * @author David Maplesden (David.Maplesden at orion.co.nz)
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
  *
  * $Id$
  */
@@ -112,6 +113,12 @@
    //Used when bridging a message
    public static final String JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST = "JBM_BRIDGE_MSG_ID_LIST";
    
+   //Used in ordering group
+   public static final String JBOSS_MESSAGING_ORDERING_GROUP_ID = "JBM_ORDERING_GROUP_ID";
+   
+   //Used in ordering group
+   public static final String JBOSS_MESSAGING_ORDERING_GROUP_SEQ = "JBM_ORDERING_GROUP_SEQ";
+
    private static final Logger log = Logger.getLogger(JBossMessage.class);   
       
    // Static --------------------------------------------------------
@@ -222,7 +229,7 @@
       {
          deliveryCount = m.getIntProperty("JMSXDeliveryCount");
       }
-      catch (JMSException e)
+      catch (Exception e)
       {
          log.error("Failed to get delivery count", e);
       }
@@ -457,7 +464,19 @@
       //when routing the message
       this.destination = destination; 
    }
-   
+
+   //used in message ordering group. Marking the message as an ordering group member.
+   public void setJBMOrderingGroupName(String grpName) throws JMSException
+   {
+      setStringProperty(JBOSS_MESSAGING_ORDERING_GROUP_ID, grpName);
+   }
+
+   //Set the sequence number for this message.
+   public void setJBMOrderingGroupSeq(long groupSequenceNum) throws JMSException
+   {
+      setLongProperty(JBOSS_MESSAGING_ORDERING_GROUP_SEQ, groupSequenceNum);
+   }
+
    //We need to override getHeaders - so the JMSDestination header gets persisted to the db
    //This is called by the persistence manager
    public Map getHeaders()
@@ -1089,6 +1108,7 @@
                                             "' is reserved due to selector syntax.");
       }          
    }
+
    
    // Protected -----------------------------------------------------