You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ru...@apache.org on 2009/09/23 05:05:20 UTC

svn commit: r817943 - in /webservices/commons/branches/modules/transport/1.0.0/modules: base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java

Author: ruwan
Date: Wed Sep 23 03:05:20 2009
New Revision: 817943

URL: http://svn.apache.org/viewvc?rev=817943&view=rev
Log:
Partial refactoring to get the WSCOMMONS-444 fixed (it requires synapse changes as well)

Modified:
    webservices/commons/branches/modules/transport/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
    webservices/commons/branches/modules/transport/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java

Modified: webservices/commons/branches/modules/transport/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/transport/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java?rev=817943&r1=817942&r2=817943&view=diff
==============================================================================
--- webservices/commons/branches/modules/transport/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java (original)
+++ webservices/commons/branches/modules/transport/1.0.0/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java Wed Sep 23 03:05:20 2009
@@ -134,7 +134,6 @@
         MessageContext msgCtx, Map trpHeaders,
         String soapAction, String contentType) {
 
-
         // set the soapaction if one is available via a transport header
         if (soapAction != null) {
             msgCtx.setSoapAction(soapAction);

Modified: webservices/commons/branches/modules/transport/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/transport/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=817943&r1=817942&r2=817943&view=diff
==============================================================================
--- webservices/commons/branches/modules/transport/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/commons/branches/modules/transport/1.0.0/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java Wed Sep 23 03:05:20 2009
@@ -449,22 +449,14 @@
         // load any transport headers from received message
         JMSUtils.loadTransportHeaders(message, responseMsgCtx);
 
-        // workaround for Axis2 TransportUtils.createSOAPMessage() issue, where a response
-        // of content type "text/xml" is thought to be REST if !MC.isServerSide(). This
-        // question is still under debate and due to the timelines, I am commiting this
-        // workaround as Axis2 1.2 is about to be released and Synapse 1.0
-        responseMsgCtx.setServerSide(false);
-
-        String contentType =
-                contentTypeProperty == null ? null
-                        : JMSUtils.getProperty(message, contentTypeProperty);
+        String contentType = contentTypeProperty == null ? null
+                : JMSUtils.getProperty(message, contentTypeProperty);
 
         try {
             JMSUtils.setSOAPEnvelope(message, responseMsgCtx, contentType);
         } catch (JMSException ex) {
             throw AxisFault.makeFault(ex);
         }
-//        responseMsgCtx.setServerSide(true);
 
         handleIncomingMessage(
             responseMsgCtx,