Added Commons Http client support.

2006-11-19 20:34:50 +00:00
parent 64bfb49cdb
commit 13e90ecd0d
17 changed files with 625 additions and 84 deletions
--- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
+++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
@@ -37,7 +37,7 @@ import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.transport.TransportInputStream;
@@ -110,10 +110,14 @@ public class AxiomSoapMessageFactory implements WebServiceMessageFactory, Initia
        if (inputStream instanceof TransportInputStream) {
            TransportInputStream transportInputStream = (TransportInputStream) inputStream;
            Iterator iterator = transportInputStream.getHeaders(CONTENT_TYPE_HEADER);
-            Assert.isTrue(iterator.hasNext(), "No " + CONTENT_TYPE_HEADER + " header present of TransportRequest");
-            contentType = (String) iterator.next();
+            if (iterator.hasNext()) {
+                contentType = (String) iterator.next();
+            }
+        }
+        if (!StringUtils.hasLength(contentType)) {
+            // fall back to SOAP 1.1 as a default
+            contentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
        }
-        Assert.hasLength(contentType, "No " + CONTENT_TYPE_HEADER + " header present of TransportRequest");
        try {
            if (isMultiPartRelated(contentType)) {
                return createMultiPartAxiomSoapMessage(inputStream, contentType);
--- a/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-    <!--<bean class="org.springframework.ws.soap.axiom.AxiomSoapMessageContextFactory"/>-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <description>
+        This web application context contains Spring-WS beans. The beans defined in this context are automatically
+        detected by Spring-WS, similar to the way Controllers are picked up in Spring Web MVC.
+    </description>
+
    <bean id="payloadMapping" class="org.springframework.ws.endpoint.mapping.PayloadRootQNameEndpointMapping">
        <description>
            This endpoint mapping uses the qualified name of the payload (body contents) to determine the endpoint for
@@ -40,7 +46,10 @@
        <property name="echoService" ref="echoService"/>
    </bean>

-    <!-- "Business" (POJO) services -->
-    <bean id="echoService" class="org.springframework.ws.samples.echo.service.impl.EchoServiceImpl"/>
+    <bean id="echoService" class="org.springframework.ws.samples.echo.service.impl.EchoServiceImpl">
+        <description>
+            This bean is our "business" service.
+        </description>
+    </bean>

 </beans>
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -44,25 +44,31 @@
        <dependency>
            <groupId>javax.xml.soap</groupId>
            <artifactId>saaj-api</artifactId>
-            <version>1.3</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>javax.jms</groupId>
            <artifactId>jms</artifactId>
-            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <scope>provided</scope>
        </dependency>
        <!-- Other dependencies -->
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+        </dependency>
        <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
            <optional>true</optional>
        </dependency>
        <dependency>
@@ -77,4 +83,4 @@
            <scope>test</scope>
        </dependency>
    </dependencies>
-</project>
+</project>
--- a/sandbox/src/main/java/org/springframework/ws/transport/MessageSender.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/MessageSender.java
@@ -10,7 +10,7 @@ import org.springframework.ws.context.MessageContext;
 public interface MessageSender {

    /**
-     * Sends the given message context. The response message, if any,  is stored in the context.
+     * Sends the given message context. The response message, if any, is stored in the context.
     *
     * @param messageContext the message to be sent
     */
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/AbstractHttpMessageSender.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/AbstractHttpMessageSender.java
@@ -1,26 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.transport.http;
-
-import org.springframework.ws.transport.MessageSender;
-
-/**
- * @author Arjen Poutsma
- */
-public abstract class AbstractHttpMessageSender implements MessageSender {
-
-}
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.http;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.springframework.ws.WebServiceMessage;
+import org.springframework.ws.context.MessageContext;
+import org.springframework.ws.transport.MessageSender;
+import org.springframework.ws.transport.TransportInputStream;
+
+/**
+ * <code>MessageSender</code> implementation that uses <a href="http://jakarta.apache.org/commons/httpclient">Jakarta
+ * Commons HttpClient</a> to execute POST requests.
+ * <p/>
+ * Allows to use a preconfigured HttpClient instance, potentially with authentication, HTTP connection pooling, etc.
+ * Also designed for easy subclassing, customizing specific template methods.
+ *
+ * @author Arjen Poutsma
+ * @see org.springframework.ws.transport.http.HttpUrlConnectionMessageSender
+ */
+public class CommonsHttpMessageSender implements MessageSender {
+
+    private HttpClient httpClient;
+
+    private URL url;
+
+    /**
+     * Create a new instance of the <code>CommonsHttpMessageSender</code> with a default <code>HttpClient</code> that
+     * uses a default <code>MultiThreadedHttpConnectionManager</code>.
+     *
+     * @see org.apache.commons.httpclient.HttpClient
+     * @see org.apache.commons.httpclient.MultiThreadedHttpConnectionManager
+     */
+    public CommonsHttpMessageSender() {
+        httpClient = new HttpClient(new MultiThreadedHttpConnectionManager());
+    }
+
+    /**
+     * Returns the <code>HttpClient</code> used by this message sender.
+     */
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    /**
+     * Set the <code>HttpClient</code> used by this message sender.
+     */
+    public void setHttpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+    public void send(MessageContext messageContext) throws IOException {
+        PostMethod postMethod = createPostMethod();
+        try {
+            writeRequestMessage(postMethod, messageContext.getRequest());
+            executePostMethod(getHttpClient(), postMethod);
+            validateResponse(postMethod);
+            readResponse(postMethod, messageContext);
+        }
+        finally {
+            postMethod.releaseConnection();
+        }
+    }
+
+    /**
+     * Create a PostMethod for the given configuration.
+     *
+     * @return the PostMethod instance
+     * @throws IOException if thrown by I/O methods
+     */
+    protected PostMethod createPostMethod() throws IOException {
+        return new PostMethod(getUrl().toString());
+    }
+
+    /**
+     * Set the given message as request body.
+     * <p/>
+     * The default implementation simply sets the message as the PostMethod's request body. This can be overridden, for
+     * example, to write a specific encoding and potentially set appropriate HTTP request headers.
+     *
+     * @param postMethod the PostMethod to set the request message on
+     * @param message    the request message to be set
+     * @throws IOException if thrown by I/O methods
+     */
+    protected void writeRequestMessage(PostMethod postMethod, WebServiceMessage message) throws IOException {
+        CommonsHttpTransportOutputStream tos = new CommonsHttpTransportOutputStream(postMethod);
+        try {
+            message.writeTo(tos);
+            tos.flush();
+        }
+        finally {
+            tos.close();
+        }
+    }
+
+    /**
+     * Execute the given PostMethod instance.
+     *
+     * @param httpClient the HttpClient to execute on
+     * @param postMethod the PostMethod to execute
+     * @throws IOException if thrown by I/O methods
+     * @see org.apache.commons.httpclient.HttpClient#executeMethod(org.apache.commons.httpclient.HttpMethod)
+     */
+    protected void executePostMethod(HttpClient httpClient, PostMethod postMethod) throws IOException {
+        httpClient.executeMethod(postMethod);
+    }
+
+    /**
+     * Validate the given response as contained in the PostMethod object, throwing an exception if it does not
+     * correspond to a successful HTTP response.
+     * <p/>
+     * Default implementation rejects any HTTP status code that does not start with 2, excluding 500 (Internal Server
+     * Error, used for SOAP Faults).
+     *
+     * @param postMethod the executed PostMethod to validate
+     * @throws IOException if validation failed
+     * @see org.apache.commons.httpclient.methods.PostMethod#getStatusCode()
+     */
+    protected void validateResponse(PostMethod postMethod) throws IOException {
+        int statusCode = postMethod.getStatusCode();
+        if (statusCode != HttpStatus.SC_INTERNAL_SERVER_ERROR && statusCode / 100 != 2) {
+            throw new IOException("Did not receive successful HTTP response: status code = " + statusCode +
+                    ", status message = [" + postMethod.getStatusText() + "]");
+        }
+
+    }
+
+    /**
+     * Read the response from the given executed remote invocation request.
+     *
+     * @param postMethod the PostMethod to read the response message from
+     * @return an InputStream for the response body
+     * @throws IOException if thrown by I/O methods
+     */
+    protected void readResponse(PostMethod postMethod, MessageContext messageContext) throws IOException {
+        if (postMethod.getStatusCode() == HttpStatus.SC_NO_CONTENT || postMethod.getResponseContentLength() == 0) {
+            return;
+        }
+        TransportInputStream tis = new CommonsHttpTransportInputStream(postMethod);
+        try {
+            messageContext.readResponse(tis);
+        }
+        finally {
+            if (tis != null) {
+                tis.close();
+            }
+        }
+    }
+
+    /**
+     * Returns the url used by this message sender.
+     */
+    public URL getUrl() {
+        return url;
+    }
+
+    /**
+     * Sets the url used by this message sender.
+     */
+    public void setUrl(URL url) {
+        this.url = url;
+    }
+}
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.springframework.util.Assert;
+import org.springframework.ws.transport.TransportInputStream;
+
+/**
+ * Implementation of the <code>TransportInputStream</code> interface based on {@link
+ * org.apache.commons.httpclient.methods.PostMethod}. Exposes the <code>PostMethod</code>.
+ *
+ * @author Arjen Poutsma
+ */
+public class CommonsHttpTransportInputStream extends TransportInputStream {
+
+    private final PostMethod postMethod;
+
+    /**
+     * Constructs a new instance of the <code>CommonsHttpTransportInputStream</code> with a given
+     * <code>PostMethod</code>.
+     */
+    public CommonsHttpTransportInputStream(PostMethod postMethod) {
+        Assert.notNull(postMethod, "postMethod must not be null");
+        this.postMethod = postMethod;
+    }
+
+    protected InputStream createInputStream() throws IOException {
+        return postMethod.getResponseBodyAsStream();
+    }
+
+    public Iterator getHeaderNames() throws IOException {
+        Header[] headers = postMethod.getRequestHeaders();
+        String[] names = new String[headers.length];
+        for (int i = 0; i < headers.length; i++) {
+            names[i] = headers[i].getName();
+        }
+        return Arrays.asList(names).iterator();
+    }
+
+    public Iterator getHeaders(String name) throws IOException {
+        Header[] headers = postMethod.getRequestHeaders(name);
+        String[] names = new String[headers.length];
+        for (int i = 0; i < headers.length; i++) {
+            names[i] = headers[i].getValue();
+        }
+        return Arrays.asList(names).iterator();
+    }
+
+    /**
+     * Returns the wrapped <code>PostMethod</code>.
+     */
+    public HttpMethod getPostMethod() {
+        return postMethod;
+    }
+}
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.http;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.springframework.ws.transport.TransportOutputStream;
+
+/**
+ * Implementation of the <code>TransportOutputStream</code> interface based on {@link
+ * org.apache.commons.httpclient.methods.PostMethod}. Exposes the <code>PostMethod</code>.
+ *
+ * @author Arjen Poutsma
+ */
+public class CommonsHttpTransportOutputStream extends TransportOutputStream {
+
+    private final PostMethod postMethod;
+
+    private final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+    /**
+     * Constructs a new instance of the <code>CommonsHttpTransportOutputStream</code> with a given
+     * <code>PostMethod</code>.
+     */
+    public CommonsHttpTransportOutputStream(PostMethod postMethod) {
+        this.postMethod = postMethod;
+    }
+
+    public void addHeader(String name, String value) throws IOException {
+        postMethod.addRequestHeader(name, value);
+    }
+
+    public void close() throws IOException {
+        postMethod.setRequestEntity(new ByteArrayRequestEntity(bos.toByteArray()));
+    }
+
+    protected OutputStream getOutputStream() throws IOException {
+        return bos;
+    }
+
+    /**
+     * Returns the wrapped <code>PostMethod</code>.
+     */
+    public HttpMethod getPostMethod() {
+        return postMethod;
+    }
+
+}
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
@@ -30,15 +30,20 @@ import org.springframework.ws.transport.TransportOutputStream;
 /**
 * <code>MessageSender</code> implementation that uses standard J2SE facilities to execute POST requests, without
 * support for HTTP authentication or advanced configuration options.
+ * <p/>
+ * Designed for easy subclassing, customizing specific template methods. However, consider {@link
+ * org.springframework.ws.transport.http.CommonsHttpMessageSender} for more sophisticated needs: the J2SE
+ * <code>HttpURLConnection</code> is rather limited in its capabilities.
 *
 * @author Arjen Poutsma
+ * @see java.net.HttpURLConnection
 */
 public class HttpUrlConnectionMessageSender implements MessageSender {

-    private URL url;
-
    private static final String HTTP_METHOD_POST = "POST";

+    private URL url;
+
    /**
     * Returns the url used by this message sender.
     */
@@ -55,11 +60,15 @@ public class HttpUrlConnectionMessageSender implements MessageSender {

    public void send(MessageContext messageContext) throws IOException {
        HttpURLConnection connection = openConnection();
-        prepareConnection(connection);
-        writeRequestMessage(connection, messageContext.getRequest());
-        validateResponse(connection);
-        readResponse(connection, messageContext);
-        connection.disconnect();
+        try {
+            prepareConnection(connection);
+            writeRequestMessage(connection, messageContext.getRequest());
+            validateResponse(connection);
+            readResponse(connection, messageContext);
+        }
+        finally {
+            connection.disconnect();
+        }
    }

    protected HttpURLConnection openConnection() throws IOException {
@@ -77,28 +86,6 @@ public class HttpUrlConnectionMessageSender implements MessageSender {
        connection.setDoOutput(true);
    }

-    protected void writeRequestMessage(HttpURLConnection connection, WebServiceMessage message) throws IOException {
-        TransportOutputStream tos = null;
-        try {
-            tos = new HttpUrlConnectionTransportOutputStream(connection);
-            message.writeTo(tos);
-            tos.flush();
-        }
-        finally {
-            if (tos != null) {
-                tos.close();
-            }
-        }
-    }
-
-    protected void validateResponse(HttpURLConnection connection) throws IOException {
-        int responseCode = connection.getResponseCode();
-        if (responseCode != HttpURLConnection.HTTP_INTERNAL_ERROR && responseCode / 100 != 2) {
-            throw new IOException("Did not receive successful HTTP response: status code = " + responseCode +
-                    ", status message = [" + connection.getResponseMessage() + "]");
-        }
-    }
-
    protected void readResponse(HttpURLConnection connection, MessageContext messageContext) throws IOException {
        if (connection.getResponseCode() == HttpURLConnection.HTTP_NO_CONTENT || connection.getContentLength() == 0) {
            return;
@@ -114,4 +101,26 @@ public class HttpUrlConnectionMessageSender implements MessageSender {
            }
        }
    }
+
+    protected void validateResponse(HttpURLConnection connection) throws IOException {
+        int responseCode = connection.getResponseCode();
+        if (responseCode != HttpURLConnection.HTTP_INTERNAL_ERROR && responseCode / 100 != 2) {
+            throw new IOException("Did not receive successful HTTP response: status code = " + responseCode +
+                    ", status message = [" + connection.getResponseMessage() + "]");
+        }
+    }
+
+    protected void writeRequestMessage(HttpURLConnection connection, WebServiceMessage message) throws IOException {
+        TransportOutputStream tos = null;
+        try {
+            tos = new HttpUrlConnectionTransportOutputStream(connection);
+            message.writeTo(tos);
+            tos.flush();
+        }
+        finally {
+            if (tos != null) {
+                tos.close();
+            }
+        }
+    }
 }
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
@@ -30,17 +30,40 @@ import org.springframework.util.StringUtils;
 import org.springframework.ws.transport.TransportInputStream;

 /**
+ * Implementation of the <code>TransportInputStream</code> interface based on {@link java.net.HttpURLConnection}.
+ * Exposes the <code>HttpURLConnection</code>.
+ *
 * @author Arjen Poutsma
 */
 public class HttpUrlConnectionTransportInputStream extends TransportInputStream {

    private final HttpURLConnection connection;

+    /**
+     * Constructs a new instance of the <code>HttpUrlConnectionTransportInputStream</code> based on the given
+     * <code>HttpURLConnection</code>.
+     */
    public HttpUrlConnectionTransportInputStream(HttpURLConnection connection) throws IOException {
        Assert.notNull(connection, "connection must not be null");
        this.connection = connection;
    }

+    /**
+     * Returns the wrapped <code>HttpURLConnection</code>.
+     */
+    public HttpURLConnection getConnection() {
+        return connection;
+    }
+
+    protected InputStream createInputStream() throws IOException {
+        if (connection.getResponseCode() == HttpURLConnection.HTTP_INTERNAL_ERROR) {
+            return connection.getErrorStream();
+        }
+        else {
+            return connection.getInputStream();
+        }
+    }
+
    public Iterator getHeaderNames() throws IOException {
        List headerNames = new ArrayList();
        // Header field 0 is the status line, so we start at 1
@@ -66,13 +89,4 @@ public class HttpUrlConnectionTransportInputStream extends TransportInputStream
            return tokens.iterator();
        }
    }
-
-    protected InputStream createInputStream() throws IOException {
-        if (connection.getResponseCode() == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-            return connection.getErrorStream();
-        }
-        else {
-            return connection.getInputStream();
-        }
-    }
 }
--- a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java
@@ -24,12 +24,19 @@ import org.springframework.util.Assert;
 import org.springframework.ws.transport.TransportOutputStream;

 /**
+ * Implementation of the <code>TransportOutputStream</code> interface based on {@link java.net.HttpURLConnection}.
+ * Exposes the <code>HttpURLConnection</code>.
+ *
 * @author Arjen Poutsma
 */
 public class HttpUrlConnectionTransportOutputStream extends TransportOutputStream {

    private final HttpURLConnection connection;

+    /**
+     * Constructs a new instance of the <code>HttpUrlConnectionTransportOutputStream</code> based on the given
+     * <code>HttpURLConnection</code>.
+     */
    public HttpUrlConnectionTransportOutputStream(HttpURLConnection connection) throws IOException {
        Assert.notNull(connection, "connection must not be null");
        this.connection = connection;
@@ -42,4 +49,11 @@ public class HttpUrlConnectionTransportOutputStream extends TransportOutputStrea
    protected OutputStream getOutputStream() throws IOException {
        return connection.getOutputStream();
    }
+
+    /**
+     * Returns the wrapped <code>HttpURLConnection</code>.
+     */
+    public HttpURLConnection getConnection() {
+        return connection;
+    }
 }
--- a/sandbox/src/main/java/org/springframework/ws/transport/mail/MailTransportInputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/mail/MailTransportInputStream.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.mail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Iterator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+
+import org.springframework.ws.transport.TransportInputStream;
+import org.springframework.ws.transport.support.EnumerationIterator;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class MailTransportInputStream extends TransportInputStream {
+
+    private final Message message;
+
+    public MailTransportInputStream(Message message) {
+        this.message = message;
+    }
+
+    protected InputStream createInputStream() throws IOException {
+        try {
+            return message.getDataHandler().getInputStream();
+        }
+        catch (MessagingException ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+
+    public Iterator getHeaders(String name) throws IOException {
+        try {
+            String[] headers = message.getHeader(name);
+            return Arrays.asList(headers).iterator();
+        }
+        catch (MessagingException ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+
+    public Iterator getHeaderNames() throws IOException {
+        try {
+            return new EnumerationIterator(message.getAllHeaders());
+        }
+        catch (MessagingException ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+}
--- a/sandbox/src/main/java/org/springframework/ws/transport/mail/MailTransportOutputStream.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/mail/MailTransportOutputStream.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.mail;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+
+import org.springframework.ws.transport.TransportOutputStream;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class MailTransportOutputStream extends TransportOutputStream {
+
+    private final Message message;
+
+    public MailTransportOutputStream(Message message) {
+        this.message = message;
+    }
+
+    public void addHeader(String name, String value) throws IOException {
+        try {
+            message.addHeader(name, value);
+        }
+        catch (MessagingException ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+
+    protected OutputStream getOutputStream() throws IOException {
+        try {
+            return message.getDataHandler().getOutputStream();
+        }
+        catch (MessagingException ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+}
--- a/sandbox/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
+++ b/sandbox/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
@@ -52,6 +52,10 @@ public abstract class AbstractHttpWebServiceMessageSenderTestCase extends TestCa

    }

+    protected final void tearDown() throws Exception {
+        jettyServer.stop();
+    }
+
    private static class EchoServlet extends GenericServlet {

        public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
--- a/sandbox/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java
+++ b/sandbox/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.http;
+
+import java.net.URL;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+
+import org.springframework.ws.context.DefaultMessageContext;
+import org.springframework.ws.context.MessageContext;
+import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
+import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;
+
+public class CommonsHttpMessageSenderTest extends AbstractHttpWebServiceMessageSenderTestCase {
+
+    private CommonsHttpMessageSender sender;
+
+    private MessageFactory messageFactory;
+
+    protected void onSetUp() throws Exception {
+        sender = new CommonsHttpMessageSender();
+        sender.setUrl(new URL(URL));
+        messageFactory = MessageFactory.newInstance();
+    }
+
+    public void testSend() throws Exception {
+        SOAPMessage message = messageFactory.createMessage();
+        message.getMimeHeaders().addHeader(HEADER_NAME, HEADER_VALUE);
+        Saaj13SoapMessage request = new Saaj13SoapMessage(message);
+        MessageContext context = new DefaultMessageContext(request, new SaajSoapMessageFactory(messageFactory));
+//        AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
+//        MessageContext context = new DefaultMessageContext(soapMessageFactory);
+        sender.send(context);
+        assertTrue("No response", context.hasResponse());
+
+        context.getResponse().writeTo(System.out);
+    }
+}
--- a/sandbox/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java
+++ b/sandbox/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java
@@ -22,7 +22,8 @@ import javax.xml.soap.SOAPMessage;

 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
+import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
+import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;

 public class HttpUrlConnectionMessageSenderTest extends AbstractHttpWebServiceMessageSenderTestCase {

@@ -39,10 +40,10 @@ public class HttpUrlConnectionMessageSenderTest extends AbstractHttpWebServiceMe
    public void testSend() throws Exception {
        SOAPMessage message = messageFactory.createMessage();
        message.getMimeHeaders().addHeader(HEADER_NAME, HEADER_VALUE);
-//        Saaj13SoapMessage request = new Saaj13SoapMessage(message);
-//        MessageContext context = new DefaultMessageContext(request, new SaajSoapMessageFactory(messageFactory));
-        AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
-        MessageContext context = new DefaultMessageContext(soapMessageFactory);
+        Saaj13SoapMessage request = new Saaj13SoapMessage(message);
+        MessageContext context = new DefaultMessageContext(request, new SaajSoapMessageFactory(messageFactory));
+//        AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
+//        MessageContext context = new DefaultMessageContext(soapMessageFactory);
        sender.send(context);
        assertTrue("No response", context.hasResponse());

--- a/sandbox/src/test/resources/log4j.properties
+++ b/sandbox/src/test/resources/log4j.properties
@@ -0,0 +1,6 @@
+log4j.rootCategory=INFO, stdout
+log4j.logger.org.springframework.ws=DEBUG
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n