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 sc...@apache.org on 2006/11/14 18:31:08 UTC
svn commit: r474883 - in /webservices/axis2/trunk/java/modules/jaxws:
src/org/apache/axis2/jaxws/message/util/
test/org/apache/axis2/jaxws/provider/
test/org/apache/axis2/jaxws/provider/soapmsg/
Author: scheu
Date: Tue Nov 14 09:31:08 2006
New Revision: 474883
URL: http://svn.apache.org/viewvc?view=rev&rev=474883
Log:
AXIS2-1699
Contributor:Rich Scheuerle
Enable the JAX-WS MimeHeader test
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java?view=diff&rev=474883&r1=474882&r2=474883
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java Tue Nov 14 09:31:08 2006
@@ -167,8 +167,6 @@
}
// Add all the MimeHeaders from the Axis2 MessageContext
- // TODO: Merge with latest TransportHeaders impl.
- /*
MimeHeaders mhs = message.getMimeHeaders();
HashMap headerMap = (HashMap) msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (headerMap != null) {
@@ -179,7 +177,7 @@
mhs.addHeader(key, value);
}
}
- */
+
// FIXME: This should be revisited when we re-work the MTOM support.
//This destroys performance by forcing a double pass through the message.
@@ -261,14 +259,12 @@
// Put the Headers onto the MessageContext
// TODO: Merge with latest TransportHeaders impl.
- /*
HashMap headerMap = new HashMap();
for (Iterator it = message.getMimeHeaders().getAllHeaders(); it.hasNext();) {
MimeHeader mh = (MimeHeader) it.next();
headerMap.put(mh.getName(), mh.getValue());
}
msgContext.setProperty(MessageContext.TRANSPORT_HEADERS, headerMap);
- */
// Enable MTOM Attachments
if (message.isMTOMEnabled()) {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java?view=diff&rev=474883&r1=474882&r2=474883
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java Tue Nov 14 09:31:08 2006
@@ -103,9 +103,8 @@
SOAPMessage response = dispatch.invoke(request);
// Check for valid content description
- // TODO: Merge with latest mime headers impl
- //assert(response.getContentDescription() != null);
- //assert(response.getContentDescription().equals(SoapMessageProvider.XML_RESPONSE));
+ assert(response.getContentDescription() != null);
+ assert(response.getContentDescription().equals(SoapMessageProvider.XML_RESPONSE));
// Check assertions and get the data element
SOAPElement dataElement = assertResponseXML(response, SoapMessageProvider.XML_RESPONSE);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java?view=diff&rev=474883&r1=474882&r2=474883
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java Tue Nov 14 09:31:08 2006
@@ -164,9 +164,8 @@
SOAPMessage response;
// Transport header check
- // TODO: Merge with latest mime headers impl.
- //assert(request.getContentDescription() != null);
- //assert(request.getContentDescription().equals(SoapMessageProvider.XML_REQUEST));
+ assert(request.getContentDescription() != null);
+ assert(request.getContentDescription().equals(SoapMessageProvider.XML_REQUEST));
// Additional assertion checks
assert(countAttachments(request) == 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org