[jboss-svn-commits] JBL Code SVN: r13107 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb: listeners/gateway and 1 other directories.

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

Author: mark.little at jboss.com
Date: 2007-07-05 09:02:36 -0400 (Thu, 05 Jul 2007)
New Revision: 13107

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
Log:
http://jira.jboss.com/jira/browse/JBESB-656

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-07-05 12:58:45 UTC (rev 13106)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-07-05 13:02:36 UTC (rev 13107)
@@ -138,6 +138,12 @@
 	public static final String MESSAGE_EXIT_TIME = "org.jboss.soa.esb.message.time.dod";  // time died
 	
 	/*
+	 * Some JMS specific message element names.
+	 */
+	
+	public static final String JMS_CORRELATION_ID = "org.jboss.soa.esb.message.transport.jms.correlationID";
+	
+	/*
 	 * Filter properties should be identified by:
 	 * 
 	 * org.jboss.soa.esb.courier.filter.<number>

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-07-05 12:58:45 UTC (rev 13106)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/PackageJmsMessageContents.java	2007-07-05 13:02:36 UTC (rev 13107)
@@ -30,6 +30,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.TextMessage;
 
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 
@@ -62,7 +63,7 @@
          message.getBody().add(msg.getObject());
      }
      if (jmsMsg.getJMSMessageID()!=null) {
-         message.getBody().add("MessageId", jmsMsg.getJMSMessageID());
+         message.getBody().add(Environment.JMS_CORRELATION_ID, jmsMsg.getJMSMessageID());
      }
      Enumeration<String> EE = jmsMsg.getPropertyNames();
      if (null != EE)

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-07-05 12:58:45 UTC (rev 13106)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2007-07-05 13:02:36 UTC (rev 13107)
@@ -35,6 +35,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.rosetta.pooling.JmsConnectionPool;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.format.MessageType;
 
@@ -189,8 +190,8 @@
                 }
 				oMsg = m_oSess[0].createTextMessage(content);
 			}
-            if (message.getBody().get("MessageId")!=null) {
-                oMsg.setJMSCorrelationID((String)message.getBody().get("MessageId"));
+            if (message.getBody().get(Environment.JMS_CORRELATION_ID)!=null) {
+                oMsg.setJMSCorrelationID((String)message.getBody().get(Environment.JMS_CORRELATION_ID));
             }
 	
 			for (Iterator II = m_oProps.keySet().iterator(); II.hasNext();)