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 he...@apache.org on 2005/06/29 17:34:29 UTC
svn commit: r202392 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/transport/http/
samples/test/org/apache/axis/engine/ xml/src/org/apache/axis/attachments/
xml/test/org/apache/axis/attachments/
Author: hemapani
Date: Wed Jun 29 08:34:28 2005
New Revision: 202392
URL: http://svn.apache.org/viewcvs?rev=202392&view=rev
Log:
yet few more updates to MTOM
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportUtils.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPWorker.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawMTOMTest.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/attachments/MIMEHelper.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/attachments/ImageSampleTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportUtils.java?rev=202392&r1=202391&r2=202392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportUtils.java Wed Jun 29 08:34:28 2005
@@ -62,7 +62,6 @@
InputStream in, OutputStream out, String contentType,
String soapAction, String requestURI,
ConfigurationContext configurationContext) throws AxisFault {
-
try {
msgContext.setWSAAction(soapAction);
msgContext.setSoapAction(soapAction);
@@ -73,16 +72,7 @@
SOAPEnvelope envelope = null;
StAXBuilder builder = null;
- Reader reader = new InputStreamReader(in);
- XMLStreamReader xmlreader = XMLInputFactory.newInstance()
- .createXMLStreamReader(reader);
-
- StringTokenizer st = new StringTokenizer(contentType);
- String mimetype = null;
- if (st.hasMoreTokens()) {
- mimetype = st.nextToken();
- }
if (contentType.indexOf(HTTPConstants.HEADER_ACCEPT_MULTIPART_RELATED) >= 0){
builder = selectBuilderForMIME(msgContext, in, contentType);
@@ -96,6 +86,9 @@
msgContext.setProperty(Constants.Configuration.DO_REST,
Constants.VALUE_TRUE);
SOAPFactory soapFactory = new SOAP11Factory();
+ Reader reader = new InputStreamReader(in);
+ XMLStreamReader xmlreader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(reader);
builder = new StAXOMBuilder(xmlreader);
builder.setOmbuilderFactory(soapFactory);
envelope = soapFactory.getDefaultEnvelope();
@@ -104,6 +97,9 @@
}
if (envelope == null) {
+ Reader reader = new InputStreamReader(in);
+ XMLStreamReader xmlreader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(reader);
builder = new StAXSOAPModelBuilder(xmlreader);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPWorker.java?rev=202392&r1=202391&r2=202392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPWorker.java Wed Jun 29 08:34:28 2005
@@ -67,7 +67,6 @@
// let us put the information about incoming transport
HTTPTransportReceiver reciver = new HTTPTransportReceiver();
Map map = reciver.parseTheHeaders(inStream, true);
-
SimpleHTTPOutputStream out;
String transferEncoding = (String) map.get(HTTPConstants.HEADER_TRANSFER_ENCODING);
@@ -78,6 +77,7 @@
} else {
out = new SimpleHTTPOutputStream(socket.getOutputStream(), false);
}
+
//OutputStream out = socket.getOutputStream();
msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawMTOMTest.java?rev=202392&r1=202391&r2=202392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawMTOMTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawMTOMTest.java Wed Jun 29 08:34:28 2005
@@ -47,8 +47,8 @@
public class EchoRawMTOMTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
- "http://127.0.0.1:5555"
- // + (UtilServer.TESTING_PORT)
+ "http://127.0.0.1:"
+ + (UtilServer.TESTING_PORT + 1)
+ "/axis/services/EchoXMLService/echoMTOMtoBase64");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/attachments/MIMEHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/attachments/MIMEHelper.java?rev=202392&r1=202391&r2=202392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/attachments/MIMEHelper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/attachments/MIMEHelper.java Wed Jun 29 08:34:28 2005
@@ -233,6 +233,8 @@
// TODO do we need Locking for this
private MimeBodyPart getMimeBodyPart() throws OMException {
MimeBodyPart mimeBodyPart = null;
+
+
//String Line = pushbackInStream.readLine();
MimeBodyPartInputStream partStream;
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/attachments/ImageSampleTest.java?rev=202392&r1=202391&r2=202392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/attachments/ImageSampleTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/attachments/ImageSampleTest.java Wed Jun 29 08:34:28 2005
@@ -102,7 +102,7 @@
ImageDataSource dataSource = new ImageDataSource("WaterLilies.jpg",
expectedImage);
expectedDH = new DataHandler(dataSource);
- OMText binaryNode = new OMTextImpl(expectedDH, false);
+ OMText binaryNode = new OMTextImpl(expectedDH, true);
envelope.addChild(body);
body.addChild(data);