From c1874192e10548fe771194b36ba253e2515c243b Mon Sep 17 00:00:00 2001
From: Spring Operator <spring-operator@users.noreply.github.com>
Date: Tue, 26 Mar 2019 01:04:09 -0500
Subject: [PATCH] SWS-1063 - URL Cleanup.

This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

These URLs were unable to be fixed. Please review them to see if they can be manually resolved.

* [ ] http://schemas.xmlsoap.org/soap/encoding/ (200) with 4 occurrences could not be migrated:
   ([https](https://schemas.xmlsoap.org/soap/encoding/) result AnnotatedConnectException).

These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd (ReadTimeoutException) with 1 occurrences migrated to:
  https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd ([https](https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd) result ReadTimeoutException).
* [ ] http://business456.example/client1 (UnknownHostException) with 1 occurrences migrated to:
  https://business456.example/client1 ([https](https://business456.example/client1) result UnknownHostException).
* [ ] http://fabrikam123.example/mail/Delete (UnknownHostException) with 5 occurrences migrated to:
  https://fabrikam123.example/mail/Delete ([https](https://fabrikam123.example/mail/Delete) result UnknownHostException).
* [ ] http://springws.cas.de (UnknownHostException) with 2 occurrences migrated to:
  https://springws.cas.de ([https](https://springws.cas.de) result UnknownHostException).
* [ ] http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0 (404) with 7 occurrences migrated to:
  https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0 ([https](https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0) result 404).
* [ ] http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0 (404) with 14 occurrences migrated to:
  https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0 ([https](https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0) result 404).
* [ ] http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0 (404) with 4 occurrences migrated to:
  https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0 ([https](https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0) result 404).
* [ ] http://example.com/business/client1 (404) with 6 occurrences migrated to:
  https://example.com/business/client1 ([https](https://example.com/business/client1) result 404).
* [ ] http://example.com/someuniquestring (404) with 10 occurrences migrated to:
  https://example.com/someuniquestring ([https](https://example.com/someuniquestring) result 404).
* [ ] http://www.springframework.org/schema/beans/spring-tx-2.0.xsd (404) with 1 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-tx-2.0.xsd ([https](https://www.springframework.org/schema/beans/spring-tx-2.0.xsd) result 404).

These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd with 45 occurrences migrated to:
  https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd ([https](https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd) result 200).
* [ ] http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd with 27 occurrences migrated to:
  https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd ([https](https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd) result 200).
* [ ] http://example.com with 1 occurrences migrated to:
  https://example.com ([https](https://example.com) result 200).
* [ ] http://maven.apache.org/xsd/settings-1.0.0.xsd with 1 occurrences migrated to:
  https://maven.apache.org/xsd/settings-1.0.0.xsd ([https](https://maven.apache.org/xsd/settings-1.0.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/aop/spring-aop-2.5.xsd with 3 occurrences migrated to:
  https://www.springframework.org/schema/aop/spring-aop-2.5.xsd ([https](https://www.springframework.org/schema/aop/spring-aop-2.5.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans-2.0.xsd with 7 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans-2.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-2.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans-2.5.xsd with 4 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans-2.5.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-2.5.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans-3.0.xsd with 5 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans-3.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans-3.1.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans-3.1.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.1.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200).
* [ ] http://www.springframework.org/schema/context/spring-context-3.1.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/context/spring-context-3.1.xsd ([https](https://www.springframework.org/schema/context/spring-context-3.1.xsd) result 200).
* [ ] http://www.springframework.org/schema/web-services/web-services-1.5.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/web-services/web-services-1.5.xsd ([https](https://www.springframework.org/schema/web-services/web-services-1.5.xsd) result 200).
* [ ] http://www.springframework.org/schema/web-services/web-services-2.0.xsd with 7 occurrences migrated to:
  https://www.springframework.org/schema/web-services/web-services-2.0.xsd ([https](https://www.springframework.org/schema/web-services/web-services-2.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/web-services/web-services.xsd with 3 occurrences migrated to:
  https://www.springframework.org/schema/web-services/web-services.xsd ([https](https://www.springframework.org/schema/web-services/web-services.xsd) result 200).
* [ ] http://www.w3.org/2005/08/addressing/anonymous with 4 occurrences migrated to:
  https://www.w3.org/2005/08/addressing/anonymous ([https](https://www.w3.org/2005/08/addressing/anonymous) result 200).
* [ ] http://www.w3.org/2005/08/addressing/none with 1 occurrences migrated to:
  https://www.w3.org/2005/08/addressing/none ([https](https://www.w3.org/2005/08/addressing/none) result 200).
* [ ] http://www.w3.org/2005/08/addressing with 9 occurrences migrated to:
  https://www.w3.org/2005/08/addressing ([https](https://www.w3.org/2005/08/addressing) result 301).
* [ ] http://www.w3.org/2001/04/xmlenc with 20 occurrences migrated to:
  https://www.w3.org/2001/04/xmlenc ([https](https://www.w3.org/2001/04/xmlenc) result 302).
* [ ] http://www.w3.org/2001/10/xml-exc-c14n with 6 occurrences migrated to:
  https://www.w3.org/2001/10/xml-exc-c14n ([https](https://www.w3.org/2001/10/xml-exc-c14n) result 302).
* [ ] http://www.w3.org/2000/09/xmldsig with 42 occurrences migrated to:
  https://www.w3.org/2000/09/xmldsig ([https](https://www.w3.org/2000/09/xmldsig) result 303).

These URLs were intentionally ignored.

* http://codex.corp.obade.com/codex/schemas with 1 occurrences
* http://example.com/fabrikam with 8 occurrences
* http://example.com/fabrikam/mail/Delete with 8 occurrences
* http://example.org/alert with 2 occurrences
* http://fabrikam123.com/payloads with 30 occurrences
* http://java.sun.com/xml/ns/xwss/config with 12 occurrences
* http://maven.apache.org/POM/4.0.0 with 12 occurrences
* http://maven.apache.org/SETTINGS/1.0.0 with 2 occurrences
* http://schemas.xmlsoap.org/soap/envelope/ with 44 occurrences
* http://schemas.xmlsoap.org/ws/2004/08/addressing with 10 occurrences
* http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous with 5 occurrences
* http://springframework.org/spring-ws with 2 occurrences
* http://springframework.org/spring-ws/Fault with 1 occurrences
* http://springframework.org/spring-ws/NoResponse with 1 occurrences
* http://springframework.org/spring-ws/Response with 1 occurrences
* http://test with 3 occurrences
* http://www.fabrikam123.example/svc53 with 5 occurrences
* http://www.springframework.org/schema/aop with 6 occurrences
* http://www.springframework.org/schema/beans with 38 occurrences
* http://www.springframework.org/schema/context with 2 occurrences
* http://www.springframework.org/schema/p with 1 occurrences
* http://www.springframework.org/schema/tx with 3 occurrences
* http://www.springframework.org/schema/web-services with 24 occurrences
* http://www.springframework.org/spring-ws with 9 occurrences
* http://www.springframework.org/spring-ws/attr with 1 occurrences
* http://www.springframework.org/spring-ws/child with 1 occurrences
* http://www.springframework.org/spring-ws/samples/echo with 4 occurrences
* http://www.springframework.org/spring-ws/test/multipleSchemas1 with 1 occurrences
* http://www.springframework.org/spring-ws/test/multipleSchemas2 with 1 occurrences
* http://www.springframework.org/spring-ws/test/transformation with 2 occurrences
* http://www.springframework.org/spring-ws/test/validation with 6 occurrences
* http://www.w3.org/2000/svg with 1 occurrences
* http://www.w3.org/2001/XMLSchema with 1 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 29 occurrences
* http://www.w3.org/2003/05/soap-envelope with 25 occurrences

Get core working.

Patch security.
---
 settings.xml                                    |  2 +-
 .../AbstractAddressingInterceptorTestCase.java  | 11 +++++------
 ...notationActionMethodEndpointMappingTest.java | 17 +++++++++--------
 ...annotationDrivenBeanDefinitionParserTest.xml |  4 ++--
 ...ceptorsBeanDefinitionParserInjectionTest.xml |  6 +++---
 ...nterceptorsBeanDefinitionParserOrderTest.xml |  4 ++--
 .../interceptorsBeanDefinitionParserTest.xml    |  4 ++--
 .../config/webServiceNamespaceHandlerTest.xml   |  6 +++---
 .../webServicesNamespaceHandlerTest-tiger.xml   |  4 ++--
 .../ws/config/wsdlBeanDefinitionParserTest.xml  |  4 ++--
 .../mapping/bridged-method-registration.xml     |  4 ++--
 .../mapping/cglib-proxy-registration.xml        |  6 +++---
 .../endpoint/mapping/jdk-proxy-registration.xml |  6 +++---
 ...yloadRootAnnotationMethodEndpointMapping.xml |  6 +++---
 .../ws/soap/addressing/10/request-anonymous.xml |  2 +-
 .../addressing/10/request-no-message-id.xml     |  4 ++--
 .../soap/addressing/10/request-no-reply-to.xml  |  2 +-
 .../ws/soap/addressing/10/request-no-to.xml     |  2 +-
 .../ws/soap/addressing/10/request-none.xml      |  2 +-
 .../soap/addressing/10/response-anonymous.xml   |  2 +-
 .../ws/soap/addressing/10/valid.xml             |  4 ++--
 .../addressing/200408/request-anonymous.xml     |  2 +-
 .../soap/addressing/200408/request-fault-to.xml |  4 ++--
 .../addressing/200408/request-no-message-id.xml |  4 ++--
 .../addressing/200408/request-no-reply-to.xml   |  2 +-
 .../ws/soap/addressing/200408/valid.xml         |  4 ++--
 .../ws/soap/addressing/server/valid.xml         |  4 ++--
 .../ws/transport/http/WEB-INF/sws-servlet.xml   |  4 ++--
 .../security/wss4j/usernameTokenDigest-soap.xml |  2 +-
 .../usernameTokenPlainTextWithHeaders-soap.xml  |  4 ++--
 .../wss4j2/usernameTokenDigest-soap.xml         |  2 +-
 .../http/httpserver-applicationContext.xml      |  2 +-
 .../ws/transport/jms/jms-applicationContext.xml |  2 +-
 .../jms/jms-receiver-applicationContext.xml     |  2 +-
 .../jms/jms-sender-applicationContext.xml       |  2 +-
 .../transport/mail/mail-applicationContext.xml  |  2 +-
 .../client/integration/integration-test.xml     |  4 ++--
 .../server/integration/integration-test.xml     |  2 +-
 src/main/asciidoctor/images/oxm-exceptions.svg  |  2 +-
 39 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/settings.xml b/settings.xml
index cf86357e..829f33c3 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,7 +1,7 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
 		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
 
 	<servers>
 		<server>
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
index a1a169fd..c5b0bfc7 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
@@ -20,6 +20,9 @@ import java.net.URI;
 import java.util.Iterator;
 import java.util.Locale;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapHeaderElement;
@@ -32,12 +35,8 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageSender;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public abstract class AbstractAddressingInterceptorTestCase extends AbstractWsAddressingTestCase {
 
@@ -186,7 +185,7 @@ public abstract class AbstractAddressingInterceptorTestCase extends AbstractWsAd
 		URI messageId = new URI("uid:1234");
 		expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId);
 
-		URI uri = new URI("http://example.com/business/client1");
+		URI uri = new URI("https://example.com/business/client1");
 		expect(senderMock.supports(uri)).andReturn(true);
 		expect(senderMock.createConnection(uri)).andReturn(connectionMock);
 		connectionMock.send(response);
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
index 13ab060b..792f1ad4 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
@@ -16,9 +16,17 @@
 
 package org.springframework.ws.soap.addressing.server;
 
+import java.io.IOException;
+import java.io.InputStream;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
@@ -32,13 +40,6 @@ import org.springframework.ws.soap.addressing.server.annotation.Address;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import java.io.IOException;
-import java.io.InputStream;
-
 import static org.junit.Assert.*;
 
 /**
@@ -97,7 +98,7 @@ public class AnnotationActionMethodEndpointMappingTest {
 	@Address("mailto:joe@fabrikam123.example")
 	private static class MyEndpoint {
 
-		@Action("http://fabrikam123.example/mail/Delete")
+		@Action("https://fabrikam123.example/mail/Delete")
 		public void doIt() {
 
 		}
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
index e5c4b7ea..0faa73f5 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <sws:annotation-driven/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
index 0fa8b8b8..9c673362 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
@@ -3,9 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
        xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd
+       http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <context:annotation-config/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
index ac55bffe..edc2ab32 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd">
 
     <sws:interceptors>
         <ref bean="externalGlobalInterceptor"/>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
index ce55385b..4ab2ad25 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd">
 
     <sws:interceptors>
         <bean class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor"/>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
index 14f40919..7aea0b4d 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:sws="http://www.springframework.org/schema/web-services" xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/beans/spring-tx-2.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd">
+       http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/tx https://www.springframework.org/schema/beans/spring-tx-2.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-1.5.xsd">
 
     <sws:marshalling-endpoints/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
index 0b33cb19..a8ae34e7 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:sws="http://www.springframework.org/schema/web-services" xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd">
+       http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-1.5.xsd">
 
     <sws:marshalling-endpoints/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
index d091f7fd..6af6c8f3 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <sws:static-wsdl location="classpath:org/springframework/ws/client/support/destination/simple.wsdl"/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
index a5d75fd3..43560b75 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <bean id="bridgedMethodEndpoint" class="org.springframework.ws.server.endpoint.mapping.BridgedMethodRegistrationTest$B"/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
index c140b153..ea899a55 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
@@ -3,9 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-        http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+        http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <bean id="cgLibProxyEndpoint" class="org.springframework.ws.server.endpoint.mapping.CgLibProxyRegistrationTest$MyEndpoint"/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
index 0ef33fe6..90199567 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
@@ -3,9 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-        http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+        http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <bean id="jdkProxyEndpoint" class="org.springframework.ws.server.endpoint.mapping.JdkProxyRegistrationTest$MyEndpointImpl"/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
index 1adfd72c..b8f7cb71 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
@@ -3,9 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-        http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+        http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <bean id="endpoint" class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMappingTest$MyEndpoint"/>
 
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
index e32c0293..39236980 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
@@ -1,6 +1,6 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
         <wsa:ReplyTo>
             <wsa:Address>http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
         </wsa:ReplyTo>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
index 8a74f50f..b72266c7 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
@@ -1,8 +1,8 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <!--<wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>-->
+        <!--<wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>-->
         <wsa:ReplyTo>
-            <wsa:Address>http://example.com/business/client1</wsa:Address>
+            <wsa:Address>https://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To>mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
index 4daaac54..601074a1 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
@@ -1,6 +1,6 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
         <wsa:To>mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
     </S:Header>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
index e7515513..ab0943e5 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
@@ -1,7 +1,7 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
     </S:Header>
     <S:Body>
         <f:Delete xmlns:f="http://example.com/fabrikam">
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
index 17c0a7e4..bb8bb772 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
@@ -1,6 +1,6 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
         <wsa:ReplyTo>
             <wsa:Address>http://www.w3.org/2005/08/addressing/none</wsa:Address>
         </wsa:ReplyTo>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
index 2ba12041..f0fe8ad3 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
@@ -1,7 +1,7 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <env:Header>
         <wsa:MessageID>uid:1234</wsa:MessageID>
-        <wsa:RelatesTo>http://example.com/someuniquestring</wsa:RelatesTo>
+        <wsa:RelatesTo>https://example.com/someuniquestring</wsa:RelatesTo>
         <wsa:To env:mustUnderstand="true">http://www.w3.org/2005/08/addressing/anonymous</wsa:To>
         <wsa:Action>urn:replyAction</wsa:Action>
     </env:Header>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
index e44c1df8..2adaeabe 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
@@ -1,8 +1,8 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
         <wsa:ReplyTo>
-            <wsa:Address>http://example.com/business/client1</wsa:Address>
+            <wsa:Address>https://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
index db513298..d061fe2f 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
@@ -7,7 +7,7 @@
             <wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To S:mustUnderstand="true">mailto:joe@fabrikam123.example</wsa:To>
-        <wsa:Action>http://fabrikam123.example/mail/Delete</wsa:Action>
+        <wsa:Action>https://fabrikam123.example/mail/Delete</wsa:Action>
     </S:Header>
     <S:Body>
         <f123:Delete>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
index 99af804a..4110fc32 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
@@ -4,13 +4,13 @@
     <S:Header>
         <wsa:MessageID>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:MessageID>
         <wsa:ReplyTo>
-            <wsa:Address>http://example.com/business/client1</wsa:Address>
+            <wsa:Address>https://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:FaultTo>
             <wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
         </wsa:FaultTo>
         <wsa:To S:mustUnderstand="true">mailto:joe@fabrikam123.example</wsa:To>
-        <wsa:Action>http://fabrikam123.example/mail/Delete</wsa:Action>
+        <wsa:Action>https://fabrikam123.example/mail/Delete</wsa:Action>
     </S:Header>
     <S:Body>
         <f123:Delete>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
index 0d105eb3..9f26a93f 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
@@ -4,10 +4,10 @@
     <S:Header>
         <!--<wsa:MessageID>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:MessageID>-->
         <wsa:ReplyTo>
-            <wsa:Address>http://business456.example/client1</wsa:Address>
+            <wsa:Address>https://business456.example/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To S:mustUnderstand="true">mailto:joe@fabrikam123.example</wsa:To>
-        <wsa:Action>http://fabrikam123.example/mail/Delete</wsa:Action>
+        <wsa:Action>https://fabrikam123.example/mail/Delete</wsa:Action>
     </S:Header>
     <S:Body>
         <f123:Delete>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
index e630193f..6b1d576a 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
@@ -7,7 +7,7 @@
         <wsa:From>
             <wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
         </wsa:From>
-        <wsa:Action>http://fabrikam123.example/mail/Delete</wsa:Action>
+        <wsa:Action>https://fabrikam123.example/mail/Delete</wsa:Action>
     </S:Header>
     <S:Body>
         <f123:Delete>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
index fb813b6e..21ee05de 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
@@ -1,9 +1,9 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
             xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:MessageID>https://example.com/someuniquestring</wsa:MessageID>
         <wsa:ReplyTo>
-            <wsa:Address>http://example.com/business/client1</wsa:Address>
+            <wsa:Address>https://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
index 405b87ef..57a882ee 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
@@ -4,10 +4,10 @@
     <S:Header>
         <wsa:MessageID>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:MessageID>
         <wsa:ReplyTo>
-            <wsa:Address>http://example.com/business/client1</wsa:Address>
+            <wsa:Address>https://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
         <wsa:To S:mustUnderstand="true">mailto:joe@fabrikam123.example</wsa:To>
-        <wsa:Action>http://fabrikam123.example/mail/Delete</wsa:Action>
+        <wsa:Action>https://fabrikam123.example/mail/Delete</wsa:Action>
     </S:Header>
     <S:Body>
         <f123:Delete>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
index 5eef94b8..579414b7 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sws="http://www.springframework.org/schema/web-services"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
 
     <sws:annotation-driven/>
diff --git a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
index 98d82b7a..d2d5bfb4 100755
--- a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
+++ b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
@@ -1,6 +1,6 @@
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
     <SOAP-ENV:Header>
-<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="XWSSGID-1149205720423-1352053129" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Username>Bert</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">kwNstEaiFOrI7B31j7GuETYvdgk=</wsse:Password><wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">9mdsYDCrjjYRur0rxzYt2oD7</wsse:Nonce><wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2006-06-01T23:48:42Z</wsu:Created></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body>
+<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="XWSSGID-1149205720423-1352053129" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Username>Bert</wsse:Username><wsse:Password Type="https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">kwNstEaiFOrI7B31j7GuETYvdgk=</wsse:Password><wsse:Nonce EncodingType="https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">9mdsYDCrjjYRur0rxzYt2oD7</wsse:Nonce><wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2006-06-01T23:48:42Z</wsu:Created></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body>
         <tru:StockSymbol xmlns:tru="http://fabrikam123.com/payloads">QQQ</tru:StockSymbol>
     </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
diff --git a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
index 111a52e9..ae88469b 100755
--- a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
+++ b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
@@ -1,5 +1,5 @@
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
-    <SOAP-ENV:Header>
+    <SOAP-ENV:Header>
     <header1>1</header1>
         <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
                        SOAP-ENV:mustUnderstand="1">
@@ -12,7 +12,7 @@
                         Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"
                         >Ernie</wsse:Password>
             </wsse:UsernameToken>
-        </wsse:Security>
+        </wsse:Security>
         <header2>2</header2>
     </SOAP-ENV:Header>
     <SOAP-ENV:Body>
diff --git a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j2/usernameTokenDigest-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j2/usernameTokenDigest-soap.xml
index 98d82b7a..d2d5bfb4 100644
--- a/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j2/usernameTokenDigest-soap.xml
+++ b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j2/usernameTokenDigest-soap.xml
@@ -1,6 +1,6 @@
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
     <SOAP-ENV:Header>
-<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="XWSSGID-1149205720423-1352053129" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Username>Bert</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">kwNstEaiFOrI7B31j7GuETYvdgk=</wsse:Password><wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">9mdsYDCrjjYRur0rxzYt2oD7</wsse:Nonce><wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2006-06-01T23:48:42Z</wsu:Created></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body>
+<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="XWSSGID-1149205720423-1352053129" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Username>Bert</wsse:Username><wsse:Password Type="https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">kwNstEaiFOrI7B31j7GuETYvdgk=</wsse:Password><wsse:Nonce EncodingType="https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">9mdsYDCrjjYRur0rxzYt2oD7</wsse:Nonce><wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2006-06-01T23:48:42Z</wsu:Created></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body>
         <tru:StockSymbol xmlns:tru="http://fabrikam123.com/payloads">QQQ</tru:StockSymbol>
     </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
index 8238729c..c176c088 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean id="port" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
         <property name="targetClass" value="org.springframework.ws.transport.support.FreePortScanner"/>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
index a133ed53..96c3a9f9 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+        xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
index bacd4ae0..ba4685e9 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
index f9c085c5..1d2a52af 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
index 538ee3d3..15d382f7 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <bean id="session" class="javax.mail.Session" factory-method="getInstance">
         <constructor-arg>
diff --git a/spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml b/spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
index a24a8d9b..4d309c1f 100644
--- a/spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
+++ b/spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="client" class="org.springframework.ws.test.client.integration.CustomerClient">
         <property name="webServiceTemplate" ref="webServiceTemplate"/>
@@ -10,7 +10,7 @@
     <bean id="webServiceTemplate" class="org.springframework.ws.client.core.WebServiceTemplate">
         <property name="marshaller" ref="marshaller"/>
         <property name="unmarshaller" ref="marshaller"/>
-        <property name="defaultUri" value="http://example.com"/>
+        <property name="defaultUri" value="https://example.com"/>
     </bean>
     
     <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
diff --git a/spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml b/spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
index 5a29e832..704b3723 100644
--- a/spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
+++ b/spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean class="org.springframework.ws.server.endpoint.mapping.jaxb.XmlRootElementEndpointMapping"/>
 
diff --git a/src/main/asciidoctor/images/oxm-exceptions.svg b/src/main/asciidoctor/images/oxm-exceptions.svg
index e33c67ae..0970a236 100644
--- a/src/main/asciidoctor/images/oxm-exceptions.svg
+++ b/src/main/asciidoctor/images/oxm-exceptions.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+ "https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Generated by dot version 1.13 (v16) (Mon August 23, 2004)
      For user: (arjen) Arjen Poutsma   Title: G    Pages: 1 -->
 <svg width="525pt" height="192pt"