diff --git a/parent/pom.xml b/parent/pom.xml index 717ddd0e..a824c289 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -559,6 +559,11 @@ spring-security-config 3.1.0.RELEASE + + org.springframework.security + spring-security-web + 3.1.0.RELEASE + net.sf.ehcache diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml index 9b0b8ac2..a4cb746c 100644 --- a/samples/airline/server/pom.xml +++ b/samples/airline/server/pom.xml @@ -253,6 +253,10 @@ org.springframework.security spring-security-config + + org.springframework.security + spring-security-web + org.apache.activemq activemq-core diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml index 850da863..d322dc55 100644 --- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml +++ b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml index 9ca02275..aae02e20 100644 --- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml +++ b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.1.xsd"> diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml index 18b526ba..e464450a 100644 --- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml +++ b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd"> This application context contains the WS-Security and Spring Security beans. diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml index 3c30f10a..a24f49e4 100644 --- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml +++ b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml index 3955a932..0fe62f8d 100644 --- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml +++ b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:sws="http://www.springframework.org/schema/web-services" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">