You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/16 15:42:23 UTC
svn commit: r357167 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/mtom/
xml/src/org/apache/axis2/om/impl/llom/mtom/
xml/src/org/apache/axis2/soap/impl/llom/builder/
Author: dims
Date: Fri Dec 16 06:42:17 2005
New Revision: 357167
URL: http://svn.apache.org/viewcvs?rev=357167&view=rev
Log:
- One more test with UTF-16 :)
- Fix build break (Thanks to Ruchith)
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=357167&r1=357166&r2=357167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Fri Dec 16 06:42:17 2005
@@ -114,6 +114,7 @@
call.setClientOptions(options);
options.setTo(targetEPR);
options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+ options.setProperty(MessageContext.CHARACTER_SET_ENCODING, MessageContext.UTF_16);
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java?rev=357167&r1=357166&r2=357167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java Fri Dec 16 06:42:17 2005
@@ -23,7 +23,9 @@
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.MTOMConstants;
import org.apache.axis2.om.impl.OMNodeEx;
+import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.SOAPMessage;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
import java.io.UnsupportedEncodingException;
@@ -33,7 +35,7 @@
import javax.xml.stream.XMLStreamReader;
public class MTOMStAXSOAPModelBuilder extends StAXSOAPModelBuilder implements MTOMConstants {
-
+
/**
* <code>mimeHelper</code> handles deffered parsing of incoming MIME
* Messages
@@ -125,6 +127,7 @@
OMElement node;
if (lastNode == null) {
node = constructNode(null, elementName, true);
+ setSOAPEnvelope(node);
} else if (lastNode.isComplete()) {
node =
constructNode((OMElement) lastNode.getParent(),
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=357167&r1=357166&r2=357167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Fri Dec 16 06:42:17 2005
@@ -201,9 +201,7 @@
String elementName = parser.getLocalName();
if (lastNode == null) {
node = constructNode(null, elementName, true);
- soapMessage.setSOAPEnvelope((SOAPEnvelope) node);
- soapMessage.setXMLVersion(parser.getVersion());
- soapMessage.setCharsetEncoding(parser.getCharacterEncodingScheme());
+ setSOAPEnvelope(node);
} else if (lastNode.isComplete()) {
node =
constructNode((OMElement) lastNode.getParent(),
@@ -221,6 +219,12 @@
log.info("Build the OMElelment " + node.getLocalName() +
"By the StaxSOAPModelBuilder");
return node;
+ }
+
+ protected void setSOAPEnvelope(OMElement node) {
+ soapMessage.setSOAPEnvelope((SOAPEnvelope) node);
+ soapMessage.setXMLVersion(parser.getVersion());
+ soapMessage.setCharsetEncoding(parser.getCharacterEncodingScheme());
}
/**