From eb78f55ce0453dd37c80a5690fd11df2d4e007b1 Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Mon, 18 Jul 2016 21:19:45 +0200 Subject: [PATCH] Using schemas.gumartinm.name where it is required (trying to make different namespaces for WSDL and schemas, dunno whether it is worth it) --- .../src/main/build-resources/bindings/custombinding.xjb | 4 ++-- .../src/main/build-resources/wsdl/example.wsdl | 8 ++++---- .../src/main/resources/examples.xsd | 4 ++-- .../spring-configuration/ws/client-spring-configuration.xml | 4 ++-- .../webservices/client/ExampleClientServiceIntegrationTest.java | 8 ++++---- .../java/de/spring/webservices/endpoints/ExampleEndPoint.java | 2 +- .../src/main/resources/examples.xsd | 4 ++-- .../src/main/resources/spring-configuration/ws/soap-ws.xml | 2 +- .../webservices/endpoints/ExampleEndPointIntegrationTest.java | 8 ++++---- .../src/main/build-resources/wsdl/example.wsdl | 8 ++++---- .../src/main/resources/schemas/examples.xsd | 4 ++-- .../spring-configuration/ws/client-spring-configuration.xml | 4 ++-- .../webservices/client/ExampleClientServiceIntegrationTest.java | 8 ++++---- .../java/de/spring/webservices/endpoints/ExampleEndPoint.java | 2 +- .../src/main/resources/schemas/examples.xsd | 4 ++-- .../src/main/resources/spring-configuration/ws/soap-ws.xml | 2 +- .../webservices/endpoints/ExampleEndPointIntegrationTest.java | 8 ++++---- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/SOAP/cxf/web-services-spring-cxf-client/src/main/build-resources/bindings/custombinding.xjb b/SOAP/cxf/web-services-spring-cxf-client/src/main/build-resources/bindings/custombinding.xjb index d573e11..3b5e4b1 100644 --- a/SOAP/cxf/web-services-spring-cxf-client/src/main/build-resources/bindings/custombinding.xjb +++ b/SOAP/cxf/web-services-spring-cxf-client/src/main/build-resources/bindings/custombinding.xjb @@ -21,14 +21,14 @@ + node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://schemas.gumartinm.name/spring-ws/example']"> - + + diff --git a/SOAP/cxf/web-services-spring-cxf-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java b/SOAP/cxf/web-services-spring-cxf-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java index 4877a5d..49b5e59 100644 --- a/SOAP/cxf/web-services-spring-cxf-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java +++ b/SOAP/cxf/web-services-spring-cxf-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java @@ -40,11 +40,11 @@ public class ExampleClientServiceIntegrationTest { @Test public void customerClient() throws Exception { final Source requestPayload = new StringSource( - "" + "" + "SCARLETT SPRING. IT IS CANON." + ""); final Source responsePayload = new StringSource( - "" + "" + "SNAKE EYES AND SCARLETT SPRING. IT IS CANON." + ""); mockServer.expect(payload(requestPayload)).andRespond( @@ -59,11 +59,11 @@ public class ExampleClientServiceIntegrationTest { @Test public void customerCustomClient() throws Exception { final Source customRequestPayload = new StringSource( - "" + + "" + "CUSTOM BINDING SPRING. SCARLETT. IT IS CANON." + ""); final Source customResponsePayload = new StringSource( - "" + + "" + "CUSTOM BINDING SNAKE EYES AND SCARLETT SPRING. IT IS CANON." + ""); mockServer.expect(payload(customRequestPayload)).andRespond( diff --git a/SOAP/cxf/web-services-spring-cxf-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java b/SOAP/cxf/web-services-spring-cxf-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java index 41da49b..dd1ea37 100644 --- a/SOAP/cxf/web-services-spring-cxf-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java +++ b/SOAP/cxf/web-services-spring-cxf-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java @@ -19,7 +19,7 @@ import de.spring.webservices.services.ExampleService; @Endpoint public class ExampleEndPoint { - private static final String NAMESPACE_URI = "http://gumartinm.name/spring-ws/example"; + private static final String NAMESPACE_URI = "http://schemas.gumartinm.name/spring-ws/example"; private final Operations.RequestResponse customBindingExampleService; diff --git a/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/examples.xsd b/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/examples.xsd index b770328..8798ed0 100644 --- a/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/examples.xsd +++ b/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/examples.xsd @@ -1,5 +1,5 @@  - diff --git a/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/spring-configuration/ws/soap-ws.xml b/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/spring-configuration/ws/soap-ws.xml index cf3e7d7..d90e533 100644 --- a/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/spring-configuration/ws/soap-ws.xml +++ b/SOAP/cxf/web-services-spring-cxf-server/src/main/resources/spring-configuration/ws/soap-ws.xml @@ -102,7 +102,7 @@ --> diff --git a/SOAP/cxf/web-services-spring-cxf-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java b/SOAP/cxf/web-services-spring-cxf-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java index f0204cb..6600f3a 100644 --- a/SOAP/cxf/web-services-spring-cxf-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java +++ b/SOAP/cxf/web-services-spring-cxf-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java @@ -33,11 +33,11 @@ public class ExampleEndPointIntegrationTest { @Test public void exampleEndpoint() throws Exception { final Source requestPayload = new StringSource( - "" + + "" + "SCARLETT" + ""); final Source responsePayload = new StringSource( - "" + + "" + "SNAKE EYES AND SCARLETT" + ""); mockClient.sendRequest(withPayload(requestPayload)).andExpect( @@ -45,13 +45,13 @@ public class ExampleEndPointIntegrationTest { final Source customRequestPayload = new StringSource( - "" + + "" + "SCARLETT" + "2015-06-03T10:20:30Z" + "FIRST" + ""); final Source customResponsePayload = new StringSource( - "" + + "" + "CUSTOM BINDING SNAKE EYES AND SCARLETT" + "FIRST" + ""); diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-client/src/main/build-resources/wsdl/example.wsdl b/SOAP/jaxb2/web-services-spring-jaxb2-client/src/main/build-resources/wsdl/example.wsdl index 8891cb8..1bc4187 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-client/src/main/build-resources/wsdl/example.wsdl +++ b/SOAP/jaxb2/web-services-spring-jaxb2-client/src/main/build-resources/wsdl/example.wsdl @@ -1,7 +1,7 @@ - + - + - + + diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java b/SOAP/jaxb2/web-services-spring-jaxb2-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java index 4877a5d..49b5e59 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java +++ b/SOAP/jaxb2/web-services-spring-jaxb2-client/src/test/java/de/spring/webservices/client/ExampleClientServiceIntegrationTest.java @@ -40,11 +40,11 @@ public class ExampleClientServiceIntegrationTest { @Test public void customerClient() throws Exception { final Source requestPayload = new StringSource( - "" + "" + "SCARLETT SPRING. IT IS CANON." + ""); final Source responsePayload = new StringSource( - "" + "" + "SNAKE EYES AND SCARLETT SPRING. IT IS CANON." + ""); mockServer.expect(payload(requestPayload)).andRespond( @@ -59,11 +59,11 @@ public class ExampleClientServiceIntegrationTest { @Test public void customerCustomClient() throws Exception { final Source customRequestPayload = new StringSource( - "" + + "" + "CUSTOM BINDING SPRING. SCARLETT. IT IS CANON." + ""); final Source customResponsePayload = new StringSource( - "" + + "" + "CUSTOM BINDING SNAKE EYES AND SCARLETT SPRING. IT IS CANON." + ""); mockServer.expect(payload(customRequestPayload)).andRespond( diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java index f6ff022..411d32c 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java +++ b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/java/de/spring/webservices/endpoints/ExampleEndPoint.java @@ -19,7 +19,7 @@ import de.spring.webservices.services.ExampleService; @Endpoint public class ExampleEndPoint { - private static final String NAMESPACE_URI = "http://gumartinm.name/spring-ws/example"; + private static final String NAMESPACE_URI = "http://schemas.gumartinm.name/spring-ws/example"; private final Operations.RequestResponse customBindingExampleService; diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/schemas/examples.xsd b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/schemas/examples.xsd index b770328..8798ed0 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/schemas/examples.xsd +++ b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/schemas/examples.xsd @@ -1,5 +1,5 @@  - diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/spring-configuration/ws/soap-ws.xml b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/spring-configuration/ws/soap-ws.xml index 40f2901..041b914 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/spring-configuration/ws/soap-ws.xml +++ b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/main/resources/spring-configuration/ws/soap-ws.xml @@ -102,7 +102,7 @@ --> diff --git a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java index f0204cb..6600f3a 100644 --- a/SOAP/jaxb2/web-services-spring-jaxb2-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java +++ b/SOAP/jaxb2/web-services-spring-jaxb2-server/src/test/java/de/spring/webservices/endpoints/ExampleEndPointIntegrationTest.java @@ -33,11 +33,11 @@ public class ExampleEndPointIntegrationTest { @Test public void exampleEndpoint() throws Exception { final Source requestPayload = new StringSource( - "" + + "" + "SCARLETT" + ""); final Source responsePayload = new StringSource( - "" + + "" + "SNAKE EYES AND SCARLETT" + ""); mockClient.sendRequest(withPayload(requestPayload)).andExpect( @@ -45,13 +45,13 @@ public class ExampleEndPointIntegrationTest { final Source customRequestPayload = new StringSource( - "" + + "" + "SCARLETT" + "2015-06-03T10:20:30Z" + "FIRST" + ""); final Source customResponsePayload = new StringSource( - "" + + "" + "CUSTOM BINDING SNAKE EYES AND SCARLETT" + "FIRST" + ""); -- 2.1.4