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/14 17:41:08 UTC
cxf-fediz git commit: Updating all spring config files to spring 4
Repository: cxf-fediz
Updated Branches:
refs/heads/master 64431ac5b -> d8e2d494f
Updating all spring config files to spring 4
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d8e2d494
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d8e2d494
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d8e2d494
Branch: refs/heads/master
Commit: d8e2d494fb39f87282a0fabd14f0acc1939e1c01
Parents: 64431ac
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 14 17:40:57 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 14 17:40:57 2016 +0000
----------------------------------------------------------------------
.../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/entities-realma.xml | 2 +-
services/idp/src/main/resources/entities-realmb.xml | 2 +-
services/idp/src/main/resources/persistenceContext.xml | 2 +-
services/idp/src/test/resources/testContext.xml | 4 ++--
services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
services/oidc/src/main/webapp/WEB-INF/data-manager.xml | 2 +-
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 | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
.../oidcIdpWebapp/src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
systests/federation/samlsso/src/test/resources/cxf-service.xml | 2 +-
.../samlsso/src/test/resources/realma/entities-realma.xml | 2 +-
.../samlsso/src/test/resources/realmb/entities-realmb.xml | 2 +-
systests/federation/wsfed/src/test/resources/cxf-service.xml | 2 +-
.../wsfed/src/test/resources/realma/entities-realma.xml | 2 +-
.../wsfed/src/test/resources/realmb/entities-realmb.xml | 2 +-
systests/idp/src/test/resources/realma/entities-realma.xml | 2 +-
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 | 2 +-
systests/oidc/src/test/resources/oidc/data-manager.xml | 2 +-
systests/oidc/src/test/resources/realma/entities-realma.xml | 2 +-
systests/samlsso/src/test/resources/realma/entities-realma.xml | 2 +-
systests/tomcat7/src/test/resources/realma/entities-realma.xml | 2 +-
.../cxfWebapp/src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
.../src/main/webapp/WEB-INF/applicationContext-security.xml | 2 +-
46 files changed, 70 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 a29da25..9291dc6 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 b6e6f60..542ca38 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 d186992..9d78c0f 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-2.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<sec:http entry-point-ref="federationEntryPoint">
<sec:intercept-url pattern="/secure/fedservlet"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 31e5d2c..1d12046 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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/d8e2d494/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 ee7cbbe..d7345a9 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<!-- DIABLE in production as it might log confidential information about
the user -->
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 c86d48b..3db453b 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context.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/d8e2d494/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 2f88b36..49163c0 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 b4acaa1..e858e37 100644
--- a/services/idp/src/main/resources/entities-realma.xml
+++ b/services/idp/src/main/resources/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 2a879a5..e9ea521 100644
--- a/services/idp/src/main/resources/entities-realmb.xml
+++ b/services/idp/src/main/resources/entities-realmb.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 808d0d9..79d2cb7 100644
--- a/services/idp/src/main/resources/persistenceContext.xml
+++ b/services/idp/src/main/resources/persistenceContext.xml
@@ -25,7 +25,7 @@
xsi:schemaLocation="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-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context.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/d8e2d494/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 2927722..06d7e5a 100644
--- a/services/idp/src/test/resources/testContext.xml
+++ b/services/idp/src/test/resources/testContext.xml
@@ -25,9 +25,9 @@
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-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context.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/d8e2d494/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 eea9aa8..53970a9 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -26,7 +26,7 @@
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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd
http://www.springframework.org/schema/util
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 0fd539a..1a118b3 100644
--- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
@@ -22,7 +22,7 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ 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://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 6b7cb99..8003660 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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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/d8e2d494/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 9d341d9..4a9e66f 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 524a51e..ac1d19e 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 3ad9e7c..2e820e8 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<util:map id="REALMA">
<entry key="alice" value="ecila" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 c0b01a7..bc557e7 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 bb3ae49..13568f7 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<util:list id="claimHandlerList">
<ref bean="claimsHandlerA" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 34334e5..cc92772 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 c780c5c..9ece05f 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 57c5efc..57e052f 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 dece37e..668ea76 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 8966a60..8febe14 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
@@ -31,7 +31,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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-3.0.xsd">
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!--cxf:bus>
<cxf:features>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 7d277ae..279046d 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 7b09656..a1eb455 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
@@ -39,7 +39,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 7d277ae..279046d 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 7b09656..a1eb455 100644
--- a/systests/federation/samlsso/src/test/resources/cxf-service.xml
+++ b/systests/federation/samlsso/src/test/resources/cxf-service.xml
@@ -39,7 +39,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 99cf759..d4a9ff6 100644
--- a/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 ca7b53a..c228e69 100644
--- a/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/samlsso/src/test/resources/realmb/entities-realmb.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 7b09656..a1eb455 100644
--- a/systests/federation/wsfed/src/test/resources/cxf-service.xml
+++ b/systests/federation/wsfed/src/test/resources/cxf-service.xml
@@ -39,7 +39,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 935c5c9..1989c83 100644
--- a/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 ca7b53a..c228e69 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 379da9d..ec2b595 100644
--- a/systests/idp/src/test/resources/realma/entities-realma.xml
+++ b/systests/idp/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 be3fe02..7f2db1d 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 0fc304f..a567f67 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 47297df..adbaf9f 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 bf9bd1e..8c3f025 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 aff850f..23ddbf9 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 3120c5d..a4b66b9 100644
--- a/systests/oidc/src/test/resources/oidc/applicationContext.xml
+++ b/systests/oidc/src/test/resources/oidc/applicationContext.xml
@@ -28,7 +28,7 @@
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-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd
http://www.springframework.org/schema/util
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 3397962..c4c8e2a 100644
--- a/systests/oidc/src/test/resources/oidc/data-manager.xml
+++ b/systests/oidc/src/test/resources/oidc/data-manager.xml
@@ -22,7 +22,7 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ 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://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d8e2d494/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 20509a8..ff1c350 100644
--- a/systests/oidc/src/test/resources/realma/entities-realma.xml
+++ b/systests/oidc/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 9a5c2c0..f6ebf38 100644
--- a/systests/samlsso/src/test/resources/realma/entities-realma.xml
+++ b/systests/samlsso/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 379da9d..ec2b595 100644
--- a/systests/tomcat7/src/test/resources/realma/entities-realma.xml
+++ b/systests/tomcat7/src/test/resources/realma/entities-realma.xml
@@ -24,7 +24,7 @@
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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 7d277ae..279046d 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-2.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.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-2.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.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/d8e2d494/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 2871d19..0367903 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-2.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<sec:http entry-point-ref="federationEntryPoint">