You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by th...@apache.org on 2005/08/11 07:49:55 UTC
svn commit: r231403 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java
xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
Author: thilina
Date: Wed Aug 10 22:49:18 2005
New Revision: 231403
URL: http://svn.apache.org/viewcvs?rev=231403&view=rev
Log:
Commiting SOAP versioning stuff for MTOM
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=231403&r1=231402&r2=231403&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Wed Aug 10 22:49:18 2005
@@ -114,6 +114,7 @@
(HTTPOutTransportInfo) msgContext.getProperty(
HTTPConstants.HTTPOutTransportInfo);
if (transportInfo != null) {
+ omOutput.setSoap11(msgContext.isSOAP11());
transportInfo.setContentType(omOutput.getContentType());
}else{
throw new AxisFault(HTTPConstants.HTTPOutTransportInfo + " does not set");
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java?rev=231403&r1=231402&r2=231403&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java Wed Aug 10 22:49:18 2005
@@ -41,7 +41,7 @@
public static void complete(OutputStream outStream,
OutputStream bufferedSoapOutStream, LinkedList binaryNodeList,
- String boundary, String contentId, String charSetEncoding) {
+ String boundary, String contentId, String charSetEncoding,String SOAPContentType) {
try {
startWritingMime(outStream, boundary);
@@ -52,7 +52,7 @@
rootMimeBodyPart.addHeader("content-type",
"application/xop+xml; charset=" + charSetEncoding +
- "; type=\"application/soap+xml;\"");
+ "; type=\""+SOAPContentType+";\"");
rootMimeBodyPart.addHeader("content-transfer-encoding", "binary");
rootMimeBodyPart.addHeader("content-id","<"+contentId+">");
@@ -127,7 +127,7 @@
outStream.write(new byte[]{45, 45});
}
- public static String getContentTypeForMime(String boundary, String contentId, String charSetEncoding) {
+ public static String getContentTypeForMime(String boundary, String contentId, String charSetEncoding, String SOAPContentType) {
StringBuffer sb = new StringBuffer();
sb.append("multipart/related");
sb.append("; ");
@@ -138,7 +138,7 @@
sb.append("; ");
sb.append("start=\"<" + contentId + ">\"");
sb.append("; ");
- sb.append("start-info=\"application/soap+xml; charset=" + charSetEncoding + "\"");
+ sb.append("start-info=\""+SOAPContentType+"; charset=" + charSetEncoding + "\"");
return sb.toString();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=231403&r1=231402&r2=231403&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Wed Aug 10 22:49:18 2005
@@ -102,14 +102,23 @@
public void flush() throws XMLStreamException {
xmlWriter.flush();
+ String SOAPContentType;
if (doOptimize) {
+ if (isSoap11)
+ {
+ SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+ }
+ else
+ {
+ SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+ }
MIMEOutputUtils.complete(
outStream,
bufferedSoapOutStream,
binaryNodeList,
getMimeBoundary(),
getRootContentId(),
- this.charSetEncoding);
+ this.charSetEncoding,SOAPContentType);
}
}
@@ -118,12 +127,20 @@
}
public String getContentType() {
-
+ String SOAPContentType;
if (isOptimized()) {
+ if (isSoap11)
+ {
+ SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+ }
+ else
+ {
+ SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+ }
return MIMEOutputUtils.getContentTypeForMime(
getMimeBoundary(),
getRootContentId(),
- this.getCharSetEncoding());
+ this.getCharSetEncoding(),SOAPContentType);
} else {
StringBuffer buf = new StringBuffer();
@@ -222,5 +239,4 @@
public void setDoOptimize(boolean b) {
doOptimize = b;
}
-
}