Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson
2019-03-28 11:48:47 +00:00
125 changed files with 450 additions and 447 deletions

View File

@@ -30,7 +30,7 @@ public class WebServiceConfig extends WsConfigurerAdapter {
DefaultWsdl11Definition wsdl = new DefaultWsdl11Definition();
wsdl.setPortTypeName("HumanResource");
wsdl.setLocationUri("/holidayService/");
wsdl.setTargetNamespace("http://mycompany.com/hr/definitions");
wsdl.setTargetNamespace("https://company.example.com/hr/definitions");
wsdl.setSchema(countriesSchema);
return wsdl;
}

View File

@@ -37,7 +37,7 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload;
@Endpoint
public class HolidayEndpoint {
private static final String NAMESPACE_URI = "http://mycompany.com/hr/schemas";
private static final String NAMESPACE_URI = "https://company.example.com/hr/schemas";
private XPathExpression<Element> startDateExpression;

View File

@@ -1,7 +1,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hr="http://mycompany.com/hr/schemas"
xmlns:hr="https://company.example.com/hr/schemas"
elementFormDefault="qualified"
targetNamespace="http://mycompany.com/hr/schemas">
targetNamespace="https://company.example.com/hr/schemas">
<xs:element name="HolidayRequest">
<xs:complexType>
<xs:all>

View File

@@ -55,7 +55,7 @@ public class SampleWsApplicationTests {
@Test
public void testSendingHolidayRequest() {
final String request = "<hr:HolidayRequest xmlns:hr=\"http://mycompany.com/hr/schemas\">"
final String request = "<hr:HolidayRequest xmlns:hr=\"https://company.example.com/hr/schemas\">"
+ " <hr:Holiday>" + " <hr:StartDate>2013-10-20</hr:StartDate>"
+ " <hr:EndDate>2013-11-22</hr:EndDate>" + " </hr:Holiday>"
+ " <hr:Employee>" + " <hr:Number>1</hr:Number>"