Author: chinthaka
Date: Mon Nov 7 01:12:27 2005
New Revision: 331245
URL: http://svn.apache.org/viewcvs?rev=331245&view=rev
Log:
Fixing MTOM so that now we can force the message to be sent as multipart
related.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=331245&r1=331244&r2=331245&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
Mon Nov 7 01:12:27 2005
@@ -195,6 +195,9 @@
public static final String ATTACHMENT_TEMP_DIR = "attachmentDIR";
public static final String CACHE_ATTACHMENTS = "cacheAttachments";
public static final String FILE_SIZE_THRESHOLD = "sizeThreshold";
+
+ // we need to some times send the message as multipart/related, even
if there is no MTOM stuff in the envelope.
+ public static final String FORCE_MIME = "ForceMimeBoundary";
}
public static final String VALUE_TRUE = "true";
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java?rev=331245&r1=331244&r2=331245&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
Mon Nov 7 01:12:27 2005
@@ -21,5 +21,6 @@
public interface MessageContextConstants {
// this will contain the keys of all the properties that will be in the
message context
+
public static final String TRANSPORT_URL = "TransportURL";
}
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=331245&r1=331244&r2=331245&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Mon Nov 7 01:12:27 2005
@@ -452,12 +452,13 @@
msgContext.getProperty(
Constants.Configuration.ENABLE_MTOM));
}
- boolean envelopeContainsOptimise =
- HTTPTransportUtils.checkEnvelopeForOptimise(
+
+ boolean forceMIME =
Constants.VALUE_TRUE.equals(msgContext.getProperty(Constants.Configuration.FORCE_MIME));
+ if(forceMIME) return true;
+
+ boolean envelopeContainsOptimise =
HTTPTransportUtils.checkEnvelopeForOptimise(
msgContext.getEnvelope());
- boolean doMTOM = enableMTOM && envelopeContainsOptimise;
- msgContext.setDoingMTOM(doMTOM);
- return doMTOM;
+ return enableMTOM && envelopeContainsOptimise;
}
public static boolean isDoingREST(MessageContext msgContext) {
