You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2021/11/25 15:26:19 UTC
[cxf-fediz] branch master updated (992ec0e -> 630f0b3)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
from 992ec0e Updating Tomcat and Spring
new 11d9964 fediz-systests-samlsso: minor
new 630f0b3 update spring security to 5.6.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../webapp/WEB-INF/applicationContext-security.xml | 2 +-
.../webapp/WEB-INF/applicationContext-security.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
pom.xml | 2 +-
.../src/test/resources/entities-realma.xml | 4 +-
.../idp-core/src/test/resources/idp-config.xml | 6 +-
.../src/test/resources/persistenceContext.xml | 4 +-
.../idp-core/src/test/resources/testContext.xml | 6 +-
services/idp/src/main/resources/cxf-tls.xml | 2 +-
.../idp/src/main/resources/entities-realma.xml | 4 +-
.../idp/src/main/resources/entities-realmb.xml | 4 +-
.../idp/src/main/resources/persistenceContext.xml | 4 +-
services/idp/src/main/resources/restContext.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../webapp/WEB-INF/config/idp-core-servlet.xml | 6 +-
.../WEB-INF/config/security-clientcert-config.xml | 4 +-
.../webapp/WEB-INF/config/security-krb-config.xml | 2 +-
.../webapp/WEB-INF/config/security-rs-config.xml | 2 +-
.../webapp/WEB-INF/config/security-up-config.xml | 2 +-
.../src/main/webapp/WEB-INF/idp-config-realma.xml | 6 +-
.../src/main/webapp/WEB-INF/idp-config-realmb.xml | 6 +-
.../idp/src/main/webapp/WEB-INF/idp-servlet.xml | 4 +-
.../src/main/webapp/WEB-INF/security-config.xml | 4 +-
services/idp/src/test/resources/rest-client.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../oidc/src/main/webapp/WEB-INF/data-manager.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 +-
.../sts/src/main/webapp/WEB-INF/data/passwords.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/data/realms.xml | 4 +-
.../src/main/webapp/WEB-INF/data/userClaims.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/endpoints/file.xml | 4 +-
.../src/main/webapp/WEB-INF/endpoints/kerberos.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/endpoints/ldap.xml | 4 +-
services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 +-
.../org/apache/cxf/fediz/sts/realms/sts-client.xml | 4 +-
systests/custom/src/test/resources/file.xml | 4 +-
.../src/test/resources/realma/idp-servlet.xml | 4 +-
.../test/resources/realma/security-up-config.xml | 6 +-
systests/custom/src/test/resources/userClaims.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../cxf/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../samlsso/src/test/resources/cxf-service.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../samlsso/src/test/resources/rp/cxf-service.xml | 2 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../src/test/resources/sts/realms.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../jetty9/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/test/resources/sts/cxf-transport.xml | 4 +-
.../kerberos/src/test/resources/sts/kerberos.xml | 4 +-
.../src/test/resources/sts/userClaimsKerberos.xml | 4 +-
.../ldap/src/test/resources/sts/cxf-transport.xml | 4 +-
systests/ldap/src/test/resources/sts/ldap.xml | 4 +-
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 69 +++++++++++++++++++++-
.../src/test/resources/oidc/applicationContext.xml | 4 +-
.../oidc/src/test/resources/oidc/data-manager.xml | 4 +-
.../resources/oidc/spring/applicationContext.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../fediz/systests/samlsso/TomcatPluginTest.java | 65 +++++++++-----------
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../spring/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../tomcat/src/test/resources/realma/fediz-sts.xml | 4 +-
82 files changed, 249 insertions(+), 191 deletions(-)
[cxf-fediz] 01/02: fediz-systests-samlsso: minor
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 11d9964b26138ca482594ea8a71b2001f9cc9782
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Nov 25 17:58:36 2021 +0300
fediz-systests-samlsso: minor
---
.../fediz/systests/samlsso/TomcatPluginTest.java | 65 ++++++++++------------
1 file changed, 29 insertions(+), 36 deletions(-)
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
index 8045e50..43264e5 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/TomcatPluginTest.java
@@ -20,13 +20,13 @@
package org.apache.cxf.fediz.systests.samlsso;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
-
-import javax.servlet.ServletException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -57,6 +57,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+
/**
* Some tests for SAML SSO with the Tomcat plugin, invoking on the Fediz IdP configured for SAML SSO.
*/
@@ -70,26 +71,16 @@ public class TomcatPluginTest extends AbstractTests {
@BeforeClass
public static void init() throws Exception {
- Assert.assertNotNull("Property 'idp.https.port' null", IDP_HTTPS_PORT);
- Assert.assertNotNull("Property 'rp.https.port' null", RP_HTTPS_PORT);
-
- idpServer = startServer(true, IDP_HTTPS_PORT);
- rpServer = startServer(false, RP_HTTPS_PORT);
+ idpServer = startServer(true, Objects.requireNonNull(IDP_HTTPS_PORT, "Property 'idp.https.port' null"));
+ rpServer = startServer(false, Objects.requireNonNull(RP_HTTPS_PORT, "Property 'rp.https.port' null"));
}
- private static Tomcat startServer(boolean idp, String port)
- throws ServletException, LifecycleException, IOException {
- Tomcat server = new Tomcat();
+ private static Tomcat startServer(boolean idp, String port) throws LifecycleException, IOException {
+ final Tomcat server = new Tomcat();
server.setPort(0);
- String currentDir = new File(".").getCanonicalPath();
- String baseDir = currentDir + File.separator + "target";
- server.setBaseDir(baseDir);
+ final Path targetDir = Paths.get("target").toAbsolutePath();
+ server.setBaseDir(targetDir.toString());
- if (idp) {
- server.getHost().setAppBase("tomcat/idp/webapps");
- } else {
- server.getHost().setAppBase("tomcat/rp/webapps");
- }
server.getHost().setAutoDeploy(true);
server.getHost().setDeployOnStartup(true);
@@ -110,30 +101,32 @@ public class TomcatPluginTest extends AbstractTests {
server.getService().addConnector(httpsConnector);
if (idp) {
- File stsWebapp = new File(baseDir + File.separator + server.getHost().getAppBase(), "fediz-idp-sts");
- server.addWebapp("/fediz-idp-sts", stsWebapp.getAbsolutePath());
+ server.getHost().setAppBase("tomcat/idp/webapps");
- File idpWebapp = new File(baseDir + File.separator + server.getHost().getAppBase(), "fediz-idp");
- server.addWebapp("/fediz-idp", idpWebapp.getAbsolutePath());
+ Path stsWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp-sts");
+ server.addWebapp("/fediz-idp-sts", stsWebapp.toString());
+
+ Path idpWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("fediz-idp");
+ server.addWebapp("/fediz-idp", idpWebapp.toString());
} else {
- File rpWebapp = new File(baseDir + File.separator + server.getHost().getAppBase(), "simpleWebapp");
- Context cxt = server.addWebapp("/fedizhelloworld", rpWebapp.getAbsolutePath());
+ server.getHost().setAppBase("tomcat/rp/webapps");
+
+ Path rpWebapp = targetDir.resolve(server.getHost().getAppBase()).resolve("simpleWebapp");
+ Context ctx = server.addWebapp("/fedizhelloworld", rpWebapp.toString());
// Substitute the IDP port. Necessary if running the test in eclipse where port filtering doesn't seem
// to work
- File f = new File(currentDir + "/src/test/resources/fediz_config.xml");
- String content = new String(Files.readAllBytes(f.toPath()), "UTF-8");
- if (content.contains("idp.https.port")) {
- content = content.replaceAll("\\$\\{idp.https.port\\}", IDP_HTTPS_PORT);
-
- File f2 = new File(baseDir + "/test-classes/fediz_config.xml");
- Files.write(f2.toPath(), content.getBytes());
+ Path fedizConfig = targetDir.resolve("tomcat").resolve("fediz_config.xml");
+ try (InputStream is = TomcatPluginTest.class.getResourceAsStream("/fediz_config.xml")) {
+ byte[] content = new byte[is.available()];
+ is.read(content);
+ Files.write(fedizConfig,
+ new String(content).replace("${idp.https.port}", IDP_HTTPS_PORT).getBytes());
}
FederationAuthenticator fa = new FederationAuthenticator();
- fa.setConfigFile(currentDir + File.separator + "target" + File.separator
- + "test-classes" + File.separator + "fediz_config.xml");
- cxt.getPipeline().addValve(fa);
+ fa.setConfigFile(fedizConfig.toString());
+ ctx.getPipeline().addValve(fa);
}
server.start();
@@ -252,7 +245,7 @@ public class TomcatPluginTest extends AbstractTests {
webClient.close();
}
-
+
@Test
public void testAliceModifiedContext() throws Exception {
[cxf-fediz] 02/02: update spring security to 5.6.0
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 630f0b34bddea09a97c7bfc2a7d851ea464300d1
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Nov 25 18:09:57 2021 +0300
update spring security to 5.6.0
---
.../webapp/WEB-INF/applicationContext-security.xml | 2 +-
.../webapp/WEB-INF/applicationContext-security.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
pom.xml | 2 +-
.../src/test/resources/entities-realma.xml | 4 +-
.../idp-core/src/test/resources/idp-config.xml | 6 +-
.../src/test/resources/persistenceContext.xml | 4 +-
.../idp-core/src/test/resources/testContext.xml | 6 +-
services/idp/src/main/resources/cxf-tls.xml | 2 +-
.../idp/src/main/resources/entities-realma.xml | 4 +-
.../idp/src/main/resources/entities-realmb.xml | 4 +-
.../idp/src/main/resources/persistenceContext.xml | 4 +-
services/idp/src/main/resources/restContext.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../webapp/WEB-INF/config/idp-core-servlet.xml | 6 +-
.../WEB-INF/config/security-clientcert-config.xml | 4 +-
.../webapp/WEB-INF/config/security-krb-config.xml | 2 +-
.../webapp/WEB-INF/config/security-rs-config.xml | 2 +-
.../webapp/WEB-INF/config/security-up-config.xml | 2 +-
.../src/main/webapp/WEB-INF/idp-config-realma.xml | 6 +-
.../src/main/webapp/WEB-INF/idp-config-realmb.xml | 6 +-
.../idp/src/main/webapp/WEB-INF/idp-servlet.xml | 4 +-
.../src/main/webapp/WEB-INF/security-config.xml | 4 +-
services/idp/src/test/resources/rest-client.xml | 2 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../oidc/src/main/webapp/WEB-INF/data-manager.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 +-
.../sts/src/main/webapp/WEB-INF/data/passwords.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/data/realms.xml | 4 +-
.../src/main/webapp/WEB-INF/data/userClaims.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/endpoints/file.xml | 4 +-
.../src/main/webapp/WEB-INF/endpoints/kerberos.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/endpoints/ldap.xml | 4 +-
services/sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 +-
.../org/apache/cxf/fediz/sts/realms/sts-client.xml | 4 +-
systests/custom/src/test/resources/file.xml | 4 +-
.../src/test/resources/realma/idp-servlet.xml | 4 +-
.../test/resources/realma/security-up-config.xml | 6 +-
systests/custom/src/test/resources/userClaims.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../cxf/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 4 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
.../samlsso/src/test/resources/cxf-service.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../samlsso/src/test/resources/rp/cxf-service.xml | 2 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../src/test/resources/sts/realms.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realmb/entities-realmb.xml | 4 +-
.../src/test/resources/realmb/idp-servlet.xml | 4 +-
.../src/test/resources/realmb/security-config.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../jetty9/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/test/resources/sts/cxf-transport.xml | 4 +-
.../kerberos/src/test/resources/sts/kerberos.xml | 4 +-
.../src/test/resources/sts/userClaimsKerberos.xml | 4 +-
.../ldap/src/test/resources/sts/cxf-transport.xml | 4 +-
systests/ldap/src/test/resources/sts/ldap.xml | 4 +-
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 69 +++++++++++++++++++++-
.../src/test/resources/oidc/applicationContext.xml | 4 +-
.../oidc/src/test/resources/oidc/data-manager.xml | 4 +-
.../resources/oidc/spring/applicationContext.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../spring/src/test/resources/realma/fediz-sts.xml | 4 +-
.../src/test/resources/realma/entities-realma.xml | 4 +-
.../tomcat/src/test/resources/realma/fediz-sts.xml | 4 +-
81 files changed, 220 insertions(+), 155 deletions(-)
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 a13622b..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
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 407520f..e52f7c1 100644
--- a/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/examples/jaxrsSpringSecurityWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
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 c10b842..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.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
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 d6f56d3..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-4.3.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-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/pom.xml b/pom.xml
index 6ded37c..a76ed87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<slf4j.version>1.7.30</slf4j.version>
<spring.version>5.3.13</spring.version>
<spring-ldap-core.version>2.3.4.RELEASE</spring-ldap-core.version>
- <spring.security.version>5.5.3</spring.security.version>
+ <spring.security.version>5.6.0</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
<tomcat.version>9.0.55</tomcat.version>
<validation-api.version>2.0.2</validation-api.version>
diff --git a/services/idp-core/src/test/resources/entities-realma.xml b/services/idp-core/src/test/resources/entities-realma.xml
index 61cfa0d..e858e37 100644
--- a/services/idp-core/src/test/resources/entities-realma.xml
+++ b/services/idp-core/src/test/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/services/idp-core/src/test/resources/idp-config.xml b/services/idp-core/src/test/resources/idp-config.xml
index 61d0bbd..42d0b2a 100644
--- a/services/idp-core/src/test/resources/idp-config.xml
+++ b/services/idp-core/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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">
diff --git a/services/idp-core/src/test/resources/persistenceContext.xml b/services/idp-core/src/test/resources/persistenceContext.xml
index 72b43fa..5d72359 100644
--- a/services/idp-core/src/test/resources/persistenceContext.xml
+++ b/services/idp-core/src/test/resources/persistenceContext.xml
@@ -22,9 +22,9 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.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"
default-autowire="byName">
diff --git a/services/idp-core/src/test/resources/testContext.xml b/services/idp-core/src/test/resources/testContext.xml
index bd015f0..06d7e5a 100644
--- a/services/idp-core/src/test/resources/testContext.xml
+++ b/services/idp-core/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.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" />
diff --git a/services/idp/src/main/resources/cxf-tls.xml b/services/idp/src/main/resources/cxf-tls.xml
index c11c04b..2bc64b5 100644
--- a/services/idp/src/main/resources/cxf-tls.xml
+++ b/services/idp/src/main/resources/cxf-tls.xml
@@ -25,7 +25,7 @@
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-4.3.xsd
+ 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/configuration/security
diff --git a/services/idp/src/main/resources/entities-realma.xml b/services/idp/src/main/resources/entities-realma.xml
index a2a2aea..8eb955b 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/services/idp/src/main/resources/entities-realmb.xml b/services/idp/src/main/resources/entities-realmb.xml
index 68fb3e8..8476867 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/services/idp/src/main/resources/persistenceContext.xml b/services/idp/src/main/resources/persistenceContext.xml
index 72b43fa..5d72359 100644
--- a/services/idp/src/main/resources/persistenceContext.xml
+++ b/services/idp/src/main/resources/persistenceContext.xml
@@ -22,9 +22,9 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.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"
default-autowire="byName">
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index e33094f..31de530 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
diff --git a/services/idp/src/main/webapp/WEB-INF/applicationContext.xml b/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
index 68bcb0b..e173e8c 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.apache.cxf.fediz.service.idp.protocols" />
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 253e1e0..c455f8e 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,11 +24,11 @@
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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc
- http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
+ http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/webflow-config
http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
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 5167004..c9b547f 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
@@ -23,11 +23,11 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.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://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
">
<!-- DISABLE in production as it might log confidential information about the user -->
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 df797c0..2a3814c 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
@@ -22,7 +22,7 @@
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.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
">
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 b691ae1..e30c182 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
@@ -22,7 +22,7 @@
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.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
">
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 7e4b769..dd608bb 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
@@ -22,7 +22,7 @@
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.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
">
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 8e66b57..94a981a 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
">
<context:property-placeholder location="classpath:realm.properties" />
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 9494587..04e52bf 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<context:property-placeholder location="classpath:realm.properties" />
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 e7c24ee..f887b93 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
@@ -21,9 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="config/idp-core-servlet.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 fb66646..5135d89 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
">
diff --git a/services/idp/src/test/resources/rest-client.xml b/services/idp/src/test/resources/rest-client.xml
index 4e2dd72..fc58f2d 100644
--- a/services/idp/src/test/resources/rest-client.xml
+++ b/services/idp/src/test/resources/rest-client.xml
@@ -23,7 +23,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-4.3.xsd
+ 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/configuration/security
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index b2ee2fe..b98e34e 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-4.3.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://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<cxf:bus>
<cxf:features>
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 7fd7d49..6557a97 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
">
<bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/>
diff --git a/services/sts/src/main/webapp/WEB-INF/applicationContext.xml b/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
index 27f27bb..28c9ed9 100644
--- a/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
@@ -25,7 +25,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-4.3.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="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 877fb5f..ab23966 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -25,7 +25,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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
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 a8a9ca0..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<util:map id="REALMA">
<entry key="alice" value="ecila" />
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 c6c82cd..1001783 100644
--- a/services/sts/src/main/webapp/WEB-INF/data/realms.xml
+++ b/services/sts/src/main/webapp/WEB-INF/data/realms.xml
@@ -22,9 +22,9 @@
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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<bean id="identityMapper"
class="org.apache.cxf.fediz.service.sts.realms.IdentityMapperImpl" />
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 965ce3a..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<util:list id="claimHandlerList">
<ref bean="claimsHandlerA" />
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 593f565..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
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 1171675..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
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 285f51d..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
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 2ab33d2..88fe2e4 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.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 82fd8e8..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
@@ -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-4.3.xsd
+ 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-4.3.xsd">
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!--cxf:bus>
<cxf:features>
diff --git a/systests/custom/src/test/resources/file.xml b/systests/custom/src/test/resources/file.xml
index d532aee..6c22b63 100644
--- a/systests/custom/src/test/resources/file.xml
+++ b/systests/custom/src/test/resources/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
diff --git a/systests/custom/src/test/resources/realma/idp-servlet.xml b/systests/custom/src/test/resources/realma/idp-servlet.xml
index fc28a83..4ee1201 100644
--- a/systests/custom/src/test/resources/realma/idp-servlet.xml
+++ b/systests/custom/src/test/resources/realma/idp-servlet.xml
@@ -21,9 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="config/idp-core-servlet.xml" />
diff --git a/systests/custom/src/test/resources/realma/security-up-config.xml b/systests/custom/src/test/resources/realma/security-up-config.xml
index dd381bf..9a8d9bf 100644
--- a/systests/custom/src/test/resources/realma/security-up-config.xml
+++ b/systests/custom/src/test/resources/realma/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
">
<!-- DISABLE in production as it might log confidential information about the user -->
diff --git a/systests/custom/src/test/resources/userClaims.xml b/systests/custom/src/test/resources/userClaims.xml
index 6032340..76dab37 100644
--- a/systests/custom/src/test/resources/userClaims.xml
+++ b/systests/custom/src/test/resources/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<util:list id="claimHandlerList">
<ref bean="claimsHandlerA" />
diff --git a/systests/cxf/src/test/resources/realma/entities-realma.xml b/systests/cxf/src/test/resources/realma/entities-realma.xml
index 5a8f5f5..cdf41e0 100644
--- a/systests/cxf/src/test/resources/realma/entities-realma.xml
+++ b/systests/cxf/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/cxf/src/test/resources/realma/fediz-sts.xml b/systests/cxf/src/test/resources/realma/fediz-sts.xml
index 9a690ab..72f3946 100644
--- a/systests/cxf/src/test/resources/realma/fediz-sts.xml
+++ b/systests/cxf/src/test/resources/realma/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.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 ce7d570..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-4.3.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-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="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 a03d3fa..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
@@ -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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.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 ce7d570..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-4.3.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-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="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 bc0c8f7..4be595a 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-4.3.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.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 ec56f26..58d6278 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-4.3.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/systests/federation/samlsso/src/test/resources/cxf-service.xml b/systests/federation/samlsso/src/test/resources/cxf-service.xml
index eba2446..32460bf 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.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 3d9cc0c..341d3ad 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
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 91550d0..1036b79 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
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 479c493..2b6fce3 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="config/idp-core-servlet.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 c549ef6..2adbfc6 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
">
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 11f179d..2243ed7 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-4.3.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/systests/federation/unknown-subject/src/test/resources/realma/entities-realma.xml b/systests/federation/unknown-subject/src/test/resources/realma/entities-realma.xml
index 894ae72..521bcdf 100644
--- a/systests/federation/unknown-subject/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/unknown-subject/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/federation/unknown-subject/src/test/resources/realmb/entities-realmb.xml b/systests/federation/unknown-subject/src/test/resources/realmb/entities-realmb.xml
index 48a5799..973f543 100644
--- a/systests/federation/unknown-subject/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/unknown-subject/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/federation/unknown-subject/src/test/resources/realmb/idp-servlet.xml b/systests/federation/unknown-subject/src/test/resources/realmb/idp-servlet.xml
index c556808..67dc6a1 100644
--- a/systests/federation/unknown-subject/src/test/resources/realmb/idp-servlet.xml
+++ b/systests/federation/unknown-subject/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="config/idp-core-servlet.xml" />
diff --git a/systests/federation/unknown-subject/src/test/resources/realmb/security-config.xml b/systests/federation/unknown-subject/src/test/resources/realmb/security-config.xml
index c549ef6..2adbfc6 100644
--- a/systests/federation/unknown-subject/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/unknown-subject/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
">
diff --git a/systests/federation/unknown-subject/src/test/resources/sts/realms.xml b/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
index 7ffc73e..f1cbf86 100644
--- a/systests/federation/unknown-subject/src/test/resources/sts/realms.xml
+++ b/systests/federation/unknown-subject/src/test/resources/sts/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-4.3.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-4.3.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
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 d5eb99c..9149d44 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
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 80baf49..92cc4e2 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
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 8c44885..6b9f699 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="config/idp-core-servlet.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 c549ef6..2adbfc6 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.3.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd
">
diff --git a/systests/idp/src/test/resources/realma/entities-realma.xml b/systests/idp/src/test/resources/realma/entities-realma.xml
index 27ac5d0..2bae270 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/jetty9/src/test/resources/realma/entities-realma.xml b/systests/jetty9/src/test/resources/realma/entities-realma.xml
index 5a8f5f5..cdf41e0 100644
--- a/systests/jetty9/src/test/resources/realma/entities-realma.xml
+++ b/systests/jetty9/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/jetty9/src/test/resources/realma/fediz-sts.xml b/systests/jetty9/src/test/resources/realma/fediz-sts.xml
index 9a690ab..72f3946 100644
--- a/systests/jetty9/src/test/resources/realma/fediz-sts.xml
+++ b/systests/jetty9/src/test/resources/realma/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/systests/kerberos/src/test/resources/sts/cxf-transport.xml b/systests/kerberos/src/test/resources/sts/cxf-transport.xml
index c582f36..cd3e790 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-4.3.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-4.3.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
diff --git a/systests/kerberos/src/test/resources/sts/kerberos.xml b/systests/kerberos/src/test/resources/sts/kerberos.xml
index e39dd6d..2961ff7 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
diff --git a/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml b/systests/kerberos/src/test/resources/sts/userClaimsKerberos.xml
index 9500f4e..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/ldap/src/test/resources/sts/cxf-transport.xml b/systests/ldap/src/test/resources/sts/cxf-transport.xml
index 532482d..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-4.3.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-4.3.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
diff --git a/systests/ldap/src/test/resources/sts/ldap.xml b/systests/ldap/src/test/resources/sts/ldap.xml
index 46501a7..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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd">
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
index 70e23f9..d890dca 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
@@ -45,6 +45,7 @@ import javax.servlet.ServletResponse;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriBuilder;
+import com.gargoylesoftware.htmlunit.CookieManager;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.Page;
@@ -91,8 +92,8 @@ import static org.junit.Assert.fail;
*/
abstract class AbstractOIDCTest {
- private static final Integer IDP_HTTPS_PORT = Integer.getInteger("idp.https.port");
- private static final Integer RP_HTTPS_PORT = Integer.getInteger("rp.https.port");
+ private static final Integer IDP_HTTPS_PORT = Integer.getInteger("idp.https.port", 12345);
+ private static final Integer RP_HTTPS_PORT = Integer.getInteger("rp.https.port", 23456);
private static final String CALLBACK_CONTEXT = "/callback";
private static final String REDIRECT_URL = "https://localhost:" + RP_HTTPS_PORT + CALLBACK_CONTEXT;
@@ -472,6 +473,69 @@ abstract class AbstractOIDCTest {
}
@org.junit.Test
+ public void testOIDCLoginDifferentClients() throws Exception {
+ final UriBuilder authorizationUrlConfidential = oidcEndpointBuilder("/idp/authorize")
+ .queryParam("client_id", confidentialClientId)
+ .queryParam("response_type", "code")
+ .queryParam("scope", "openid");
+
+ CookieManager cookieManager = new CookieManager();
+ WebClient webClient = setupWebClientIDP("alice", "ecila");
+ webClient.setCookieManager(cookieManager);
+
+
+ // Login to the OIDC authorization endpoint + get the authorization code
+// String authorizationCode = webClient.getPage(authorizationUrlConfidential.build().toURL()).getWebResponse().getContentAsString();
+ String authorizationCode = login(authorizationUrlConfidential, webClient).getWebResponse().getContentAsString();
+ System.out.println("authorizationCode " + authorizationCode);
+
+ // Now use the code to get an IdToken
+ final Map<String, Object> jsonConfidential =
+ getTokenJson(authorizationCode, confidentialClientId, confidentialClientSecret);
+ System.out.println(jsonConfidential);
+
+ // Check the IdToken
+ validateIdToken(getIdToken(jsonConfidential), confidentialClientId);
+
+ final UriBuilder authorizationUrlPublic = oidcEndpointBuilder("/idp/authorize")
+ .queryParam("client_id", publicClientId)
+ .queryParam("response_type", "code")
+ .queryParam("scope", "openid")
+ .queryParam("redirect_uri", REDIRECT_URL);
+
+ // Login to the OIDC authorization endpoint + get the authorization code
+ authorizationCode = webClient.getPage(authorizationUrlPublic.build().toURL()).getWebResponse().getContentAsString();
+ System.out.println("authorizationCode " + authorizationCode);
+
+ // Now use the code to get an IdToken
+ final Map<String, Object> jsonPublic =
+ getTokenJson(authorizationCode, publicClientId, null);
+ System.out.println(jsonPublic);
+
+ // Check the IdToken
+ validateIdToken(getIdToken(jsonPublic), publicClientId);
+ }
+
+ @org.junit.Test
+ public void testImplicitFlow() throws Exception {
+ final UriBuilder authorizationUrl = oidcEndpointBuilder("/idp/authorize")
+ .queryParam("client_id", publicClientId)
+ .queryParam("response_type", "id_token")
+ .queryParam("scope", "openid")
+ .queryParam("redirect_uri", REDIRECT_URL)
+ .queryParam("nonce", "1234565635");
+
+ CookieManager cookieManager = new CookieManager();
+ WebClient webClient = setupWebClientIDP("alice", "ecila");
+ webClient.setCookieManager(cookieManager);
+
+
+ // Login to the OIDC authorization endpoint + get the authorization code
+ String authorizationCode = loginAndGetAuthorizationCode(authorizationUrl, "alice", "ecila");
+ System.out.println("authorizationCode " + authorizationCode);
+ }
+
+ @org.junit.Test
public void testUsingCodeForOtherClient() throws Exception {
// Get the code for the first client
final UriBuilder authorizationUrl = oidcEndpointBuilder("/idp/authorize")
@@ -1007,6 +1071,7 @@ abstract class AbstractOIDCTest {
private static WebClient setupWebClient(int port, String user, String password) {
final WebClient webClient = new WebClient();
+
webClient.getOptions().setUseInsecureSSL(true);
if (-1 != port && null != password) {
webClient.getCredentialsProvider().setCredentials(
diff --git a/systests/oidc/src/test/resources/oidc/applicationContext.xml b/systests/oidc/src/test/resources/oidc/applicationContext.xml
index a06cc0c..a645e08 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-4.3.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://www.springframework.org/schema/util/spring-util-4.3.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
diff --git a/systests/oidc/src/test/resources/oidc/data-manager.xml b/systests/oidc/src/test/resources/oidc/data-manager.xml
index 2966b9b..11ae817 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
">
<bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/>
diff --git a/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml b/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
index 725386e..f1fb940 100644
--- a/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
+++ b/systests/oidc/src/test/resources/oidc/spring/applicationContext.xml
@@ -30,11 +30,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-4.3.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://www.springframework.org/schema/util/spring-util-4.3.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://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
diff --git a/systests/oidc/src/test/resources/realma/entities-realma.xml b/systests/oidc/src/test/resources/realma/entities-realma.xml
index b6b9146..b274f38 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/samlsso/src/test/resources/realma/entities-realma.xml b/systests/samlsso/src/test/resources/realma/entities-realma.xml
index 9989758..5297da9 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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/spring/src/test/resources/realma/entities-realma.xml b/systests/spring/src/test/resources/realma/entities-realma.xml
index 5a8f5f5..cdf41e0 100644
--- a/systests/spring/src/test/resources/realma/entities-realma.xml
+++ b/systests/spring/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/spring/src/test/resources/realma/fediz-sts.xml b/systests/spring/src/test/resources/realma/fediz-sts.xml
index 9a690ab..72f3946 100644
--- a/systests/spring/src/test/resources/realma/fediz-sts.xml
+++ b/systests/spring/src/test/resources/realma/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/systests/tomcat/src/test/resources/realma/entities-realma.xml b/systests/tomcat/src/test/resources/realma/entities-realma.xml
index 5a8f5f5..cdf41e0 100644
--- a/systests/tomcat/src/test/resources/realma/entities-realma.xml
+++ b/systests/tomcat/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.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" />
diff --git a/systests/tomcat/src/test/resources/realma/fediz-sts.xml b/systests/tomcat/src/test/resources/realma/fediz-sts.xml
index 9a690ab..72f3946 100644
--- a/systests/tomcat/src/test/resources/realma/fediz-sts.xml
+++ b/systests/tomcat/src/test/resources/realma/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-4.3.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-4.3.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />