Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Axiom now sets soap action header when writing.

Browse Source
This commit is contained in:
Arjen Poutsma
2007-01-14 12:24:20 +00:00
parent 4d316cf385
commit 24823fc4ab
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
View File

@@ -135,7 +135,12 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
}
public void setSoapAction(String soapAction) {
this.soapAction = soapAction;
if (soapAction == null) {
this.soapAction = "";
}
else {
this.soapAction = soapAction;
}
}
public Attachment getAttachment(String contentId) {
@@ -178,6 +183,7 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
String contentType = format.getContentType();
contentType += "; charset=\"" + charsetEncoding + "\"";
transportOutputStream.addHeader("Content-Type", contentType);
transportOutputStream.addHeader("SOAPAction", soapAction);
}
axiomMessage.serializeAndConsume(outputStream, format);
}

6
core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
View File

@@ -17,7 +17,6 @@
package org.springframework.ws.soap.soap11;
import java.io.ByteArrayOutputStream;
import java.util.Properties;
import junit.framework.Assert;
import org.springframework.core.io.ByteArrayResource;
@@ -48,19 +47,22 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT
public void testWriteToTransportOutputStream() throws Exception {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
StubTransportOutputStream tos = new StubTransportOutputStream(bos);
String soapAction = "http://springframework.org/spring-ws/Action";
soapMessage.setSoapAction(soapAction);
soapMessage.writeTo(tos);
String result = bos.toString("UTF-8");
assertXMLEqual("<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Header/><Body/></Envelope>",
result);
String contentType = (String) tos.getHeaders().get("Content-Type");
assertTrue("Invalid Content-Type set", contentType.indexOf(SoapVersion.SOAP_11.getContentType()) != -1);
String resultSoapAction = (String) tos.getHeaders().get("SOAPAction");
assertEquals("Invalid soap action", soapAction, resultSoapAction);
}
public void testWriteToTransportResponseAttachment() throws Exception {
InputStreamSource inputStreamSource = new ByteArrayResource("contents".getBytes("UTF-8"));
soapMessage.addAttachment(inputStreamSource, "text/plain");
ByteArrayOutputStream bos = new ByteArrayOutputStream();
final Properties headers = new Properties();
StubTransportOutputStream tos = new StubTransportOutputStream(bos);
soapMessage.writeTo(tos);
String contentType = (String) tos.getHeaders().get("Content-Type");