Skip to content

Commit 6907b50

Browse files
gregturngregturn
committed
SWS-922 Upgrade to Axiom 1.2.15
1 parent 1aafa53 commit 6907b50

15 files changed

+112
-38
lines changed

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ configure(allprojects) {
1414

1515
ext.springVersion = "4.0.9.RELEASE"
1616
ext.springSecurityVersion = "3.2.7.RELEASE"
17-
ext.axiomVersion = "1.2.14"
17+
ext.axiomVersion = "1.2.15"
1818

1919
apply plugin: "java"
2020

@@ -59,6 +59,7 @@ configure(allprojects) {
5959
testCompile("junit:junit:4.10")
6060
testCompile("org.easymock:easymock:3.1")
6161
testCompile("xmlunit:xmlunit:1.5")
62+
testCompile("com.sun.mail:javax.mail:1.5.4")
6263
testRuntime("org.codehaus.woodstox:woodstox-core-asl:4.2.0")
6364
}
6465

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Tue Dec 15 09:56:17 CST 2015
1+
#Tue Dec 15 10:03:30 CST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

‎spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private AxiomSoapMessage createAxiomSoapMessage(InputStream inputStream, String
271271
XMLStreamReader reader = inputFactory.createXMLStreamReader(inputStream, getCharSetEncoding(contentType));
272272
String envelopeNamespace = getSoapEnvelopeNamespace(contentType);
273273
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(reader, soapFactory, envelopeNamespace);
274-
SOAPMessage soapMessage = builder.getSoapMessage();
274+
SOAPMessage soapMessage = builder.getSOAPMessage();
275275
return new AxiomSoapMessage(soapMessage, soapAction, payloadCaching, langAttributeOnSoap11FaultString);
276276
}
277277

@@ -297,7 +297,7 @@ else if (MTOMConstants.MTOM_TYPE.equals(attachments.getAttachmentSpecType())) {
297297
throw new AxiomSoapMessageCreationException(
298298
"Unknown attachment type: [" + attachments.getAttachmentSpecType() + "]");
299299
}
300-
return new AxiomSoapMessage(builder.getSoapMessage(), attachments, soapAction, payloadCaching,
300+
return new AxiomSoapMessage(builder.getSOAPMessage(), attachments, soapAction, payloadCaching,
301301
langAttributeOnSoap11FaultString);
302302
}
303303

‎spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import javax.xml.transform.Transformer;
2626
import javax.xml.transform.TransformerFactory;
2727

28-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
29-
import static org.junit.Assert.*;
3028
import org.junit.Before;
3129
import org.junit.Test;
3230

@@ -42,6 +40,11 @@
4240
import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
4341
import org.springframework.xml.transform.StringResult;
4442

43+
import static org.custommonkey.xmlunit.XMLAssert.*;
44+
import static org.junit.Assert.assertEquals;
45+
import static org.junit.Assert.assertFalse;
46+
import static org.junit.Assert.assertTrue;
47+
4548
public class JaxbElementPayloadMethodProcessorTest {
4649

4750
private JaxbElementPayloadMethodProcessor processor;
@@ -141,7 +144,7 @@ public void handleReturnValueAxiom() throws Exception {
141144
response.writeTo(bos);
142145
String messageResult = bos.toString("UTF-8");
143146

144-
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Body>" +
147+
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
145148
"<type xmlns='http://springframework.org'><string>Foo</string></type>" +
146149
"</soapenv:Body></soapenv:Envelope>", messageResult);
147150

‎spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import javax.xml.transform.TransformerFactory;
3030
import javax.xml.transform.sax.SAXSource;
3131

32-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
33-
import static org.junit.Assert.*;
3432
import org.junit.Before;
3533
import org.junit.Test;
3634
import org.xml.sax.ContentHandler;
@@ -52,6 +50,11 @@
5250
import org.springframework.xml.sax.AbstractXmlReader;
5351
import org.springframework.xml.transform.StringResult;
5452

53+
import static org.custommonkey.xmlunit.XMLAssert.*;
54+
import static org.junit.Assert.assertEquals;
55+
import static org.junit.Assert.assertFalse;
56+
import static org.junit.Assert.assertTrue;
57+
5558
public class XmlRootElementPayloadMethodProcessorTest {
5659

5760
private XmlRootElementPayloadMethodProcessor processor;
@@ -207,7 +210,7 @@ public void handleReturnValueAxiom() throws Exception {
207210
response.writeTo(bos);
208211
String messageResult = bos.toString("UTF-8");
209212

210-
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Body>" +
213+
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
211214
"<root xmlns='http://springframework.org'><string>Foo</string></root>" +
212215
"</soapenv:Body></soapenv:Envelope>", messageResult);
213216

@@ -230,7 +233,7 @@ public void handleReturnValueAxiomNoPayloadCaching() throws Exception {
230233
response.writeTo(bos);
231234
String messageResult = bos.toString("UTF-8");
232235

233-
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Body>" +
236+
assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
234237
"<root xmlns='http://springframework.org'><string>Foo</string></root>" +
235238
"</soapenv:Body></soapenv:Envelope>", messageResult);
236239

‎spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
import javax.xml.stream.XMLStreamException;
2525
import javax.xml.stream.XMLStreamWriter;
2626

27+
import org.junit.Test;
28+
import org.xml.sax.SAXParseException;
29+
2730
import org.springframework.core.io.Resource;
2831
import org.springframework.util.StringUtils;
2932
import org.springframework.ws.mime.AbstractMimeMessageTestCase;
@@ -36,14 +39,19 @@
3639
import org.springframework.xml.validation.XmlValidator;
3740
import org.springframework.xml.validation.XmlValidatorFactory;
3841

39-
import org.junit.Test;
40-
import org.xml.sax.SAXParseException;
41-
42-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
43-
import static org.junit.Assert.*;
42+
import static org.custommonkey.xmlunit.XMLAssert.*;
43+
import static org.junit.Assert.assertEquals;
44+
import static org.junit.Assert.assertTrue;
45+
import static org.junit.Assert.fail;
4446

4547
public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTestCase {
4648

49+
protected abstract String getNS();
50+
51+
protected String getHeader() {
52+
return "<" + getNS() + ":Header/>";
53+
}
54+
4755
protected SoapMessage soapMessage;
4856

4957
@Override

‎spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323

2424
public class AxiomSoap11MessageTest extends AbstractSoap11MessageTestCase {
2525

26+
@Override
27+
protected String getNS() {
28+
return "soapenv";
29+
}
30+
2631
@Override
2732
protected SoapMessage createSoapMessage() throws Exception {
2833
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory();

‎spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@
1717
package org.springframework.ws.soap.axiom;
1818

1919
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
20-
import static org.junit.Assert.*;
2120

2221
import org.springframework.ws.soap.SoapBody;
2322
import org.springframework.ws.soap.SoapMessage;
2423
import org.springframework.ws.soap.SoapVersion;
2524
import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase;
2625

26+
import static org.junit.Assert.*;
27+
2728
public class AxiomSoap11NonCachingMessageTest extends AbstractSoap11MessageTestCase {
2829

30+
@Override
31+
protected String getNS() {
32+
return "soapenv";
33+
}
34+
2935
@Override
3036
protected SoapMessage createSoapMessage() throws Exception {
3137
AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory();

‎spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323

2424
public class AxiomSoap12MessageTest extends AbstractSoap12MessageTestCase {
2525

26+
@Override
27+
protected String getNS() {
28+
return "soapenv";
29+
}
30+
2631
@Override
2732
protected SoapMessage createSoapMessage() throws Exception {
2833
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory();

‎spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,22 @@
1616

1717
package org.springframework.ws.soap.axiom;
1818

19+
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
20+
1921
import org.springframework.ws.soap.SoapBody;
2022
import org.springframework.ws.soap.SoapMessage;
2123
import org.springframework.ws.soap.SoapVersion;
2224
import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase;
2325

24-
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
25-
2626
import static org.junit.Assert.*;
2727

2828
public class AxiomSoap12NonCachingMessageTest extends AbstractSoap12MessageTestCase {
2929

30+
@Override
31+
protected String getNS() {
32+
return "soapenv";
33+
}
34+
3035
@Override
3136
protected SoapMessage createSoapMessage() throws Exception {
3237
AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory();

‎spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,31 @@
2525
import javax.xml.transform.Result;
2626
import javax.xml.transform.Source;
2727

28+
import org.junit.Test;
29+
2830
import org.springframework.ws.soap.SoapMessage;
2931
import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase;
3032
import org.springframework.xml.transform.StringResult;
3133
import org.springframework.xml.transform.StringSource;
3234

33-
import org.junit.Test;
34-
35-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
35+
import static org.custommonkey.xmlunit.XMLAssert.*;
3636
import static org.junit.Assert.assertEquals;
3737
import static org.junit.Assert.assertTrue;
3838

3939
public class SaajSoap11MessageTest extends AbstractSoap11MessageTestCase {
4040

4141
private SOAPMessage saajMessage;
4242

43+
@Override
44+
protected String getNS() {
45+
return "SOAP-ENV";
46+
}
47+
48+
@Override
49+
protected String getHeader() {
50+
return "";
51+
}
52+
4353
@Override
4454
protected final SoapMessage createSoapMessage() throws Exception {
4555
MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);

‎spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@
3333

3434
public class SaajSoap12MessageTest extends AbstractSoap12MessageTestCase {
3535

36+
@Override
37+
protected String getNS() {
38+
return "env";
39+
}
40+
41+
@Override
42+
protected String getHeader() {
43+
return "";
44+
}
45+
3646
private SOAPMessage saajMessage;
3747

3848
@Override

‎spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import javax.xml.transform.TransformerFactory;
2828
import javax.xml.transform.stream.StreamSource;
2929

30-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
3130
import org.junit.Assert;
3231
import org.junit.Before;
3332
import org.junit.Test;
@@ -55,6 +54,8 @@
5554
import org.springframework.xml.validation.ValidationErrorHandler;
5655
import org.springframework.xml.xsd.SimpleXsdSchema;
5756

57+
import static org.custommonkey.xmlunit.XMLAssert.*;
58+
5859
public class PayloadValidatingInterceptorTest {
5960

6061
private PayloadValidatingInterceptor interceptor;
@@ -302,7 +303,7 @@ public void testCreateRequestValidationFaultAxiom() throws Exception {
302303
ByteArrayOutputStream os = new ByteArrayOutputStream();
303304
messageContext.getResponse().writeTo(os);
304305
assertXMLEqual(
305-
"<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soapenv:Body>" +
306+
"<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soapenv:Header/>" + "<soapenv:Body>" +
306307
"<soapenv:Fault>" + "<faultcode>soapenv:Client</faultcode>" +
307308
"<faultstring xml:lang='en'>Validation error</faultstring>" + "<detail>" +
308309
"<spring-ws:ValidationError xmlns:spring-ws=\"http://springframework.org/spring-ws\">Message 1</spring-ws:ValidationError>" +

‎spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import javax.xml.transform.stream.StreamSource;
2525

2626
import junit.framework.Assert;
27-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
28-
import static org.junit.Assert.*;
2927
import org.w3c.dom.Document;
3028
import org.w3c.dom.Element;
3129

@@ -39,6 +37,11 @@
3937
import org.springframework.ws.transport.MockTransportOutputStream;
4038
import org.springframework.xml.transform.StringSource;
4139

40+
import static org.custommonkey.xmlunit.XMLAssert.*;
41+
import static org.junit.Assert.assertEquals;
42+
import static org.junit.Assert.assertNotNull;
43+
import static org.junit.Assert.assertTrue;
44+
4245
public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageTestCase {
4346

4447
@Override
@@ -64,7 +67,7 @@ public void testWriteToTransportOutputStream() throws Exception {
6467
soapMessage.writeTo(tos);
6568
String result = bos.toString("UTF-8");
6669
assertXMLEqual(
67-
"<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
70+
"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
6871
result);
6972
String contentType = tos.getHeaders().get("Content-Type");
7073
assertTrue("Invalid Content-Type set", contentType.indexOf(SoapVersion.SOAP_11.getContentType()) != -1);
@@ -99,6 +102,12 @@ public void testToDocument() throws Exception {
99102
Document expected = documentBuilder.newDocument();
100103
Element envelope = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
101104
expected.appendChild(envelope);
105+
106+
if (!getHeader().isEmpty()) {
107+
Element header = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Header");
108+
envelope.appendChild(header);
109+
}
110+
102111
Element body = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Body");
103112
envelope.appendChild(body);
104113
Element payload = expected.createElementNS("http://www.springframework.org", "payload");
@@ -123,7 +132,7 @@ public void testSetLiveDocument() throws Exception {
123132

124133
String result = bos.toString("UTF-8");
125134
assertXMLEqual(
126-
"<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
135+
"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
127136
result);
128137
}
129138

@@ -148,7 +157,7 @@ public void testSetOtherDocument() throws Exception {
148157

149158
String result = bos.toString("UTF-8");
150159
assertXMLEqual(
151-
"<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
160+
"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
152161
result);
153162
}
154163

0 commit comments

Comments
 (0)