Skip to content

Commit c187419

Browse files
spring-operatorgregturn
authored andcommitted
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.
1 parent 338f370 commit c187419

File tree

39 files changed

+76
-76
lines changed

39 files changed

+76
-76
lines changed

settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4-
http://maven.apache.org/xsd/settings-1.0.0.xsd">
4+
https://maven.apache.org/xsd/settings-1.0.0.xsd">
55

66
<servers>
77
<server>

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
import java.util.Iterator;
2121
import java.util.Locale;
2222

23+
import org.junit.Before;
24+
import org.junit.Test;
25+
2326
import org.springframework.ws.context.DefaultMessageContext;
2427
import org.springframework.ws.context.MessageContext;
2528
import org.springframework.ws.soap.SoapHeaderElement;
@@ -32,12 +35,8 @@
3235
import org.springframework.ws.transport.WebServiceConnection;
3336
import org.springframework.ws.transport.WebServiceMessageSender;
3437

35-
import org.junit.Before;
36-
import org.junit.Test;
37-
3838
import static org.easymock.EasyMock.*;
39-
import static org.junit.Assert.assertFalse;
40-
import static org.junit.Assert.assertTrue;
39+
import static org.junit.Assert.*;
4140

4241
public abstract class AbstractAddressingInterceptorTestCase extends AbstractWsAddressingTestCase {
4342

@@ -186,7 +185,7 @@ public void testOutOfBandReplyTo() throws Exception {
186185
URI messageId = new URI("uid:1234");
187186
expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId);
188187

189-
URI uri = new URI("http://example.com/business/client1");
188+
URI uri = new URI("https://example.com/business/client1");
190189
expect(senderMock.supports(uri)).andReturn(true);
191190
expect(senderMock.createConnection(uri)).andReturn(connectionMock);
192191
connectionMock.send(response);

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@
1616

1717
package org.springframework.ws.soap.addressing.server;
1818

19+
import java.io.IOException;
20+
import java.io.InputStream;
21+
import javax.xml.soap.MessageFactory;
22+
import javax.xml.soap.MimeHeaders;
23+
import javax.xml.soap.SOAPConstants;
24+
import javax.xml.soap.SOAPException;
25+
1926
import org.custommonkey.xmlunit.XMLUnit;
2027
import org.junit.Before;
2128
import org.junit.Test;
29+
2230
import org.springframework.context.support.StaticApplicationContext;
2331
import org.springframework.ws.context.DefaultMessageContext;
2432
import org.springframework.ws.context.MessageContext;
@@ -32,13 +40,6 @@
3240
import org.springframework.ws.soap.saaj.SaajSoapMessage;
3341
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
3442

35-
import javax.xml.soap.MessageFactory;
36-
import javax.xml.soap.MimeHeaders;
37-
import javax.xml.soap.SOAPConstants;
38-
import javax.xml.soap.SOAPException;
39-
import java.io.IOException;
40-
import java.io.InputStream;
41-
4243
import static org.junit.Assert.*;
4344

4445
/**
@@ -97,7 +98,7 @@ private MessageContext createMessageContext() throws SOAPException, IOException
9798
@Address("mailto:[email protected]")
9899
private static class MyEndpoint {
99100

100-
@Action("http://fabrikam123.example/mail/Delete")
101+
@Action("https://fabrikam123.example/mail/Delete")
101102
public void doIt() {
102103

103104
}

spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:sws="http://www.springframework.org/schema/web-services"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
77

88
<sws:annotation-driven/>
99

spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:sws="http://www.springframework.org/schema/web-services"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
7-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
7+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd
8+
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd">
99

1010
<context:annotation-config/>
1111

spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:p="http://www.springframework.org/schema/p"
55
xmlns:sws="http://www.springframework.org/schema/web-services"
6-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd">
88

99
<sws:interceptors>
1010
<ref bean="externalGlobalInterceptor"/>

spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:sws="http://www.springframework.org/schema/web-services"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services.xsd">
77

88
<sws:interceptors>
99
<bean class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor"/>

spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns:tx="http://www.springframework.org/schema/tx"
44
xmlns:sws="http://www.springframework.org/schema/web-services" xsi:schemaLocation="
5-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/beans/spring-tx-2.0.xsd
7-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd">
5+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6+
http://www.springframework.org/schema/tx https://www.springframework.org/schema/beans/spring-tx-2.0.xsd
7+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-1.5.xsd">
88

99
<sws:marshalling-endpoints/>
1010

spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns:tx="http://www.springframework.org/schema/tx"
44
xmlns:sws="http://www.springframework.org/schema/web-services" xsi:schemaLocation="
5-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd">
5+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
6+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-1.5.xsd">
77

88
<sws:marshalling-endpoints/>
99

spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:sws="http://www.springframework.org/schema/web-services"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6-
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6+
http://www.springframework.org/schema/web-services https://www.springframework.org/schema/web-services/web-services-2.0.xsd">
77

88
<sws:static-wsdl location="classpath:org/springframework/ws/client/support/destination/simple.wsdl"/>
99

0 commit comments

Comments
 (0)