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 ru...@apache.org on 2002/08/23 21:07:19 UTC
cvs commit: xml-axis/java/src/org/apache/axis/transport/http AxisServlet.java CommonsHTTPSender.java HTTPSender.java SimpleAxisWorker.java
rubys 2002/08/23 12:07:19
Modified: java/src/org/apache/axis Message.java
java/src/org/apache/axis/soap SOAP11Constants.java
SOAP12Constants.java SOAPConstants.java
java/src/org/apache/axis/transport/http AxisServlet.java
CommonsHTTPSender.java HTTPSender.java
SimpleAxisWorker.java
Log:
Support the new SOAP 1.2 encoding type
Revision Changes Path
1.84 +3 -2 xml-axis/java/src/org/apache/axis/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Message.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Message.java 23 Aug 2002 01:33:53 -0000 1.83
+++ Message.java 23 Aug 2002 19:07:19 -0000 1.84
@@ -57,6 +57,7 @@
import org.apache.axis.attachments.Attachments;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.utils.JavaUtils;
@@ -374,11 +375,11 @@
return mAttachments;
}
- public String getContentType() throws org.apache.axis.AxisFault {
+ public String getContentType(SOAPConstants sc) throws AxisFault {
//Force serialization if it hasn't happend it.
//Rick Rineholt fix this later.
mSOAPPart.getAsBytes();
- String ret = "text/xml; charset=utf-8";
+ String ret = sc.getContentType();
if (mAttachments != null && 0 != mAttachments.getAttachmentCount()) {
ret = mAttachments.getContentType();
}
1.6 +7 -0 xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java
Index: SOAP11Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAP11Constants.java 24 Jul 2002 12:25:36 -0000 1.5
+++ SOAP11Constants.java 23 Aug 2002 19:07:19 -0000 1.6
@@ -99,4 +99,11 @@
public QName getRoleAttributeQName() {
return roleQName;
}
+
+ /**
+ * Obtain the MIME content type
+ */
+ public String getContentType() {
+ return "text/xml; charset=utf-8";
+ }
}
1.6 +7 -0 xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java
Index: SOAP12Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAP12Constants.java 24 Jul 2002 12:25:36 -0000 1.5
+++ SOAP12Constants.java 23 Aug 2002 19:07:19 -0000 1.6
@@ -99,4 +99,11 @@
public QName getRoleAttributeQName() {
return roleQName;
}
+
+ /**
+ * Obtain the MIME content type
+ */
+ public String getContentType() {
+ return "application/soap+xml; charset=utf-8";
+ }
}
1.5 +5 -0 xml-axis/java/src/org/apache/axis/soap/SOAPConstants.java
Index: SOAPConstants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAPConstants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPConstants.java 24 Jul 2002 12:25:36 -0000 1.4
+++ SOAPConstants.java 23 Aug 2002 19:07:19 -0000 1.5
@@ -103,4 +103,9 @@
* Obtain the QName for the role attribute (actor/role)
*/
public QName getRoleAttributeQName();
+
+ /**
+ * Obtain the MIME content type
+ */
+ public String getContentType();
}
1.139 +7 -4 xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- AxisServlet.java 23 Aug 2002 00:33:40 -0000 1.138
+++ AxisServlet.java 23 Aug 2002 19:07:19 -0000 1.139
@@ -79,6 +79,7 @@
import org.apache.axis.description.ServiceDesc;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.security.servlet.ServletSecurityProvider;
+import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.utils.Admin;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
@@ -587,7 +588,8 @@
/* Send response back along the wire... */
/***********************************/
if (responseMsg != null)
- sendResponse(getProtocolVersion(req), res, responseMsg);
+ sendResponse(getProtocolVersion(req), msgContext.getSOAPConstants(),
+ res, responseMsg);
if (isDebug) {
log.debug("Response sent.");
@@ -632,7 +634,8 @@
* @throws AxisFault
* @throws IOException if the response stream can not be written to
*/
- private void sendResponse(final String clientVersion,
+ private void sendResponse(final String clientVersion,
+ SOAPConstants soapConstants,
HttpServletResponse res, Message responseMsg)
throws AxisFault, IOException
{
@@ -645,13 +648,13 @@
} else {
if(isDebug) {
log.debug("Returned Content-Type:" +
- responseMsg.getContentType());
+ responseMsg.getContentType(soapConstants));
// log.debug("Returned Content-Length:" +
// responseMsg.getContentLength());
}
try {
- res.setContentType(responseMsg.getContentType());
+ res.setContentType(responseMsg.getContentType(soapConstants));
/* My understand of Content-Length
* HTTP 1.0
1.5 +2 -1 xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java
Index: CommonsHTTPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommonsHTTPSender.java 16 Aug 2002 22:51:21 -0000 1.4
+++ CommonsHTTPSender.java 23 Aug 2002 19:07:19 -0000 1.5
@@ -335,8 +335,9 @@
if (action == null) {
action = "";
}
+ Message msg = msgContext.getRequestMessage();
method.setRequestHeader(new Header(HTTPConstants.HEADER_CONTENT_TYPE,
- msgContext.getRequestMessage().getContentType()));
+ msg.getContentType(msgContext.getSOAPConstants())));
method.setRequestHeader(new Header(HTTPConstants.HEADER_SOAP_ACTION, "\"" + action + "\""));
method.setUseDisk(false);
String userID = msgContext.getUsername();
1.81 +1 -1 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
Index: HTTPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- HTTPSender.java 21 Aug 2002 13:42:13 -0000 1.80
+++ HTTPSender.java 23 Aug 2002 19:07:19 -0000 1.81
@@ -345,7 +345,7 @@
.append("\r\n")
.append(HTTPConstants.HEADER_CONTENT_TYPE)
.append(": ")
- .append(reqMessage.getContentType())
+ .append(reqMessage.getContentType(msgContext.getSOAPConstants()))
.append("\r\n")
.append( HTTPConstants.HEADER_ACCEPT ) //Limit to the types that are meaningful to us.
.append( ": ")
1.15 +1 -1 xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java
Index: SimpleAxisWorker.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SimpleAxisWorker.java 12 Aug 2002 22:53:09 -0000 1.14
+++ SimpleAxisWorker.java 23 Aug 2002 19:07:19 -0000 1.15
@@ -450,7 +450,7 @@
out.write(HTTP);
out.write(status);
//out.write(XML_MIME_STUFF);
- out.write(("\r\n" + HTTPConstants.HEADER_CONTENT_TYPE + ": " + responseMsg.getContentType()).getBytes());
+ out.write(("\r\n" + HTTPConstants.HEADER_CONTENT_TYPE + ": " + responseMsg.getContentType(msgContext.getSOAPConstants())).getBytes());
out.write(("\r\n" + HTTPConstants.HEADER_CONTENT_LENGTH + ": " + responseMsg.getContentLength()).getBytes());
// putInt(out, response.length);