diff --git a/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml b/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml index e748cb7d92..457c183d56 100644 --- a/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml +++ b/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml @@ -1,5 +1,5 @@ - + + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/config/src/test/resources/org/springframework/security/config/websocket/sync.xml b/config/src/test/resources/org/springframework/security/config/websocket/sync.xml index 00b4add34a..b8ae07db3e 100644 --- a/config/src/test/resources/org/springframework/security/config/websocket/sync.xml +++ b/config/src/test/resources/org/springframework/security/config/websocket/sync.xml @@ -16,7 +16,7 @@ --> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/config/src/test/resources/org/springframework/security/config/websocket/websocket-sockjs.xml b/config/src/test/resources/org/springframework/security/config/websocket/websocket-sockjs.xml index 4b32fe0f50..7668f5cae6 100644 --- a/config/src/test/resources/org/springframework/security/config/websocket/websocket-sockjs.xml +++ b/config/src/test/resources/org/springframework/security/config/websocket/websocket-sockjs.xml @@ -17,8 +17,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/websocket https://www.springframework.org/schema/websocket/spring-websocket.xsd"> diff --git a/config/src/test/resources/org/springframework/security/config/websocket/websocket.xml b/config/src/test/resources/org/springframework/security/config/websocket/websocket.xml index ec6b2293b2..6128f0404a 100644 --- a/config/src/test/resources/org/springframework/security/config/websocket/websocket.xml +++ b/config/src/test/resources/org/springframework/security/config/websocket/websocket.xml @@ -17,8 +17,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/websocket https://www.springframework.org/schema/websocket/spring-websocket.xsd"> diff --git a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml index 49de0f1b48..5885916482 100644 --- a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml +++ b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml @@ -22,9 +22,9 @@ xmlns:util="http://www.springframework.org/schema/util" 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-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/core/src/test/resources/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.xml b/core/src/test/resources/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.xml index 2fa38a2189..10aa7f6c87 100644 --- a/core/src/test/resources/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.xml +++ b/core/src/test/resources/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd"> diff --git a/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml b/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml index d33b1a2380..53e4d6ecfa 100644 --- a/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml +++ b/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/articles/src/docbook/codebase-structure.xml b/docs/articles/src/docbook/codebase-structure.xml index 99b9ad0317..bd2e06999c 100644 --- a/docs/articles/src/docbook/codebase-structure.xml +++ b/docs/articles/src/docbook/codebase-structure.xml @@ -1,5 +1,5 @@ - +
@@ -44,7 +44,7 @@ Structure101 tool Structure101 is an excellent tool for analyzing your own code or for understanding someone else's. It is developed by Headway Software. + xlink:href="https://www.headwaysoftware.com">Headway Software. . You don't have to be an expert in code structure to realise that there is a bit of a problem here. There are a lot of circular references and no clear overall dependency structure within the packages. There are also some issues with packages being @@ -54,9 +54,9 @@ the topic where he shares some of the insights gained from maintaining the Spring Framework through multiple versions. You can find him discussing the topic in an online interview transcript and an InfoQ video. . This fragility in the code structure would likely have caused a maintenance overhead as Spring Security evolved, so the decision was made to restructure the code diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml index d614db912f..7ea49b17b9 100644 --- a/etc/checkstyle/checkstyle.xml +++ b/etc/checkstyle/checkstyle.xml @@ -1,6 +1,6 @@ + "https://www.puppycrawl.com/dtds/configuration_1_3.dtd"> diff --git a/etc/checkstyle/suppressions.xml b/etc/checkstyle/suppressions.xml index a7d3052a83..297f0624c9 100644 --- a/etc/checkstyle/suppressions.xml +++ b/etc/checkstyle/suppressions.xml @@ -1,6 +1,6 @@ + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml index eadd0dbaa3..7b6ac0c656 100644 --- a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml index 3c6225451c..2481baeeb9 100644 --- a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml +++ b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml index 123bfdb38d..4c014beeb1 100644 --- a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml +++ b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml index 959c1eeb82..5e3b6267da 100644 --- a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml +++ b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml @@ -5,9 +5,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml index cabc71b11b..14f1ee0f15 100644 --- a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/python-method-access-app-context.xml b/itest/context/src/integration-test/resources/python-method-access-app-context.xml index 69f003cd50..0216d71f3e 100644 --- a/itest/context/src/integration-test/resources/python-method-access-app-context.xml +++ b/itest/context/src/integration-test/resources/python-method-access-app-context.xml @@ -5,9 +5,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/sec-933-app-context.xml b/itest/context/src/integration-test/resources/sec-933-app-context.xml index ee5b77ca1c..09b1d2ba4a 100755 --- a/itest/context/src/integration-test/resources/sec-933-app-context.xml +++ b/itest/context/src/integration-test/resources/sec-933-app-context.xml @@ -4,10 +4,10 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/sec-936-app-context.xml b/itest/context/src/integration-test/resources/sec-936-app-context.xml index ec3e933021..e89f70e18a 100755 --- a/itest/context/src/integration-test/resources/sec-936-app-context.xml +++ b/itest/context/src/integration-test/resources/sec-936-app-context.xml @@ -3,9 +3,9 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/src/integration-test/resources/spring/http-security-basic.xml b/itest/web/src/integration-test/resources/spring/http-security-basic.xml index 3656a25bbb..fe92897aa2 100644 --- a/itest/web/src/integration-test/resources/spring/http-security-basic.xml +++ b/itest/web/src/integration-test/resources/spring/http-security-basic.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml b/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml index 48181b2f46..853b033ce3 100644 --- a/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml +++ b/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/src/integration-test/resources/spring/http-security.xml b/itest/web/src/integration-test/resources/spring/http-security.xml index 94789db78c..e5b2e475c1 100644 --- a/itest/web/src/integration-test/resources/spring/http-security.xml +++ b/itest/web/src/integration-test/resources/spring/http-security.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml index 994c28a647..f3f25bd504 100644 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml +++ b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml @@ -1,5 +1,5 @@ - + + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml index e31a96d0a0..7153f5058f 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml index 9ddb21a15e..573eef4dd7 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml @@ -1,9 +1,9 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd"> diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml index a907c44705..c123a5fef6 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ + xmlns:web="https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> contextConfigLocation diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml index 3ed7160a98..f006442e92 100644 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml +++ b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml index 68563b6eea..5e99e51420 100644 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> diff --git a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml index 0b01e67188..38f1ffc789 100644 --- a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Spring Security OpenID Demo Application diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml index b8ef229157..b9d5ed061d 100644 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -8,8 +8,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml index cd4173c21d..5bac977c9f 100644 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Spring Security Preauthentication Demo Application diff --git a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml index afddaeec37..cdaef7ea0f 100644 --- a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml +++ b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml index 9af635556d..c8962958fb 100644 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml +++ b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml @@ -4,9 +4,9 @@ xmlns:b="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml index af75e5fc0a..f9baaac4d9 100644 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@