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

Merge branch '1.3.x' into 1.4.x

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-27 12:11:46 +00:00
parent 61602c0851 35572b6aae
commit baec3d6e8e
101 changed files with 464 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/WebServiceConfig.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2019 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.
@@ -32,7 +32,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;
}

2
spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/endpoint/HolidayEndpoint.java
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;

4
spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
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>

2
spring-boot-samples/spring-boot-sample-webservices/src/test/java/sample/webservices/SampleWsApplicationTests.java
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>"