Skip to content

Commit 71bb8d6

Browse files
committed
Spring 4.3 namespace
1 parent fc91043 commit 71bb8d6

File tree

14 files changed

+54
-54
lines changed

14 files changed

+54
-54
lines changed

openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xmlns:util="http://www.springframework.org/schema/util"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2828
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
30-
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
31-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
32-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30+
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
31+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
32+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3333

3434
<!-- Scan for components -->
3535
<context:component-scan annotation-config="true" base-package="org.mitre" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232
<!-- validate incoming tokens for JWT assertions -->
3333
<bean id="jwtAssertionValidator" class="org.mitre.jwt.assertion.impl.NullAssertionValidator" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/authz-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232

3333
<oauth:authorization-server

openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232
<bean id="defaultKeyStore" class="org.mitre.jose.keystore.JWKSetKeyStore">
3333
<property name="location" value="classpath:keystore.jwks" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<beans xmlns="http://www.springframework.org/schema/beans"
1919
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
22-
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd">
21+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
22+
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd">
2323

2424
<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
2525
<property name="driverClassName" value="org.hsqldb.jdbcDriver" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/jpa-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
3333
<property name="entityManagerFactory" ref="entityManagerFactory" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232

3333
<!-- Empty: Override this file in your local project to change configuration options. -->

openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232
<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
3333

openid-connect-server-webapp/src/main/webapp/WEB-INF/spring-servlet.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
xmlns:security="http://www.springframework.org/schema/security"
2424
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2525
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
26-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
26+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
2727
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
28-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
29-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
30-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
28+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
29+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
30+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
3131

3232
<!-- This file has been left blank -->
3333
<!-- Feel free to override this by using a maven overlay. -->

openid-connect-server-webapp/src/main/webapp/WEB-INF/task-config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<beans xmlns="http://www.springframework.org/schema/beans"
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xmlns:task="http://www.springframework.org/schema/task"
21-
xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
22-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
21+
xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
22+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
2323

2424
<!-- Configuration for scheduled tasks -->
2525
<task:scheduler id="taskScheduler" pool-size="10" />

0 commit comments

Comments
 (0)