You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/11/21 11:34:16 UTC

[1/2] cxf-fediz git commit: Fixing spring versioning

Repository: cxf-fediz
Updated Branches:
  refs/heads/master d8e2d494f -> fcdc6efce


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 2f5a518..9121045 100644
--- a/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/systests/webapps/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -24,9 +24,9 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
+http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <!-- DIABLE in production as it might log confidential information about the user -->
     <sec:debug />


[2/2] cxf-fediz git commit: Fixing spring versioning

Posted by co...@apache.org.
Fixing spring versioning


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/fcdc6efc
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/fcdc6efc
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/fcdc6efc

Branch: refs/heads/master
Commit: fcdc6efce4bc5ba6f6baae3ec6a24206ce65ec5b
Parents: d8e2d49
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 21 12:34:03 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 21 12:34:03 2016 +0100

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 6 +++---
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 6 +++---
 .../webapp/src/main/webapp/WEB-INF/applicationContext.xml      | 4 ++--
 .../service/src/main/webapp/WEB-INF/applicationContext.xml     | 4 ++--
 services/idp/src/main/resources/cxf-tls.xml                    | 4 ++--
 services/idp/src/main/resources/entities-realma.xml            | 4 ++--
 services/idp/src/main/resources/entities-realmb.xml            | 4 ++--
 services/idp/src/main/resources/persistenceContext.xml         | 4 ++--
 services/idp/src/main/resources/restContext.xml                | 4 ++--
 services/idp/src/main/webapp/WEB-INF/applicationContext.xml    | 4 ++--
 .../idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml    | 4 ++--
 .../main/webapp/WEB-INF/config/security-clientcert-config.xml  | 6 +++---
 .../idp/src/main/webapp/WEB-INF/config/security-krb-config.xml | 6 +++---
 .../idp/src/main/webapp/WEB-INF/config/security-rs-config.xml  | 6 +++---
 .../idp/src/main/webapp/WEB-INF/config/security-up-config.xml  | 6 +++---
 services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml     | 6 +++---
 services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml     | 6 +++---
 services/idp/src/main/webapp/WEB-INF/idp-servlet.xml           | 4 ++--
 services/idp/src/main/webapp/WEB-INF/security-config.xml       | 6 +++---
 services/idp/src/test/resources/idp-config.xml                 | 6 +++---
 services/idp/src/test/resources/rest-client.xml                | 2 +-
 services/idp/src/test/resources/testContext.xml                | 6 +++---
 services/oidc/src/main/webapp/WEB-INF/applicationContext.xml   | 4 ++--
 services/oidc/src/main/webapp/WEB-INF/data-manager.xml         | 4 ++--
 services/oidc/src/main/webapp/WEB-INF/entity-manager.xml       | 2 +-
 services/sts/src/main/webapp/WEB-INF/applicationContext.xml    | 4 ++--
 services/sts/src/main/webapp/WEB-INF/cxf-transport.xml         | 4 ++--
 services/sts/src/main/webapp/WEB-INF/data/passwords.xml        | 4 ++--
 services/sts/src/main/webapp/WEB-INF/data/realms.xml           | 4 ++--
 services/sts/src/main/webapp/WEB-INF/data/userClaims.xml       | 4 ++--
 services/sts/src/main/webapp/WEB-INF/endpoints/file.xml        | 4 ++--
 services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml    | 4 ++--
 services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml        | 4 ++--
 services/sts/src/main/webapp/WEB-INF/fediz-sts.xml             | 4 ++--
 .../resources/org/apache/cxf/fediz/sts/realms/sts-client.xml   | 4 ++--
 .../src/main/webapp/WEB-INF/applicationContext.xml             | 4 ++--
 .../oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml      | 4 ++--
 .../src/main/webapp/WEB-INF/applicationContext.xml             | 4 ++--
 .../samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml      | 2 +-
 .../samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml         | 2 +-
 systests/federation/samlsso/src/test/resources/cxf-service.xml | 4 ++--
 .../samlsso/src/test/resources/realma/entities-realma.xml      | 4 ++--
 .../samlsso/src/test/resources/realmb/entities-realmb.xml      | 4 ++--
 .../samlsso/src/test/resources/realmb/idp-servlet.xml          | 4 ++--
 .../samlsso/src/test/resources/realmb/security-config.xml      | 4 ++--
 .../federation/samlsso/src/test/resources/rp/cxf-service.xml   | 2 +-
 systests/federation/wsfed/src/test/resources/cxf-service.xml   | 4 ++--
 .../wsfed/src/test/resources/realma/entities-realma.xml        | 4 ++--
 .../wsfed/src/test/resources/realmb/entities-realmb.xml        | 4 ++--
 .../federation/wsfed/src/test/resources/realmb/idp-servlet.xml | 4 ++--
 .../wsfed/src/test/resources/realmb/security-config.xml        | 4 ++--
 systests/idp/src/test/resources/realma/entities-realma.xml     | 4 ++--
 systests/kerberos/src/test/resources/sts/cxf-transport.xml     | 4 ++--
 systests/kerberos/src/test/resources/sts/kerberos.xml          | 4 ++--
 .../kerberos/src/test/resources/sts/userClaimsKerberos.xml     | 4 ++--
 systests/ldap/src/test/resources/sts/cxf-transport.xml         | 4 ++--
 systests/ldap/src/test/resources/sts/ldap.xml                  | 4 ++--
 systests/oidc/src/test/resources/oidc/applicationContext.xml   | 4 ++--
 systests/oidc/src/test/resources/oidc/data-manager.xml         | 4 ++--
 systests/oidc/src/test/resources/realma/entities-realma.xml    | 4 ++--
 systests/samlsso/src/test/resources/realma/entities-realma.xml | 4 ++--
 systests/tomcat7/src/test/resources/realma/entities-realma.xml | 4 ++--
 .../cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml   | 4 ++--
 .../webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml  | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext-security.xml    | 6 +++---
 70 files changed, 141 insertions(+), 141 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/jaxrsCxfPluginWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/examples/jaxrsCxfPluginWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/jaxrsCxfPluginWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 9291dc6..a13622b 100644
--- a/examples/jaxrsCxfPluginWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/jaxrsCxfPluginWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -22,7 +22,7 @@
     xmlns:jaxrs="http://cxf.apache.org/jaxrs" 
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 542ca38..9a3fa95 100644
--- a/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -28,11 +28,11 @@
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 9d78c0f..94b0c6a 100644
--- a/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -25,7 +25,7 @@
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-2.0.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
 
     <sec:http entry-point-ref="federationEntryPoint">
         <sec:intercept-url pattern="/secure/fedservlet"

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 1d12046..3f5a3b8 100644
--- a/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -22,7 +22,7 @@
     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
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index d7345a9..56c2ccd 100644
--- a/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -27,11 +27,11 @@
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <!-- DIABLE in production as it might log confidential information about 
         the user -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml b/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 3db453b..c10b842 100644
--- a/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,9 +28,9 @@
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml b/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
index 49163c0..d6f56d3 100644
--- a/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
@@ -25,11 +25,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/resources/cxf-tls.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/cxf-tls.xml b/services/idp/src/main/resources/cxf-tls.xml
index 3140089..c2f21a2 100644
--- a/services/idp/src/main/resources/cxf-tls.xml
+++ b/services/idp/src/main/resources/cxf-tls.xml
@@ -26,11 +26,11 @@
        xsi:schemaLocation="http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://cxf.apache.org/configuration/security
         http://cxf.apache.org/schemas/configuration/security.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/resources/entities-realma.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/entities-realma.xml b/services/idp/src/main/resources/entities-realma.xml
index e858e37..61cfa0d 100644
--- a/services/idp/src/main/resources/entities-realma.xml
+++ b/services/idp/src/main/resources/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/resources/entities-realmb.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/entities-realmb.xml b/services/idp/src/main/resources/entities-realmb.xml
index e9ea521..02cd3ca 100644
--- a/services/idp/src/main/resources/entities-realmb.xml
+++ b/services/idp/src/main/resources/entities-realmb.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmB" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/resources/persistenceContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/persistenceContext.xml b/services/idp/src/main/resources/persistenceContext.xml
index 79d2cb7..f0b3586 100644
--- a/services/idp/src/main/resources/persistenceContext.xml
+++ b/services/idp/src/main/resources/persistenceContext.xml
@@ -23,9 +23,9 @@
        xmlns:jdbc="http://www.springframework.org/schema/jdbc"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
     http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context.xsd
+    http://www.springframework.org/schema/context/spring-context-4.3.xsd
     http://www.springframework.org/schema/tx
     http://www.springframework.org/schema/tx/spring-tx.xsd
     http://www.springframework.org/schema/jdbc

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 646a043..6245c51 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -22,9 +22,9 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
index e173e8c..68bcb0b 100644
--- a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -24,9 +24,9 @@
        xsi:schemaLocation="http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />
         

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
index 997eba3..4debb30 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml
@@ -24,9 +24,9 @@
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
         http://www.springframework.org/schema/webflow-config

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
index 376e38e..d40d0c9 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
@@ -24,13 +24,13 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
index b2b500f..b66044b 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
@@ -24,13 +24,13 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
index 2ce2033..aa859b5 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-rs-config.xml
@@ -24,13 +24,13 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
index 97791ca..2ba5f86 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
@@ -24,13 +24,13 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <!-- DISABLE in production as it might log confidential information about the user -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
index 94a981a..8e66b57 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
@@ -23,11 +23,11 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <context:property-placeholder location="classpath:realm.properties" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
index 04e52bf..9494587 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
@@ -23,11 +23,11 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <context:property-placeholder location="classpath:realm.properties" />
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
index 9c5444a..eebda37 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
@@ -22,9 +22,9 @@
     xmlns:webflow="http://www.springframework.org/schema/webflow-config"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="config/idp-core-servlet.xml" />
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/main/webapp/WEB-INF/security-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml b/services/idp/src/main/webapp/WEB-INF/security-config.xml
index 9a09c14..b25b903 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml
@@ -24,13 +24,13 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
 
     <context:property-placeholder location="classpath:realm.properties" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/test/resources/idp-config.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/test/resources/idp-config.xml b/services/idp/src/test/resources/idp-config.xml
index 42d0b2a..61d0bbd 100644
--- a/services/idp/src/test/resources/idp-config.xml
+++ b/services/idp/src/test/resources/idp-config.xml
@@ -23,11 +23,11 @@
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/test/resources/rest-client.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/test/resources/rest-client.xml b/services/idp/src/test/resources/rest-client.xml
index fdd9702..a52f114 100644
--- a/services/idp/src/test/resources/rest-client.xml
+++ b/services/idp/src/test/resources/rest-client.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd         ">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans-4.3.xsd         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd         ">
     <!-- -->
     <!-- HTTP/S configuration for web clients -->
     <!-- -->

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/idp/src/test/resources/testContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/test/resources/testContext.xml b/services/idp/src/test/resources/testContext.xml
index 06d7e5a..bd015f0 100644
--- a/services/idp/src/test/resources/testContext.xml
+++ b/services/idp/src/test/resources/testContext.xml
@@ -23,11 +23,11 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <context:component-scan base-package="org.apache.cxf.fediz.service.idp.service" />
     <context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 53970a9..97b27a8 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -26,11 +26,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
 		http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd
         http://www.springframework.org/schema/util 
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
 	<cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
index 1a118b3..0403243 100644
--- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util 
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
     
     <bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml b/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
index 8003660..9ddda02 100644
--- a/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
@@ -22,7 +22,7 @@
     xmlns:p="http://www.springframework.org/schema/p"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         ">
     <bean id="openJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"/>
     <bean id="dataSource"

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/applicationContext.xml b/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
index 4a9e66f..c1f2997 100644
--- a/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,11 +28,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>   
     <import resource="cxf-transport.xml"/>  

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
index ac1d19e..4781f2a 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -29,11 +29,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/data/passwords.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/data/passwords.xml b/services/sts/src/main/webapp/WEB-INF/data/passwords.xml
index 2e820e8..a8a9ca0 100644
--- a/services/sts/src/main/webapp/WEB-INF/data/passwords.xml
+++ b/services/sts/src/main/webapp/WEB-INF/data/passwords.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <util:map id="REALMA">
         <entry key="alice" value="ecila" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/data/realms.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/data/realms.xml b/services/sts/src/main/webapp/WEB-INF/data/realms.xml
index bc557e7..54e49c1 100644
--- a/services/sts/src/main/webapp/WEB-INF/data/realms.xml
+++ b/services/sts/src/main/webapp/WEB-INF/data/realms.xml
@@ -29,11 +29,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/data/userClaims.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/data/userClaims.xml b/services/sts/src/main/webapp/WEB-INF/data/userClaims.xml
index 13568f7..965ce3a 100644
--- a/services/sts/src/main/webapp/WEB-INF/data/userClaims.xml
+++ b/services/sts/src/main/webapp/WEB-INF/data/userClaims.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
         
     <util:list id="claimHandlerList">
         <ref bean="claimsHandlerA" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/endpoints/file.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/endpoints/file.xml b/services/sts/src/main/webapp/WEB-INF/endpoints/file.xml
index cc92772..593f565 100644
--- a/services/sts/src/main/webapp/WEB-INF/endpoints/file.xml
+++ b/services/sts/src/main/webapp/WEB-INF/endpoints/file.xml
@@ -23,9 +23,9 @@
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml b/services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml
index 9ece05f..1171675 100644
--- a/services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml
+++ b/services/sts/src/main/webapp/WEB-INF/endpoints/kerberos.xml
@@ -23,9 +23,9 @@
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml b/services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml
index 57e052f..285f51d 100644
--- a/services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml
+++ b/services/sts/src/main/webapp/WEB-INF/endpoints/ldap.xml
@@ -23,9 +23,9 @@
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
index 668ea76..fe8ba7d 100644
--- a/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
+++ b/services/sts/src/main/webapp/WEB-INF/fediz-sts.xml
@@ -25,9 +25,9 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
     

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/services/sts/src/test/resources/org/apache/cxf/fediz/sts/realms/sts-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/test/resources/org/apache/cxf/fediz/sts/realms/sts-client.xml b/services/sts/src/test/resources/org/apache/cxf/fediz/sts/realms/sts-client.xml
index 8febe14..82fd8e8 100644
--- a/services/sts/src/test/resources/org/apache/cxf/fediz/sts/realms/sts-client.xml
+++ b/services/sts/src/test/resources/org/apache/cxf/fediz/sts/realms/sts-client.xml
@@ -28,10 +28,10 @@
 	xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
 		http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
 		http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 		http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
  
     <!--cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
index 279046d..ce7d570 100644
--- a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,11 +28,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>   
     <import resource="cxf-service.xml"/>  

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index a1eb455..a03d3fa 100644
--- a/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/federation/oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -37,9 +37,9 @@
             http://cxf.apache.org/transports/http/configuration
             http://cxf.apache.org/schemas/configuration/http-conf.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
             http://www.springframework.org/schema/util         
-            http://www.springframework.org/schema/util/spring-util.xsd">
+            http://www.springframework.org/schema/util/spring-util-4.3.xsd">
    
    <import resource="classpath:META-INF/cxf/cxf.xml" />
    

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml b/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
index 279046d..ce7d570 100644
--- a/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,11 +28,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>   
     <import resource="cxf-service.xml"/>  

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml b/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index 4be595a..bc0c8f7 100644
--- a/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/federation/samlIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -36,7 +36,7 @@
             http://cxf.apache.org/transports/http/configuration
             http://cxf.apache.org/schemas/configuration/http-conf.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd">
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
    
    <import resource="classpath:META-INF/cxf/cxf.xml" />
    

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml b/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index 58d6278..ec56f26 100644
--- a/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -38,7 +38,7 @@
             http://cxf.apache.org/transports/http-jetty/configuration
             http://cxf.apache.org/schemas/configuration/http-jetty.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd">
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
    
 
    <import resource="classpath:META-INF/cxf/cxf.xml" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/cxf-service.xml b/systests/federation/samlsso/src/test/resources/cxf-service.xml
index a1eb455..a03d3fa 100644
--- a/systests/federation/samlsso/src/test/resources/cxf-service.xml
+++ b/systests/federation/samlsso/src/test/resources/cxf-service.xml
@@ -37,9 +37,9 @@
             http://cxf.apache.org/transports/http/configuration
             http://cxf.apache.org/schemas/configuration/http-conf.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
             http://www.springframework.org/schema/util         
-            http://www.springframework.org/schema/util/spring-util.xsd">
+            http://www.springframework.org/schema/util/spring-util-4.3.xsd">
    
    <import resource="classpath:META-INF/cxf/cxf.xml" />
    

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml b/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
index d4a9ff6..188f7a0 100644
--- a/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml b/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
index c228e69..04cfbf3 100644
--- a/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmB" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/realmb/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/realmb/idp-servlet.xml b/systests/federation/samlsso/src/test/resources/realmb/idp-servlet.xml
index 67dc6a1..c556808 100644
--- a/systests/federation/samlsso/src/test/resources/realmb/idp-servlet.xml
+++ b/systests/federation/samlsso/src/test/resources/realmb/idp-servlet.xml
@@ -22,9 +22,9 @@
     xmlns:webflow="http://www.springframework.org/schema/webflow-config"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="config/idp-core-servlet.xml" />
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
index 7691dbd..5c2b429 100644
--- a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
@@ -23,9 +23,9 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         ">

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml b/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
index 58d6278..ec56f26 100644
--- a/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
+++ b/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
@@ -38,7 +38,7 @@
             http://cxf.apache.org/transports/http-jetty/configuration
             http://cxf.apache.org/schemas/configuration/http-jetty.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd">
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
    
 
    <import resource="classpath:META-INF/cxf/cxf.xml" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/wsfed/src/test/resources/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/cxf-service.xml b/systests/federation/wsfed/src/test/resources/cxf-service.xml
index a1eb455..a03d3fa 100644
--- a/systests/federation/wsfed/src/test/resources/cxf-service.xml
+++ b/systests/federation/wsfed/src/test/resources/cxf-service.xml
@@ -37,9 +37,9 @@
             http://cxf.apache.org/transports/http/configuration
             http://cxf.apache.org/schemas/configuration/http-conf.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
             http://www.springframework.org/schema/util         
-            http://www.springframework.org/schema/util/spring-util.xsd">
+            http://www.springframework.org/schema/util/spring-util-4.3.xsd">
    
    <import resource="classpath:META-INF/cxf/cxf.xml" />
    

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml b/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
index 1989c83..24dc488 100644
--- a/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml b/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
index c228e69..04cfbf3 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmB" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
index 67dc6a1..c556808 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
@@ -22,9 +22,9 @@
     xmlns:webflow="http://www.springframework.org/schema/webflow-config"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
     <import resource="config/idp-core-servlet.xml" />
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
index 7691dbd..5c2b429 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
@@ -23,9 +23,9 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/context/spring-context-4.3.xsd
         http://www.springframework.org/schema/security
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
         ">

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/idp/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/idp/src/test/resources/realma/entities-realma.xml b/systests/idp/src/test/resources/realma/entities-realma.xml
index ec2b595..88f2b93 100644
--- a/systests/idp/src/test/resources/realma/entities-realma.xml
+++ b/systests/idp/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/kerberos/src/test/resources/sts/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/sts/cxf-transport.xml b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
index 7f2db1d..851a93d 100644
--- a/systests/kerberos/src/test/resources/sts/cxf-transport.xml
+++ b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
@@ -29,11 +29,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/kerberos/src/test/resources/sts/kerberos.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/sts/kerberos.xml b/systests/kerberos/src/test/resources/sts/kerberos.xml
index a567f67..8aab500 100644
--- a/systests/kerberos/src/test/resources/sts/kerberos.xml
+++ b/systests/kerberos/src/test/resources/sts/kerberos.xml
@@ -23,9 +23,9 @@
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml b/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml
index adbaf9f..9500f4e 100644
--- a/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml
+++ b/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <util:map id="userClaimsREALMA">
         <entry key="alice@service.ws.apache.org" value-ref="REALMA_aliceClaims" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/ldap/src/test/resources/sts/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/systests/ldap/src/test/resources/sts/cxf-transport.xml b/systests/ldap/src/test/resources/sts/cxf-transport.xml
index 8c3f025..532482d 100644
--- a/systests/ldap/src/test/resources/sts/cxf-transport.xml
+++ b/systests/ldap/src/test/resources/sts/cxf-transport.xml
@@ -29,11 +29,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/ldap/src/test/resources/sts/ldap.xml
----------------------------------------------------------------------
diff --git a/systests/ldap/src/test/resources/sts/ldap.xml b/systests/ldap/src/test/resources/sts/ldap.xml
index 23ddbf9..46501a7 100644
--- a/systests/ldap/src/test/resources/sts/ldap.xml
+++ b/systests/ldap/src/test/resources/sts/ldap.xml
@@ -23,9 +23,9 @@
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/oidc/src/test/resources/oidc/applicationContext.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/resources/oidc/applicationContext.xml b/systests/oidc/src/test/resources/oidc/applicationContext.xml
index a4b66b9..0313640 100644
--- a/systests/oidc/src/test/resources/oidc/applicationContext.xml
+++ b/systests/oidc/src/test/resources/oidc/applicationContext.xml
@@ -28,11 +28,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
 		http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd
         http://www.springframework.org/schema/util 
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         http://cxf.apache.org/transports/http/configuration
         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/configuration/security

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/oidc/src/test/resources/oidc/data-manager.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/resources/oidc/data-manager.xml b/systests/oidc/src/test/resources/oidc/data-manager.xml
index c4c8e2a..cd6593d 100644
--- a/systests/oidc/src/test/resources/oidc/data-manager.xml
+++ b/systests/oidc/src/test/resources/oidc/data-manager.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util 
-        http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd
         ">
     
     <bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/oidc/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/resources/realma/entities-realma.xml b/systests/oidc/src/test/resources/realma/entities-realma.xml
index ff1c350..0af49c2 100644
--- a/systests/oidc/src/test/resources/realma/entities-realma.xml
+++ b/systests/oidc/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/samlsso/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/samlsso/src/test/resources/realma/entities-realma.xml b/systests/samlsso/src/test/resources/realma/entities-realma.xml
index f6ebf38..2948e39 100644
--- a/systests/samlsso/src/test/resources/realma/entities-realma.xml
+++ b/systests/samlsso/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/tomcat7/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/tomcat7/src/test/resources/realma/entities-realma.xml b/systests/tomcat7/src/test/resources/realma/entities-realma.xml
index ec2b595..88f2b93 100644
--- a/systests/tomcat7/src/test/resources/realma/entities-realma.xml
+++ b/systests/tomcat7/src/test/resources/realma/entities-realma.xml
@@ -22,9 +22,9 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
 
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
index 279046d..ce7d570 100644
--- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,11 +28,11 @@
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+        http://www.springframework.org/schema/util/spring-util-4.3.xsd">
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>   
     <import resource="cxf-service.xml"/>  

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index 036ba24..8682111 100644
--- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -36,7 +36,7 @@
             http://cxf.apache.org/transports/http/configuration
             http://cxf.apache.org/schemas/configuration/http-conf.xsd
             http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd">
+            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
    
    <import resource="classpath:META-INF/cxf/cxf.xml" />
    

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 0367903..66c133c 100644
--- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -22,7 +22,7 @@
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
 
 
     <sec:http entry-point-ref="federationEntryPoint">

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fcdc6efc/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index ee5df2a..1b04079 100644
--- a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -25,7 +25,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:sec="http://www.springframework.org/schema/security"
     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 http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
                         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
     <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">