svn commit: r1502733 - in /synapse/trunk/java/modules: integration/src/test/java/org/apache/synapse/samples/framework/ transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/

[hiranya]

Author: hiranya
Date: Sat Jul 13 01:05:21 2013
New Revision: 1502733

URL: http://svn.apache.org/r1502733
Log:
Fixing MTOM, SwA mediation and re-enabling sample51 integration test

Modified:
    
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java

Modified: 
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java?rev=1502733&r1=1502732&r2=1502733&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
 (original)
+++ 
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
 Sat Jul 13 01:05:21 2013
@@ -177,7 +177,7 @@ public class TestSamplesHandlerSuite ext
 
         //Endpoint
         sampleClassRepo.put("50", Sample50.class);
-        //sampleClassRepo.put("51", Sample51.class);
+        sampleClassRepo.put("51", Sample51.class);
         sampleClassRepo.put("52", Sample52.class);
         sampleClassRepo.put("53", Sample53.class);
         sampleClassRepo.put("54", Sample54.class);

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java?rev=1502733&r1=1502732&r2=1502733&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java
 Sat Jul 13 01:05:21 2013
@@ -53,6 +53,7 @@ public class PassThroughConstants {
     public static final String CONTENT_TYPE = "CONTENT_TYPE";
 
     public static final String DEFAULT_CONTENT_TYPE = 
"application/octet-stream";
+    public static final String CONTENT_TYPE_MULTIPART_RELATED = 
"multipart/related";
 
     public static final String HIDDEN_SERVICE_PARAM_NAME = "hiddenService";
 

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java?rev=1502733&r1=1502732&r2=1502733&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
 Sat Jul 13 01:05:21 2013
@@ -130,9 +130,23 @@ public class TargetRequest {
         
        
         //fix for  POST_TO_URI
-        if(requestMsgCtx.isPropertyTrue(NhttpConstants.POST_TO_URI)){
+        if (requestMsgCtx.isPropertyTrue(NhttpConstants.POST_TO_URI)){
                path = url.toString();
         }
+
+        Object o = requestMsgCtx.getProperty(MessageContext.TRANSPORT_HEADERS);
+        if (o != null && o instanceof Map) {
+            Map _headers = (Map) o;
+            String trpContentType = (String) _headers.get(HTTP.CONTENT_TYPE);
+            if (trpContentType != null && !trpContentType.equals("")) {
+                if 
(trpContentType.contains(PassThroughConstants.CONTENT_TYPE_MULTIPART_RELATED) &&
+                    
!requestMsgCtx.isPropertyTrue(PassThroughConstants.MESSAGE_BUILDER_INVOKED)) {
+                    // If the message is multipart/related but it hasn't been 
built
+                    // we can copy the content-type header of the request
+                    headers.put(HTTP.CONTENT_TYPE, trpContentType);
+                }
+            }
+        }
                                                             
         if (hasEntityBody) {
             request = new BasicHttpEntityEnclosingRequest(method, path,
@@ -159,7 +173,7 @@ public class TargetRequest {
         }
         
         //setup wsa action..
-        if(request != null){
+        if (request != null){
                
                String soapAction = requestMsgCtx.getSoapAction();
             if (soapAction == null) {
@@ -225,7 +239,7 @@ public class TargetRequest {
         * 
         * @param conn
         * @param requestMsgCtx
-        * @param disableChunking
+
         * @throws IOException
         * @throws AxisFault
         */