Skip to content

Commit 9ccaa76

Browse files
author
Roger Hughes
committed
Updated to Spring 3.2.1-RELEASE
1 parent 5325850 commit 9ccaa76

File tree

26 files changed

+77
-71
lines changed

26 files changed

+77
-71
lines changed

‎address/pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313
<org.slf4j-version>1.5.10</org.slf4j-version>
1414
<unitils.version>3.1</unitils.version>
1515
</properties>
@@ -32,14 +32,17 @@
3232
<artifactId>spring-webmvc</artifactId>
3333
<version>${org.springframework-version}</version>
3434
</dependency>
35-
35+
<dependency>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-web</artifactId>
38+
<version>${org.springframework-version}</version>
39+
</dependency>
3640
<dependency>
3741
<groupId>org.springframework</groupId>
3842
<artifactId>spring-jdbc</artifactId>
3943
<version>${org.springframework-version}</version>
4044
</dependency>
4145

42-
4346
<!-- Logging -->
4447
<dependency>
4548
<groupId>org.slf4j</groupId>

‎address/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans:beans xmlns="http://www.springframework.org/schema/mvc"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:beans="http://www.springframework.org/schema/beans"
45
xmlns:context="http://www.springframework.org/schema/context"
5-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
6-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
7+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
89

910
<beans:import resource="spring-datasource.xml" />
1011

‎address/src/main/webapp/WEB-INF/spring/appServlet/spring-datasource.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:jee="http://www.springframework.org/schema/jee"
55
xsi:schemaLocation="http://www.springframework.org/schema/beans
6-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6+
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
77
http://www.springframework.org/schema/context
8-
http://www.springframework.org/schema/beans/spring-context-3.0.xsd
8+
http://www.springframework.org/schema/beans/spring-context-3.2.xsd
99
http://www.springframework.org/schema/jee
10-
http://www.springframework.org/schema/jee/spring-jee-3.0.xsd">
10+
http://www.springframework.org/schema/jee/spring-jee-3.2.xsd">
1111

1212
<!-- Primary JNDI datasource -->
1313
<jee:jndi-lookup id="dataSource" jndi-name="jdbc/LiveDataSource"/>

‎address/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

‎address/src/test/resources/servlet-context.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/mvc"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
44
xmlns:context="http://www.springframework.org/schema/context"
5-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
6-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
6+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
7+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
88

99
<beans:import resource="spring-datasource.xml" />
1010

‎exceptions/pom.xml

+4-7
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
13-
<org.springframework.roo-version>1.0.2.RELEASE</org.springframework.roo-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1413
<org.aspectj-version>1.6.9</org.aspectj-version>
1514
<org.slf4j-version>1.5.10</org.slf4j-version>
1615
</properties>
@@ -33,12 +32,10 @@
3332
<artifactId>spring-webmvc</artifactId>
3433
<version>${org.springframework-version}</version>
3534
</dependency>
36-
<!-- Roo dependencies -->
3735
<dependency>
38-
<groupId>org.springframework.roo</groupId>
39-
<artifactId>org.springframework.roo.annotations</artifactId>
40-
<version>${org.springframework.roo-version}</version>
41-
<scope>provided</scope>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-web</artifactId>
38+
<version>${org.springframework-version}</version>
4239
</dependency>
4340

4441
<!-- AspectJ -->

‎exceptions/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:beans="http://www.springframework.org/schema/beans"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
7-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
7+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
99

1010
<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
1111

‎exceptions/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

‎facebook/pom.xml

+6-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.0.6.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313
<org.aspectj-version>1.6.9</org.aspectj-version>
1414
<spring-social.version>1.0.2.RELEASE</spring-social.version>
1515
<org.springframework.social-facebook-version>1.0.1.RELEASE</org.springframework.social-facebook-version>
@@ -36,6 +36,11 @@
3636
<artifactId>spring-webmvc</artifactId>
3737
<version>${org.springframework-version}</version>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.springframework</groupId>
41+
<artifactId>spring-web</artifactId>
42+
<version>${org.springframework-version}</version>
43+
</dependency>
3944

4045
<!-- AspectJ -->
4146
<dependency>
@@ -159,13 +164,6 @@
159164
<version>1.3.159</version>
160165
</dependency>
161166

162-
<!-- CGLIB, only required and used for @Configuration usage: could be removed in future release of Spring -->
163-
<dependency>
164-
<groupId>cglib</groupId>
165-
<artifactId>cglib-nodep</artifactId>
166-
<version>2.2</version>
167-
</dependency>
168-
169167
<dependency>
170168
<groupId>org.unitils</groupId>
171169
<artifactId>unitils-core</artifactId>

‎facebook/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:beans="http://www.springframework.org/schema/beans"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
7-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
7+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
99

1010
<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
1111

‎facebook/src/main/webapp/WEB-INF/spring/data.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
55
xmlns:tx="http://www.springframework.org/schema/tx"
66
xmlns:util="http://www.springframework.org/schema/util"
7-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8-
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
9-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
10-
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
7+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
9+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
10+
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
1111

1212
<!-- Configures transaction management around @Transactional components -->
1313
<tx:annotation-driven transaction-manager="transactionManager" />

‎facebook/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

‎producer-consumer/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Example Producer Consumer Pattern</name>
1010
<properties>
1111
<slf4jVersion>1.6.1</slf4jVersion>
12-
<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313

1414
</properties>
1515
<dependencies>

‎producer-consumer/src/main/resources/matches-poisonpill.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:context="http://www.springframework.org/schema/context"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
6+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
77

88
<!-- Scans the classpath of this application for annotated beans starting at this point -->
99
<context:component-scan base-package="jsr250annotations" />

‎producer-consumer/src/main/resources/matches.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:context="http://www.springframework.org/schema/context"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
6+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
77

88
<!-- Scans the classpath of this application for annotated beans starting at this point -->
99
<context:component-scan base-package="jsr250annotations" />

‎sim-map-exc-res/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.0.6.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313
<org.aspectj-version>1.6.9</org.aspectj-version>
1414
<org.slf4j-version>1.5.10</org.slf4j-version>
1515
</properties>
@@ -32,6 +32,11 @@
3232
<artifactId>spring-webmvc</artifactId>
3333
<version>${org.springframework-version}</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-web</artifactId>
38+
<version>${org.springframework-version}</version>
39+
</dependency>
3540

3641
<!-- AspectJ -->
3742
<dependency>

‎sim-map-exc-res/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:beans="http://www.springframework.org/schema/beans"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
7-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
7+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
99

1010
<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
1111

‎sim-map-exc-res/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

‎social/pom.xml

+6-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.0.6.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313
<org.aspectj-version>1.6.9</org.aspectj-version>
1414
<org.slf4j-version>1.5.10</org.slf4j-version>
1515
<spring-social.version>1.0.2.RELEASE</spring-social.version>
@@ -35,6 +35,11 @@
3535
<artifactId>spring-webmvc</artifactId>
3636
<version>${org.springframework-version}</version>
3737
</dependency>
38+
<dependency>
39+
<groupId>org.springframework</groupId>
40+
<artifactId>spring-web</artifactId>
41+
<version>${org.springframework-version}</version>
42+
</dependency>
3843

3944
<!-- AspectJ -->
4045
<dependency>
@@ -127,13 +132,6 @@
127132
<version>${org.springframework.social-twitter-version}</version>
128133
</dependency>
129134

130-
<!-- CGLIB, only required and used for @Configuration usage: could be removed in future release of Spring -->
131-
<dependency>
132-
<groupId>cglib</groupId>
133-
<artifactId>cglib-nodep</artifactId>
134-
<version>2.2</version>
135-
</dependency>
136-
137135
<dependency>
138136
<groupId>com.captaindebug</groupId>
139137
<artifactId>state-machine</artifactId>

‎social/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

‎spring-security/tomcat-ssl/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-BUILD-SNAPSHOT</version>
1010
<properties>
1111
<java-version>1.6</java-version>
12-
<org.springframework-version>3.1.0.RELEASE</org.springframework-version>
12+
<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
1313
<org.springsecurity-version>3.1.3.RELEASE</org.springsecurity-version>
1414
<org.aspectj-version>1.6.9</org.aspectj-version>
1515
<org.slf4j-version>1.5.10</org.slf4j-version>
@@ -33,7 +33,11 @@
3333
<artifactId>spring-webmvc</artifactId>
3434
<version>${org.springframework-version}</version>
3535
</dependency>
36-
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-web</artifactId>
39+
<version>${org.springframework-version}</version>
40+
</dependency>
3741
<!-- AspectJ -->
3842
<dependency>
3943
<groupId>org.aspectj</groupId>

‎spring-security/tomcat-ssl/src/main/webapp/WEB-INF/spring/appServlet/application-security.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:beans="http://www.springframework.org/schema/beans"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://www.springframework.org/schema/beans
6-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6+
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
77
http://www.springframework.org/schema/security
88
http://www.springframework.org/schema/security/spring-security-3.1.xsd">
99

‎spring-security/tomcat-ssl/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:beans="http://www.springframework.org/schema/beans"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
7-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
7+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
99

1010
<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
1111

‎spring-security/tomcat-ssl/src/main/webapp/WEB-INF/spring/root-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
55

66
<!-- Root Context: defines shared resources visible to all other web components -->
77

0 commit comments

Comments
 (0)