From c736a52d53db26e14174a87be1d4f44652199c37 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 9 Sep 2010 11:54:42 +0000
Subject: [PATCH] Minor axiom changes

---
 core/pom.xml                                        | 13 ++++++++++++-
 .../ws/soap/axiom/AxiomSoapBody.java                |  2 +-
 .../ws/soap/axiom/AxiomSoapMessage.java             |  2 +-
 .../ws/soap/AbstractSoapMessageTestCase.java        | 12 +++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 177c57b7..4810b405 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,7 +50,18 @@
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
-            </plugin>            
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
index 4cb1d014..52a3155f 100644
--- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
+++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
@@ -65,7 +65,7 @@ abstract class AxiomSoapBody extends AxiomSoapElement implements SoapBody {
         return (SOAPBody) getAxiomElement();
     }
 
-    public void setPayloadSource(StreamingPayload payload) {
+    public void setStreamingPayload(StreamingPayload payload) {
         Assert.notNull(payload, "'payload' must not be null");
         OMDataSource dataSource = new StreamingOMDataSource(payload);
         OMElement payloadElement = getAxiomFactory().createOMElement(dataSource, payload.getName());
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
index bf33ab78..b0f6b356 100644
--- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
+++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
@@ -170,7 +170,7 @@ public class AxiomSoapMessage extends AbstractSoapMessage implements StreamingWe
 
     public void setStreamingPayload(StreamingPayload payload) {
         AxiomSoapBody soapBody = (AxiomSoapBody) getSoapBody();
-        soapBody.setPayloadSource(payload);
+        soapBody.setStreamingPayload(payload);
     }
 
     public SoapEnvelope getEnvelope() {
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
index e074fea7..c8ae78d7 100644
--- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
+++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
@@ -32,7 +32,6 @@ import org.springframework.ws.stream.StreamingPayload;
 import org.springframework.ws.stream.StreamingWebServiceMessage;
 import org.springframework.ws.transport.MockTransportOutputStream;
 import org.springframework.ws.transport.TransportConstants;
-import org.springframework.xml.namespace.SimpleNamespaceContext;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.validation.XmlValidator;
 import org.springframework.xml.validation.XmlValidatorFactory;
@@ -95,18 +94,15 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes
         }
         StreamingWebServiceMessage streamingMessage = (StreamingWebServiceMessage) soapMessage;
 
-        final QName name = new QName("http://springframework.org", "root");
+        final QName name = new QName("http://springframework.org", "root", "prefix");
         streamingMessage.setStreamingPayload(new StreamingPayload() {
             public QName getName() {
                 return name;
             }
 
             public void writeTo(XMLStreamWriter streamWriter) throws XMLStreamException {
-                SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext();
-                namespaceContext.bindDefaultNamespaceUri(name.getNamespaceURI());
-                streamWriter.setNamespaceContext(namespaceContext);
-                streamWriter.writeStartElement(name.getNamespaceURI(), name.getLocalPart());
-                streamWriter.writeDefaultNamespace(name.getNamespaceURI());
+                streamWriter.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
+                streamWriter.writeNamespace("prefix", name.getNamespaceURI());
                 streamWriter.writeStartElement(name.getNamespaceURI(), "child");
                 streamWriter.writeCharacters("Foo");
                 streamWriter.writeEndElement();
@@ -119,6 +115,8 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes
 
         String expected = "<root xmlns='http://springframework.org'><child>Foo</child></root>";
         assertXMLEqual(expected, result.toString());
+
+        soapMessage.writeTo(new ByteArrayOutputStream());
     }
 
     protected abstract Resource[] getSoapSchemas();