svn commit: r748389 - in /webservices/commons/trunk/modules/transport/modules: base/src/main/java/org/apache/axis2/transport/base/ jms/src/main/java/org/apache/axis2/transport/jms/

[asankha]

Author: asankha
Date: Fri Feb 27 04:36:41 2009
New Revision: 748389

URL: http://svn.apache.org/viewvc?rev=748389&view=rev
Log:
Fix WSCOMMONS-444
Fix SYNAPSE-478

Modified:
    
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
    
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java
    
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java

Modified: 
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java?rev=748389&r1=748388&r2=748389&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
 Fri Feb 27 04:36:41 2009
@@ -134,6 +134,8 @@
         MessageContext msgCtx, Map trpHeaders,
         String soapAction, String contentType) {
 
+        msgCtx.setServerSide(true);
+
         // set the soapaction if one is available via a transport header
         if (soapAction != null) {
             msgCtx.setSoapAction(soapAction);

Modified: 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java?rev=748389&r1=748388&r2=748389&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java
 Fri Feb 27 04:36:41 2009
@@ -262,4 +262,12 @@
      * A MessageContext property or client Option indicating the JMS time to 
live for message sent
      */
     public static final String JMS_TIME_TO_LIVE = "JMS_TIME_TO_LIVE";
+
+    /** The prefix that denotes JMSX properties */
+    public static final String JMSX_PREFIX = "JMSX";
+    /** The JMSXGroupID property */
+    public static final String JMSX_GROUP_ID = "JMSXGroupID";
+    /** The JMSXGroupSeq property */
+    public static final String JMSX_GROUP_SEQ = "JMSXGroupSeq";
+
 }

Modified: 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=748389&r1=748388&r2=748389&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
 Fri Feb 27 04:36:41 2009
@@ -284,6 +284,11 @@
 
             String name = (String) headerName;
 
+            if (name.startsWith(JMSConstants.JMSX_PREFIX) &&
+                !(name.equals(JMSConstants.JMSX_GROUP_ID) || 
name.equals(JMSConstants.JMSX_GROUP_SEQ))) {
+                continue;
+            }
+
             if (JMSConstants.JMS_COORELATION_ID.equals(name)) {
                 message.setJMSCorrelationID(
                         (String) 
headerMap.get(JMSConstants.JMS_COORELATION_ID));