diff --git a/acl/pom.xml b/acl/pom.xml index 91b7413b10..10467408a7 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -8,161 +8,161 @@ spring-security-acl http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - net.sf.ehcache - ehcache - 2.9.0 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.hsqldb - hsqldb - 2.3.2 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-beans - 4.1.5.RELEASE - test - - - org.springframework - spring-context-support - 4.1.5.RELEASE - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + net.sf.ehcache + ehcache + 2.9.0 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.hsqldb + hsqldb + 2.3.2 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-beans + 4.1.5.RELEASE + test + + + org.springframework + spring-context-support + 4.1.5.RELEASE + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/acl/src/test/resources/logback-test.xml b/acl/src/test/resources/logback-test.xml index f293b342dc..ddf04b2972 100644 --- a/acl/src/test/resources/logback-test.xml +++ b/acl/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + diff --git a/aspects/pom.xml b/aspects/pom.xml index 94a1485539..a46b8d2823 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -8,137 +8,137 @@ spring-security-aspects http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.aspectj - aspectjrt - 1.8.4 - compile - true - - - aopalliance - aopalliance - 1.0 - test - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-aop - 4.1.5.RELEASE - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.aspectj + aspectjrt + 1.8.4 + compile + true + + + aopalliance + aopalliance + 1.0 + test + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-aop + 4.1.5.RELEASE + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/aspects/src/main/resources/META-INF/aop.xml b/aspects/src/main/resources/META-INF/aop.xml index a9d76e8e42..0a39bf65c6 100644 --- a/aspects/src/main/resources/META-INF/aop.xml +++ b/aspects/src/main/resources/META-INF/aop.xml @@ -1,18 +1,18 @@ - + - - - - + + + diff --git a/cas/pom.xml b/cas/pom.xml index a9038fc1e4..60def6f0f3 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -8,149 +8,149 @@ spring-security-cas http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.jasig.cas.client - cas-client-core - 3.3.3 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - net.sf.ehcache - ehcache - 2.9.0 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.jasig.cas.client + cas-client-core + 3.3.3 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + net.sf.ehcache + ehcache + 2.9.0 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/config/pom.xml b/config/pom.xml index 5e2f092412..426bde2360 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -8,410 +8,410 @@ spring-security-config http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.aspectj - aspectjweaver - 1.8.4 - compile - true - - - org.springframework.security - spring-security-ldap - 4.0.0.CI-SNAPSHOT - compile - true - - - org.springframework.security - spring-security-messaging - 4.0.0.CI-SNAPSHOT - compile - true - - - org.springframework.security - spring-security-openid - 4.0.0.CI-SNAPSHOT - compile - true - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - true - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-websocket - 4.1.5.RELEASE - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - test - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - javax.annotation - jsr250-api - 1.0 - test - - - junit - junit - 4.11 - test - - - ldapsdk - ldapsdk - 4.1 - test - - - org.apache.directory.server - apacheds-core - 1.5.5 - test - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - test - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - test - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - test - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - test - - - org.apache.directory.shared - shared-ldap - 0.9.15 - test - - - org.codehaus.groovy - groovy-all - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.eclipse.persistence - javax.persistence - 2.0.5 - test - - - org.hibernate - hibernate-entitymanager - 4.1.0.Final - test - - - org.hibernate - hibernate-entitymanager - 3.6.10.Final - test - - - org.hsqldb - hsqldb - 2.3.2 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.openid4java - openid4java-nodeps - 0.9.6 - test - - - guice - com.google.code.guice - - - - - org.powermock - powermock-api-mockito - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-support - 1.6.0 - test - - - org.powermock - powermock-core - 1.6.0 - test - - - org.powermock - powermock-module-junit4 - 1.6.0 - test - - - org.powermock - powermock-module-junit4-common - 1.6.0 - test - - - org.powermock - powermock-reflect - 1.6.0 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework.data - spring-data-jpa - 1.7.1.RELEASE - test - - - aspectjrt - org.aspectj - - - - - org.springframework.ldap - spring-ldap-core - 2.0.2.RELEASE - test - - - org.springframework.security - spring-security-aspects - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-cas - 4.0.0.CI-SNAPSHOT - test - - - org.springframework - spring-expression - 4.1.5.RELEASE - test - - - org.springframework - spring-orm - 4.1.5.RELEASE - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.aspectj + aspectjweaver + 1.8.4 + compile + true + + + org.springframework.security + spring-security-ldap + 4.0.0.CI-SNAPSHOT + compile + true + + + org.springframework.security + spring-security-messaging + 4.0.0.CI-SNAPSHOT + compile + true + + + org.springframework.security + spring-security-openid + 4.0.0.CI-SNAPSHOT + compile + true + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + true + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-websocket + 4.1.5.RELEASE + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + test + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + javax.annotation + jsr250-api + 1.0 + test + + + junit + junit + 4.11 + test + + + ldapsdk + ldapsdk + 4.1 + test + + + org.apache.directory.server + apacheds-core + 1.5.5 + test + + + org.apache.directory.server + apacheds-core-entry + 1.5.5 + test + + + org.apache.directory.server + apacheds-protocol-ldap + 1.5.5 + test + + + org.apache.directory.server + apacheds-protocol-shared + 1.5.5 + test + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + test + + + org.apache.directory.shared + shared-ldap + 0.9.15 + test + + + org.codehaus.groovy + groovy-all + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.eclipse.persistence + javax.persistence + 2.0.5 + test + + + org.hibernate + hibernate-entitymanager + 4.1.0.Final + test + + + org.hibernate + hibernate-entitymanager + 3.6.10.Final + test + + + org.hsqldb + hsqldb + 2.3.2 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.openid4java + openid4java-nodeps + 0.9.6 + test + + + guice + com.google.code.guice + + + + + org.powermock + powermock-api-mockito + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-support + 1.6.0 + test + + + org.powermock + powermock-core + 1.6.0 + test + + + org.powermock + powermock-module-junit4 + 1.6.0 + test + + + org.powermock + powermock-module-junit4-common + 1.6.0 + test + + + org.powermock + powermock-reflect + 1.6.0 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework.data + spring-data-jpa + 1.7.1.RELEASE + test + + + aspectjrt + org.aspectj + + + + + org.springframework.ldap + spring-ldap-core + 2.0.2.RELEASE + test + + + org.springframework.security + spring-security-aspects + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-cas + 4.0.0.CI-SNAPSHOT + test + + + org.springframework + spring-expression + 4.1.5.RELEASE + test + + + org.springframework + spring-orm + 4.1.5.RELEASE + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/config/src/integration-test/resources/logback-test.xml b/config/src/integration-test/resources/logback-test.xml index 55175bc4e4..91106c802e 100644 --- a/config/src/integration-test/resources/logback-test.xml +++ b/config/src/integration-test/resources/logback-test.xml @@ -1,8 +1,8 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + @@ -13,7 +13,7 @@ - + diff --git a/config/src/main/resources/org/springframework/security/config/catalog.xml b/config/src/main/resources/org/springframework/security/config/catalog.xml index f989707d47..b0322f0568 100644 --- a/config/src/main/resources/org/springframework/security/config/catalog.xml +++ b/config/src/main/resources/org/springframework/security/config/catalog.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/config/src/test/resources/logback-test.xml b/config/src/test/resources/logback-test.xml index e1bb6f4973..39ab6a45b6 100644 --- a/config/src/test/resources/logback-test.xml +++ b/config/src/test/resources/logback-test.xml @@ -1,8 +1,8 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + @@ -10,7 +10,7 @@ - + diff --git a/config/src/test/resources/org/springframework/security/config/method-security.xml b/config/src/test/resources/org/springframework/security/config/method-security.xml index 21f442df45..ff617d2299 100644 --- a/config/src/test/resources/org/springframework/security/config/method-security.xml +++ b/config/src/test/resources/org/springframework/security/config/method-security.xml @@ -1,42 +1,42 @@ + xmlns:b="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tx="http://www.springframework.org/schema/tx" + 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.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/config/src/test/resources/org/springframework/security/config/method/sec2136/sec2136.xml b/config/src/test/resources/org/springframework/security/config/method/sec2136/sec2136.xml index 7258048397..103ab944c0 100644 --- a/config/src/test/resources/org/springframework/security/config/method/sec2136/sec2136.xml +++ b/config/src/test/resources/org/springframework/security/config/method/sec2136/sec2136.xml @@ -1,55 +1,55 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jpa="http://www.springframework.org/schema/data/jpa" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:jdbc="http://www.springframework.org/schema/jdbc" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd + 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-3.1.xsd + http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + - - - - - - - - - - - - - create-drop - true - false - - - + + + + + + + + + + + + + create-drop + true + false + + + - - + + - - - - + + + + - - - + + + - - - + + + - - + + diff --git a/config/src/test/resources/org/springframework/security/config/method/sec2499/child.xml b/config/src/test/resources/org/springframework/security/config/method/sec2499/child.xml index b9bc511cdb..efca284350 100644 --- a/config/src/test/resources/org/springframework/security/config/method/sec2499/child.xml +++ b/config/src/test/resources/org/springframework/security/config/method/sec2499/child.xml @@ -1,12 +1,12 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://www.springframework.org/schema/security" + xsi:schemaLocation="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.xsd"> - - - + + + \ No newline at end of file diff --git a/config/src/test/resources/org/springframework/security/config/method/sec2499/parent.xml b/config/src/test/resources/org/springframework/security/config/method/sec2499/parent.xml index cf62a87ce0..b6c7e74ea9 100644 --- a/config/src/test/resources/org/springframework/security/config/method/sec2499/parent.xml +++ b/config/src/test/resources/org/springframework/security/config/method/sec2499/parent.xml @@ -1,9 +1,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.xsd"> - + diff --git a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml index 39d06dd9c0..aa87cd49c1 100644 --- a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml +++ b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml @@ -7,7 +7,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,163 +18,163 @@ * --> + xmlns:sec="http://www.springframework.org/schema/security" + xmlns:util="http://www.springframework.org/schema/util" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - + - - + + - - - + + + - - - - - - - + + + + + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/pom.xml b/core/pom.xml index e65eee4984..ac54f10013 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,285 +8,285 @@ spring-security-core http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-expression - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.annotation - jsr250-api - 1.0 - compile - true - - - net.sf.ehcache - ehcache - 2.9.0 - compile - true - - - org.aspectj - aspectjrt - 1.8.4 - compile - true - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-collections - commons-collections - 3.2.1 - test - - - mockito-all - org.mockito - - - - - junit - junit - 4.11 - test - - - mockito-all - org.mockito - - - - - org.easytesting - fest-assert - 1.4 - test - - - mockito-all - org.mockito - - - - - org.hsqldb - hsqldb - 2.3.2 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-mockito - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-support - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-core - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-module-junit4 - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-module-junit4-common - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-reflect - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - mockito-all - org.mockito - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - - - mockito-all - org.mockito - - - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-expression + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.annotation + jsr250-api + 1.0 + compile + true + + + net.sf.ehcache + ehcache + 2.9.0 + compile + true + + + org.aspectj + aspectjrt + 1.8.4 + compile + true + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-collections + commons-collections + 3.2.1 + test + + + mockito-all + org.mockito + + + + + junit + junit + 4.11 + test + + + mockito-all + org.mockito + + + + + org.easytesting + fest-assert + 1.4 + test + + + mockito-all + org.mockito + + + + + org.hsqldb + hsqldb + 2.3.2 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-mockito + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-support + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-core + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-module-junit4 + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-module-junit4-common + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-reflect + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + mockito-all + org.mockito + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + + + mockito-all + org.mockito + + + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/core/src/site/site.xml b/core/src/site/site.xml index 7d10d582cc..676b2d2ac7 100644 --- a/core/src/site/site.xml +++ b/core/src/site/site.xml @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml index f293b342dc..ddf04b2972 100644 --- a/core/src/test/resources/logback-test.xml +++ b/core/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + diff --git a/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml b/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml index 354b5e912c..d33b1a2380 100644 --- a/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml +++ b/core/src/test/resources/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.xml @@ -4,26 +4,26 @@ - + - - - JAASTest - - - classpath:org/springframework/security/authentication/jaas/login.conf - - - - - - - - - - - - - - + + + JAASTest + + + classpath:org/springframework/security/authentication/jaas/login.conf + + + + + + + + + + + + + + diff --git a/crypto/pom.xml b/crypto/pom.xml index 6f2f0c68d3..d48c2b0d64 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -8,88 +8,88 @@ spring-security-crypto http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/data/pom.xml b/data/pom.xml index 4d840df5cd..990dd81d3c 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -8,112 +8,112 @@ spring-security-data http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.data - spring-data-commons - 1.9.1.RELEASE - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.data + spring-data-commons + 1.9.1.RELEASE + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/docs/articles/src/docbook/codebase-structure.xml b/docs/articles/src/docbook/codebase-structure.xml index 4aaf161231..99b9ad0317 100644 --- a/docs/articles/src/docbook/codebase-structure.xml +++ b/docs/articles/src/docbook/codebase-structure.xml @@ -1,213 +1,213 @@
- - The Spring Security 3.0 Codebase - Why have the packages changed in Spring Security 3.0? - - Luke Taylor - SpringSource - - A quick introduction to the code modules and package structure of the Spring - Security 3.0 codebase. - - - - Introduction - In versions prior to 3.0, most of Spring Security's code was contained in the - spring-security-core jar - There was also an additional spring-security-core-tiger - jar which contained the Java 5 specific code. In Spring Security 3.0, Java 5 is - the minimum supported platform, so this code is now part of the core. - . Over the years, as more features have been added, it has become more - difficult to track the dependencies both within the codebase itself and also on third - party libraries. For example, it's hard for a user to determine which of the listed - dependencies in the core Maven pom.xml are required for a - particular set of features within the framework. - In addition, the original package structure and class names have been around since the - framework's origins as Acegi Security in 2004, when only a few basic authentication - mechanisms were supported. As the amount of code has increased and the feature set has - expanded, this package structure has begun to show its age. -
- Spring Security 2.0.4 Package Structure - - - - - -
- - shows the high-level package diagram of the core, - core-tiger, cas-client and acl jars in the 2.0.4 release, as produced by the - Structure101 tool - Structure101 is an excellent tool for analyzing your own code or for - understanding someone else's. It is developed by Headway Software. - . You don't have to be an expert in code structure to realise that there is a - bit of a problem here. There are a lot of circular references and no clear overall - dependency structure within the packages. There are also some issues with packages being - split across jar boundaries, which can cause problems with OSGi, for example. - For more information on how to structure a large codebase, Juergen Hoeller's - Organization of Large Code Bases is an excellent overview of - the topic where he shares some of the insights gained from maintaining the - Spring Framework through multiple versions. You can find him discussing the - topic in an online interview transcript and an InfoQ video. - . This fragility in the code structure would likely have caused a maintenance - overhead as Spring Security evolved, so the decision was made to restructure the code - for the 3.0 release to give us a stable base for future development. - Let's take a look at how things are now organised. - - - Spring Security 3.0 - - Project Jars - The first thing we did was split the core out into several jars. The - spring-security-core jar now contains only basic - authentication and access-control code and is much cleaner. It has no dependencies - on LDAP or the servlet API, for example, and there are now separate jars for - web-specific code and for LDAP. We've also split out the namespace parsing code out - int a separate jar, as it depends on most of the other jars and doesn't expose any - public APIs that you are likely to use directly in your application. You only need - to use it if you are using Spring Security namespace configuration in your - application context XML files. The main project jars are shown in the following - table. - Spring Security Jars - - - - - - - - Jar Name - Description - When to use - Root Package(s) - - - - - spring-security-core - Core authentication and access-contol classes and interfaces. - Remoting support and basic provisioning APIs. - Required by any application which uses Spring Security. - Supports standalone applications, remote clients, method - (service layer) security and JDBC user provisioning. - - org.springframework.security.core, - org.springframework.security.access, - org.springframework.security.authentication, - org.springframework.security.provisioning, - org.springframework.security.remoting - - - - spring-security-web - Filters and other web-security infrastructure and related - code. Anything with a servlet API dependency. - If you require Spring Security web authentication services - and URL-based access-control - org.springframework.security.web - - - spring-security-config - Namespace parsing code. - If you are using the Spring Security XML namespace. - org.springframework.security.config - - - spring-security-ldap - LDAP authentication and provisioning code. - If you need to use LDAP authentication or manage LDAP user - entries. - org.springframework.security.ldap - - - spring-security-acl - Domain object ACL implementation. - If you need to apply security to specific domain object - instances within your application. - org.springframework.security.acls - - - spring-security-cas-client - Spring Security's CAS client integration. - If you want to use Spring Security web authentication with a - CAS single sign-on server. - org.springframework.security.cas - - - spring-security-openid - OpenID web authentication support. - If you need to authenticate users against an external OpenID - server. - org.springframework.security.openid - - - -
- There is now a clearer separation of concerns at the jar level. For example, you - only need the web jar (and its transitive dependencies) if you are writing a web - application. This also makes the code easier to navigate and understand. The - dependencies between the 3.0 jars which now make up the same code set of code we - looked at for version 2.0.4 are shown in .
- Inter-Jar Dependencies - - - - - -
- - - Package Structure - The package layout in 3.0 is show in . As you can - see, there are no longer any circular references and the structure is much clearer. - The core package and sub packages contain the basic classes and - interfaces which are used throughout the framework and the other two main packages - within the core jar are authentication and - access. The access package containst - access-control/authorization code such as the - AccessDecisionManager and related voter-based - implementations, the interception and method security infrastructure, annotation - classes and support for Spring Security 3.0's expression-based access control. The - authentication package contains the - AuthenticationManager and related classes (such - as authentication exception classes), the simple DAO-based authentication provider - and password-encoders.
- Spring Security 3.0.0.M1 Package Structure - - - - - -
- - - - How will these changes affect you? - If you are developing a new application then obviously you won't be affected, other - than by starting out with new package names. But what if you are upgrading an existing - application or another framework to use Spring Security 3.0. The first thing is that you - will obviously need to update build paths and dependency lists to take account of the - new jar modules, but the divisions there are straightforward (see the table above). How - much the package restructuring will affect you will depend on how much you use the - framework classes directly or in explicit bean configurations (if you are only using the - namespace for configuration then it will hide the changes from you). Your IDE should be - able to help with changing imports and finding out where classes have moved to (a simple - Ctrl-Shift-Tor Ctrl-Shift-O in Eclipse can do - wonders). - There are other changes in 3.0 that will affect some users who want to upgrade but for - the most part, the underlying architecture is unchanged. - We hope you enjoy using Spring Security 3.0. - + version="5.0"> + + The Spring Security 3.0 Codebase + Why have the packages changed in Spring Security 3.0? + + Luke Taylor + SpringSource + + A quick introduction to the code modules and package structure of the Spring + Security 3.0 codebase. + + + + Introduction + In versions prior to 3.0, most of Spring Security's code was contained in the + spring-security-core jar + There was also an additional spring-security-core-tiger + jar which contained the Java 5 specific code. In Spring Security 3.0, Java 5 is + the minimum supported platform, so this code is now part of the core. + . Over the years, as more features have been added, it has become more + difficult to track the dependencies both within the codebase itself and also on third + party libraries. For example, it's hard for a user to determine which of the listed + dependencies in the core Maven pom.xml are required for a + particular set of features within the framework. + In addition, the original package structure and class names have been around since the + framework's origins as Acegi Security in 2004, when only a few basic authentication + mechanisms were supported. As the amount of code has increased and the feature set has + expanded, this package structure has begun to show its age. +
+ Spring Security 2.0.4 Package Structure + + + + + +
+ + shows the high-level package diagram of the core, + core-tiger, cas-client and acl jars in the 2.0.4 release, as produced by the + Structure101 tool + Structure101 is an excellent tool for analyzing your own code or for + understanding someone else's. It is developed by Headway Software. + . You don't have to be an expert in code structure to realise that there is a + bit of a problem here. There are a lot of circular references and no clear overall + dependency structure within the packages. There are also some issues with packages being + split across jar boundaries, which can cause problems with OSGi, for example. + For more information on how to structure a large codebase, Juergen Hoeller's + Organization of Large Code Bases is an excellent overview of + the topic where he shares some of the insights gained from maintaining the + Spring Framework through multiple versions. You can find him discussing the + topic in an online interview transcript and an InfoQ video. + . This fragility in the code structure would likely have caused a maintenance + overhead as Spring Security evolved, so the decision was made to restructure the code + for the 3.0 release to give us a stable base for future development. + Let's take a look at how things are now organised. + + + Spring Security 3.0 + + Project Jars + The first thing we did was split the core out into several jars. The + spring-security-core jar now contains only basic + authentication and access-control code and is much cleaner. It has no dependencies + on LDAP or the servlet API, for example, and there are now separate jars for + web-specific code and for LDAP. We've also split out the namespace parsing code out + int a separate jar, as it depends on most of the other jars and doesn't expose any + public APIs that you are likely to use directly in your application. You only need + to use it if you are using Spring Security namespace configuration in your + application context XML files. The main project jars are shown in the following + table. + Spring Security Jars + + + + + + + + Jar Name + Description + When to use + Root Package(s) + + + + + spring-security-core + Core authentication and access-contol classes and interfaces. + Remoting support and basic provisioning APIs. + Required by any application which uses Spring Security. + Supports standalone applications, remote clients, method + (service layer) security and JDBC user provisioning. + + org.springframework.security.core, + org.springframework.security.access, + org.springframework.security.authentication, + org.springframework.security.provisioning, + org.springframework.security.remoting + + + + spring-security-web + Filters and other web-security infrastructure and related + code. Anything with a servlet API dependency. + If you require Spring Security web authentication services + and URL-based access-control + org.springframework.security.web + + + spring-security-config + Namespace parsing code. + If you are using the Spring Security XML namespace. + org.springframework.security.config + + + spring-security-ldap + LDAP authentication and provisioning code. + If you need to use LDAP authentication or manage LDAP user + entries. + org.springframework.security.ldap + + + spring-security-acl + Domain object ACL implementation. + If you need to apply security to specific domain object + instances within your application. + org.springframework.security.acls + + + spring-security-cas-client + Spring Security's CAS client integration. + If you want to use Spring Security web authentication with a + CAS single sign-on server. + org.springframework.security.cas + + + spring-security-openid + OpenID web authentication support. + If you need to authenticate users against an external OpenID + server. + org.springframework.security.openid + + + +
+ There is now a clearer separation of concerns at the jar level. For example, you + only need the web jar (and its transitive dependencies) if you are writing a web + application. This also makes the code easier to navigate and understand. The + dependencies between the 3.0 jars which now make up the same code set of code we + looked at for version 2.0.4 are shown in .
+ Inter-Jar Dependencies + + + + + +
+ + + Package Structure + The package layout in 3.0 is show in . As you can + see, there are no longer any circular references and the structure is much clearer. + The core package and sub packages contain the basic classes and + interfaces which are used throughout the framework and the other two main packages + within the core jar are authentication and + access. The access package containst + access-control/authorization code such as the + AccessDecisionManager and related voter-based + implementations, the interception and method security infrastructure, annotation + classes and support for Spring Security 3.0's expression-based access control. The + authentication package contains the + AuthenticationManager and related classes (such + as authentication exception classes), the simple DAO-based authentication provider + and password-encoders.
+ Spring Security 3.0.0.M1 Package Structure + + + + + +
+ + + + How will these changes affect you? + If you are developing a new application then obviously you won't be affected, other + than by starting out with new package names. But what if you are upgrading an existing + application or another framework to use Spring Security 3.0. The first thing is that you + will obviously need to update build paths and dependency lists to take account of the + new jar modules, but the divisions there are straightforward (see the table above). How + much the package restructuring will affect you will depend on how much you use the + framework classes directly or in explicit bean configurations (if you are only using the + namespace for configuration then it will hide the changes from you). Your IDE should be + able to help with changing imports and finding out where classes have moved to (a simple + Ctrl-Shift-Tor Ctrl-Shift-O in Eclipse can do + wonders). + There are other changes in 3.0 that will affect some users who want to upgrade but for + the most part, the underlying architecture is unchanged. + We hope you enjoy using Spring Security 3.0. +
diff --git a/docs/faq/src/docbook/faq.xml b/docs/faq/src/docbook/faq.xml index fd1b0edcb0..b48d20dfff 100644 --- a/docs/faq/src/docbook/faq.xml +++ b/docs/faq/src/docbook/faq.xml @@ -1,952 +1,952 @@
- - Frequently Answered Questions (FAQ) - -
- General Questions - - - - - Will Spring Security take care of all my application security - requirements? - - - Spring Security provides you with a very flexible framework for your - authentication and authorization requirements, but there are many other - considerations for building a secure application that are outside its - scope. Web applications are vulnerable to all kinds of attacks which you - should be familiar with, preferably before you start development so you - can design and code with them in mind from the beginning. Check out the - OWASP web site for - information on the major issues facing web application developers and - the countermeasures you can use against them. - - - - - Why not just use web.xml security? - - - Let's assume you're developing an enterprise application based on - Spring. There are four security concerns you typically need to address: - authentication, web request security, service layer security (i.e. your - methods that implement business logic), and domain object instance - security (i.e. different domain objects have different permissions). - With these typical requirements in mind: - - Authentication: The servlet specification - provides an approach to authentication. However, you will need - to configure the container to perform authentication which - typically requires editing of container-specific "realm" - settings. This makes a non-portable configuration, and if you - need to write an actual Java class to implement the container's - authentication interface, it becomes even more non-portable. - With Spring Security you achieve complete portability - right - down to the WAR level. Also, Spring Security offers a choice of - production-proven authentication providers and mechanisms, - meaning you can switch your authentication approaches at - deployment time. This is particularly valuable for software - vendors writing products that need to work in an unknown target - environment. - - - Web request security: The servlet - specification provides an approach to secure your request URIs. - However, these URIs can only be expressed in the servlet - specification's own limited URI path format. Spring Security - provides a far more comprehensive approach. For instance, you - can use Ant paths or regular expressions, you can consider parts - of the URI other than simply the requested page (e.g. you can - consider HTTP GET parameters) and you can implement your own - runtime source of configuration data. This means your web - request security can be dynamically changed during the actual - execution of your webapp. - - - Service layer and domain object security: - The absence of support in the servlet specification for services - layer security or domain object instance security represent - serious limitations for multi-tiered applications. Typically - developers either ignore these requirements, or implement - security logic within their MVC controller code (or even worse, - inside the views). There are serious disadvantages with this - approach: - - Separation of concerns: - Authorization is a crosscutting concern and should be - implemented as such. MVC controllers or views - implementing authorization code makes it more difficult - to test both the controller and authorization logic, - more difficult to debug, and will often lead to code - duplication. - - - Support for rich clients and web - services: If an additional client type must - ultimately be supported, any authorization code embedded - within the web layer is non-reusable. It should be - considered that Spring remoting exporters only export - service layer beans (not MVC controllers). As such - authorization logic needs to be located in the services - layer to support a multitude of client types. - - - Layering issues: An MVC - controller or view is simply the incorrect architectural - layer to implement authorization decisions concerning - services layer methods or domain object instances. - Whilst the Principal may be passed to the services layer - to enable it to make the authorization decision, doing - so would introduce an additional argument on every - services layer method. A more elegant approach is to use - a ThreadLocal to hold the Principal, although this would - likely increase development time to a point where it - would become more economical (on a cost-benefit basis) - to simply use a dedicated security framework. - - - Authorisation code quality: It is - often said of web frameworks that they "make it easier - to do the right things, and harder to do the wrong - things". Security frameworks are the same, because they - are designed in an abstract manner for a wide range of - purposes. Writing your own authorization code from - scratch does not provide the "design check" a framework - would offer, and in-house authorization code will - typically lack the improvements that emerge from - widespread deployment, peer review and new versions. - - - - - - For simple applications, servlet specification security may just be - enough. Although when considered within the context of web container - portability, configuration requirements, limited web request security - flexibility, and non-existent services layer and domain object instance - security, it becomes clear why developers often look to alternative - solutions. - - - - - What Java and Spring Framework versions are required? - - - Spring Security 3.0 and 3.1 require at least JDK 1.5 and also - require Spring 3.0.3 as a minimum. Ideally you should be using the latest - release versions to avoid problems. - - Spring Security 2.0.x requires a minimum JDK version of 1.4 and is - built against Spring 2.0.x. It should also be compatible with - applications using Spring 2.5.x. - - - - - I'm new to Spring Security and I need to build an application that - supports CAS single sign-on over HTTPS, while allowing Basic - authentication locally for certain URLs, authenticating against multiple - back end user information sources (LDAP and JDBC). I've copied some - configuration files I found but it doesn't work. What could be wrong? - Or subsititute an alternative complex scenario... - - - Realistically, you need an understanding of the technolgies you are - intending to use before you can successfully build applications with - them. Security is complicated. Setting up a simple configuration using a - login form and some hard-coded users using Spring Security's namespace - is reasonably straightforward. Moving to using a backed JDBC database is - also easy enough. But if you try and jump straight to a complicated - deployment scenario like this you will almost certainly be frustrated. - There is a big jump in the learning curve required to set up systems - like CAS, configure LDAP servers and install SSL certificates properly. - So you need to take things one step at a time. - From a Spring Security perspective, the first thing you should do is - follow the Getting Started guide on the web site. This - will take you through a series of steps to get up and running and get - some idea of how the framework operates. If you are using other - technologies which you aren't familiar with then you should do some - research and try to make sure you can use them in isolation before - combining them in a complex system. - - - - -
-
- Common Problems - - - Authentication - - - When I try to log in, I get an error message that says "Bad - Credentials". What's wrong? - - - This means that authentication has failed. It doesn't say why, as it - is good practice to avoid giving details which might help an attacker - guess account names or passwords. - This also means that if you ask this question in the forum, you will - not get an answer unless you provide additional information. As with any - issue you should check the output from the debug log, note any exception - stacktraces and related messages. Step through the code in a debugger to - see where the authentication fails and why. Write a test case which - exercises your authentication configuration outside of the application. - More often than not, the failure is due to a difference in the password - data stored in a database and that entered by the user. If you are using - hashed passwords, make sure the value stored in your database is - exactly the same as the value produced by the - PasswordEncoder configured in your - application. - - + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> + + Frequently Answered Questions (FAQ) + +
+ General Questions + + + + + Will Spring Security take care of all my application security + requirements? + + + Spring Security provides you with a very flexible framework for your + authentication and authorization requirements, but there are many other + considerations for building a secure application that are outside its + scope. Web applications are vulnerable to all kinds of attacks which you + should be familiar with, preferably before you start development so you + can design and code with them in mind from the beginning. Check out the + OWASP web site for + information on the major issues facing web application developers and + the countermeasures you can use against them. + + + + + Why not just use web.xml security? + + + Let's assume you're developing an enterprise application based on + Spring. There are four security concerns you typically need to address: + authentication, web request security, service layer security (i.e. your + methods that implement business logic), and domain object instance + security (i.e. different domain objects have different permissions). + With these typical requirements in mind: + + Authentication: The servlet specification + provides an approach to authentication. However, you will need + to configure the container to perform authentication which + typically requires editing of container-specific "realm" + settings. This makes a non-portable configuration, and if you + need to write an actual Java class to implement the container's + authentication interface, it becomes even more non-portable. + With Spring Security you achieve complete portability - right + down to the WAR level. Also, Spring Security offers a choice of + production-proven authentication providers and mechanisms, + meaning you can switch your authentication approaches at + deployment time. This is particularly valuable for software + vendors writing products that need to work in an unknown target + environment. + + + Web request security: The servlet + specification provides an approach to secure your request URIs. + However, these URIs can only be expressed in the servlet + specification's own limited URI path format. Spring Security + provides a far more comprehensive approach. For instance, you + can use Ant paths or regular expressions, you can consider parts + of the URI other than simply the requested page (e.g. you can + consider HTTP GET parameters) and you can implement your own + runtime source of configuration data. This means your web + request security can be dynamically changed during the actual + execution of your webapp. + + + Service layer and domain object security: + The absence of support in the servlet specification for services + layer security or domain object instance security represent + serious limitations for multi-tiered applications. Typically + developers either ignore these requirements, or implement + security logic within their MVC controller code (or even worse, + inside the views). There are serious disadvantages with this + approach: + + Separation of concerns: + Authorization is a crosscutting concern and should be + implemented as such. MVC controllers or views + implementing authorization code makes it more difficult + to test both the controller and authorization logic, + more difficult to debug, and will often lead to code + duplication. + + + Support for rich clients and web + services: If an additional client type must + ultimately be supported, any authorization code embedded + within the web layer is non-reusable. It should be + considered that Spring remoting exporters only export + service layer beans (not MVC controllers). As such + authorization logic needs to be located in the services + layer to support a multitude of client types. + + + Layering issues: An MVC + controller or view is simply the incorrect architectural + layer to implement authorization decisions concerning + services layer methods or domain object instances. + Whilst the Principal may be passed to the services layer + to enable it to make the authorization decision, doing + so would introduce an additional argument on every + services layer method. A more elegant approach is to use + a ThreadLocal to hold the Principal, although this would + likely increase development time to a point where it + would become more economical (on a cost-benefit basis) + to simply use a dedicated security framework. + + + Authorisation code quality: It is + often said of web frameworks that they "make it easier + to do the right things, and harder to do the wrong + things". Security frameworks are the same, because they + are designed in an abstract manner for a wide range of + purposes. Writing your own authorization code from + scratch does not provide the "design check" a framework + would offer, and in-house authorization code will + typically lack the improvements that emerge from + widespread deployment, peer review and new versions. + + + + + + For simple applications, servlet specification security may just be + enough. Although when considered within the context of web container + portability, configuration requirements, limited web request security + flexibility, and non-existent services layer and domain object instance + security, it becomes clear why developers often look to alternative + solutions. + + + + + What Java and Spring Framework versions are required? + + + Spring Security 3.0 and 3.1 require at least JDK 1.5 and also + require Spring 3.0.3 as a minimum. Ideally you should be using the latest + release versions to avoid problems. + + Spring Security 2.0.x requires a minimum JDK version of 1.4 and is + built against Spring 2.0.x. It should also be compatible with + applications using Spring 2.5.x. + + + + + I'm new to Spring Security and I need to build an application that + supports CAS single sign-on over HTTPS, while allowing Basic + authentication locally for certain URLs, authenticating against multiple + back end user information sources (LDAP and JDBC). I've copied some + configuration files I found but it doesn't work. What could be wrong? + Or subsititute an alternative complex scenario... + + + Realistically, you need an understanding of the technolgies you are + intending to use before you can successfully build applications with + them. Security is complicated. Setting up a simple configuration using a + login form and some hard-coded users using Spring Security's namespace + is reasonably straightforward. Moving to using a backed JDBC database is + also easy enough. But if you try and jump straight to a complicated + deployment scenario like this you will almost certainly be frustrated. + There is a big jump in the learning curve required to set up systems + like CAS, configure LDAP servers and install SSL certificates properly. + So you need to take things one step at a time. + From a Spring Security perspective, the first thing you should do is + follow the Getting Started guide on the web site. This + will take you through a series of steps to get up and running and get + some idea of how the framework operates. If you are using other + technologies which you aren't familiar with then you should do some + research and try to make sure you can use them in isolation before + combining them in a complex system. + + + + +
+
+ Common Problems + + + Authentication + + + When I try to log in, I get an error message that says "Bad + Credentials". What's wrong? + + + This means that authentication has failed. It doesn't say why, as it + is good practice to avoid giving details which might help an attacker + guess account names or passwords. + This also means that if you ask this question in the forum, you will + not get an answer unless you provide additional information. As with any + issue you should check the output from the debug log, note any exception + stacktraces and related messages. Step through the code in a debugger to + see where the authentication fails and why. Write a test case which + exercises your authentication configuration outside of the application. + More often than not, the failure is due to a difference in the password + data stored in a database and that entered by the user. If you are using + hashed passwords, make sure the value stored in your database is + exactly the same as the value produced by the + PasswordEncoder configured in your + application. + + - - - My application goes into an "endless loop" when I try to login, what's - going on? - - - A common user problem with infinite loop and redirecting to the login - page is caused by accidently configuring the login page as a "secured" - resource. Make sure your configuration allows anonymous access to the - login page, either by excluding it from the security filter chain or - marking it as requiring ROLE_ANONYMOUS. - If your AccessDecisionManager includes an AuthenticatedVoter, you can - use the attribute "IS_AUTHENTICATED_ANONYMOUSLY". This is automatically - available if you are using the standard namespace configuration setup. - From Spring Security 2.0.1 onwards, when you are using - namespace-based configuration, a check will be made on loading the - application context and a warning message logged if your login page - appears to be protected. - - - - - I get an exception with the message "Access is denied (user is - anonymous);". What's wrong? - - - This is a debug level message which occurs the first time an - anonymous user attempts to access a protected resource. - - DEBUG [ExceptionTranslationFilter] - Access is denied (user is anonymous); redirecting to authentication entry point - org.springframework.security.AccessDeniedException: Access is denied - at org.springframework.security.vote.AffirmativeBased.decide(AffirmativeBased.java:68) - at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:262) - - It is normal and shouldn't be anything to worry about. - - - - - Why can I still see a secured page even after I've logged out of my - application? - - - The most common reason for this is that your browser has cached the - page and you are seeing a copy which is being retrieved from the - browsers cache. Verify this by checking whether the browser is actually - sending the request (check your server access logs, the debug log or use - a suitable browser debugging plugin such as Tamper Data - for Firefox). This has nothing to do with Spring Security and you should - configure your application or server to set the appropriate - Cache-Control response headers. Note that SSL - requests are never cached. - - - - - I get an exception with the message "An Authentication object was not - found in the SecurityContext". What's wrong? - - - This is a another debug level message which occurs the first time an - anonymous user attempts to access a protected resource, but when you do - not have an AnonymousAuthenticationFilter in your - filter chain configuration. - - DEBUG [ExceptionTranslationFilter] - Authentication exception occurred; redirecting to authentication entry point - org.springframework.security.AuthenticationCredentialsNotFoundException: - An Authentication object was not found in the SecurityContext - at org.springframework.security.intercept.AbstractSecurityInterceptor.credentialsNotFound(AbstractSecurityInterceptor.java:342) - at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:254) - - It is normal and shouldn't be anything to worry about. - - - - I can't get LDAP authentication to work. What's wrong with my configuration? - - - Note that the permissions for an LDAP directory often do not allow you to read the password - for a user. Hence it is often not possible to use the UserDetailsService - approach where Spring Security compares the stored password with the one submitted by the user. - The most common approach is to use LDAP bind, which is one of the operations - supported by the LDAP protocol. - With this approach, Spring Security validates the password by attempting to authenticate to the directory - as the user. - - The most common problem with LDAP authentication is a lack of knowledge of the - directory server tree structure and configuration. This will be different in different - companies, so you have to find it out yourself. Before adding a Spring Security LDAP - configuration to an application, it's a good idea to write a simple test using standard - Java LDAP code (without Spring Security involved), and make sure you can - get that to work first. For example, to authenticate a user, you could use - the following code: - env = new Hashtable(); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); - env.put(Context.SECURITY_PRINCIPAL, "cn=joe,ou=users,dc=mycompany,dc=com"); - env.put(Context.PROVIDER_URL, "ldap://mycompany.com:389/dc=mycompany,dc=com"); - env.put(Context.SECURITY_CREDENTIALS, "joespassword"); - env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + + + My application goes into an "endless loop" when I try to login, what's + going on? + + + A common user problem with infinite loop and redirecting to the login + page is caused by accidently configuring the login page as a "secured" + resource. Make sure your configuration allows anonymous access to the + login page, either by excluding it from the security filter chain or + marking it as requiring ROLE_ANONYMOUS. + If your AccessDecisionManager includes an AuthenticatedVoter, you can + use the attribute "IS_AUTHENTICATED_ANONYMOUSLY". This is automatically + available if you are using the standard namespace configuration setup. + From Spring Security 2.0.1 onwards, when you are using + namespace-based configuration, a check will be made on loading the + application context and a warning message logged if your login page + appears to be protected. + + + + + I get an exception with the message "Access is denied (user is + anonymous);". What's wrong? + + + This is a debug level message which occurs the first time an + anonymous user attempts to access a protected resource. + + DEBUG [ExceptionTranslationFilter] - Access is denied (user is anonymous); redirecting to authentication entry point + org.springframework.security.AccessDeniedException: Access is denied + at org.springframework.security.vote.AffirmativeBased.decide(AffirmativeBased.java:68) + at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:262) + + It is normal and shouldn't be anything to worry about. + + + + + Why can I still see a secured page even after I've logged out of my + application? + + + The most common reason for this is that your browser has cached the + page and you are seeing a copy which is being retrieved from the + browsers cache. Verify this by checking whether the browser is actually + sending the request (check your server access logs, the debug log or use + a suitable browser debugging plugin such as Tamper Data + for Firefox). This has nothing to do with Spring Security and you should + configure your application or server to set the appropriate + Cache-Control response headers. Note that SSL + requests are never cached. + + + + + I get an exception with the message "An Authentication object was not + found in the SecurityContext". What's wrong? + + + This is a another debug level message which occurs the first time an + anonymous user attempts to access a protected resource, but when you do + not have an AnonymousAuthenticationFilter in your + filter chain configuration. + + DEBUG [ExceptionTranslationFilter] - Authentication exception occurred; redirecting to authentication entry point + org.springframework.security.AuthenticationCredentialsNotFoundException: + An Authentication object was not found in the SecurityContext + at org.springframework.security.intercept.AbstractSecurityInterceptor.credentialsNotFound(AbstractSecurityInterceptor.java:342) + at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:254) + + It is normal and shouldn't be anything to worry about. + + + + I can't get LDAP authentication to work. What's wrong with my configuration? + + + Note that the permissions for an LDAP directory often do not allow you to read the password + for a user. Hence it is often not possible to use the UserDetailsService + approach where Spring Security compares the stored password with the one submitted by the user. + The most common approach is to use LDAP bind, which is one of the operations + supported by the LDAP protocol. + With this approach, Spring Security validates the password by attempting to authenticate to the directory + as the user. + + The most common problem with LDAP authentication is a lack of knowledge of the + directory server tree structure and configuration. This will be different in different + companies, so you have to find it out yourself. Before adding a Spring Security LDAP + configuration to an application, it's a good idea to write a simple test using standard + Java LDAP code (without Spring Security involved), and make sure you can + get that to work first. For example, to authenticate a user, you could use + the following code: + env = new Hashtable(); + env.put(Context.SECURITY_AUTHENTICATION, "simple"); + env.put(Context.SECURITY_PRINCIPAL, "cn=joe,ou=users,dc=mycompany,dc=com"); + env.put(Context.PROVIDER_URL, "ldap://mycompany.com:389/dc=mycompany,dc=com"); + env.put(Context.SECURITY_CREDENTIALS, "joespassword"); + env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); - InitialLdapContext ctx = new InitialLdapContext(env, null); + InitialLdapContext ctx = new InitialLdapContext(env, null); - } - ]]> - - - + } + ]]> + + + - - - Session Management - Session management issues are a common source of forum questions. If you are - developing Java web applications, you should understand how the session is - maintained between the servlet container and the user's browser. You should also - understand the difference between secure and non-secure cookies and the - implications of using HTTP/HTTPS and switching between the two. Spring Security - has nothing to do with maintaining the session or providing session identifiers. - This is entirely handled by the servlet container. + + + Session Management + Session management issues are a common source of forum questions. If you are + developing Java web applications, you should understand how the session is + maintained between the servlet container and the user's browser. You should also + understand the difference between secure and non-secure cookies and the + implications of using HTTP/HTTPS and switching between the two. Spring Security + has nothing to do with maintaining the session or providing session identifiers. + This is entirely handled by the servlet container. - - - I'm using Spring Security's concurrent session control to prevent - users from logging in more than once at a time. When I open another - browser window after logging in, it doesn't stop me from logging in - again. Why can I log in more than once? - - - Browsers generally maintain a single session per browser instance. You - cannot have two separate sessions at once. So if you log in again in - another window or tab you are just reauthenticating in the same session. - The server doesn't know anything about tabs, windows or browser - instances. All it sees are HTTP requests and it ties those to a - particular session according to the value of the the JSESSIONID cookie - that they contain. When a user authenticates during a session, Spring - Security's concurrent session control checks the number of - other authenticated sessions that they have. If - they are already authenticated with the same session, then - re-authenticating will have no effect. - - + + + I'm using Spring Security's concurrent session control to prevent + users from logging in more than once at a time. When I open another + browser window after logging in, it doesn't stop me from logging in + again. Why can I log in more than once? + + + Browsers generally maintain a single session per browser instance. You + cannot have two separate sessions at once. So if you log in again in + another window or tab you are just reauthenticating in the same session. + The server doesn't know anything about tabs, windows or browser + instances. All it sees are HTTP requests and it ties those to a + particular session according to the value of the the JSESSIONID cookie + that they contain. When a user authenticates during a session, Spring + Security's concurrent session control checks the number of + other authenticated sessions that they have. If + they are already authenticated with the same session, then + re-authenticating will have no effect. + + - - - Why does the session Id change when I authenticate through Spring - Security? - - - With the default configuration, Spring Security changes the session ID - when the user authenticates. If you're using a Servlet 3.1 or newer - container, the session ID is simply changed. If you're using an older - container, Spring Security invalidates the existing session, creates a - new session, and transfers the session data to the new session. Changing - the session identifier in this manner prevents - session-fixation attacks. You can find more about this - online and in the reference manual. - - + + + Why does the session Id change when I authenticate through Spring + Security? + + + With the default configuration, Spring Security changes the session ID + when the user authenticates. If you're using a Servlet 3.1 or newer + container, the session ID is simply changed. If you're using an older + container, Spring Security invalidates the existing session, creates a + new session, and transfers the session data to the new session. Changing + the session identifier in this manner prevents + session-fixation attacks. You can find more about this + online and in the reference manual. + + - - - I'm using Tomcat (or some other servlet container) and have enabled - HTTPS for my login page, switching back to HTTP afterwards. It doesn't - work - I just end up back at the login page after authenticating. - - - - This happens because sessions created under HTTPS, for which the - session cookie is marked as secure, cannot subsequently - be used under HTTP. The browser will not send the cookie back to the - server and any session state will be lost (including the security - context information). Starting a session in HTTP first should work as - the session cookie won't be marked as secure. However, Spring - Security's Session Fixation Protection can interfere with this because - it results in a new session ID cookie being sent back to the user's - browser, usually with the secure flag. To get around this, you can - disable session fixation protection, but in newer Servlet containers - you can also configure session cookies to never use the secure flag. - Note that switching between HTTP and HTTPS - is not a good idea in general, as any application which uses HTTP at all - is vulnerable to man-in-the-middle attacks. To be truly secure, the user - should begin accessing your site in HTTPS and continue using it until - they log out. Even clicking on an HTTPS link from a page accessed over - HTTP is potentially risky. If you need more convincing, check out a tool - like sslstrip. - - + + + I'm using Tomcat (or some other servlet container) and have enabled + HTTPS for my login page, switching back to HTTP afterwards. It doesn't + work - I just end up back at the login page after authenticating. + + + + This happens because sessions created under HTTPS, for which the + session cookie is marked as secure, cannot subsequently + be used under HTTP. The browser will not send the cookie back to the + server and any session state will be lost (including the security + context information). Starting a session in HTTP first should work as + the session cookie won't be marked as secure. However, Spring + Security's Session Fixation Protection can interfere with this because + it results in a new session ID cookie being sent back to the user's + browser, usually with the secure flag. To get around this, you can + disable session fixation protection, but in newer Servlet containers + you can also configure session cookies to never use the secure flag. + Note that switching between HTTP and HTTPS + is not a good idea in general, as any application which uses HTTP at all + is vulnerable to man-in-the-middle attacks. To be truly secure, the user + should begin accessing your site in HTTPS and continue using it until + they log out. Even clicking on an HTTPS link from a page accessed over + HTTP is potentially risky. If you need more convincing, check out a tool + like sslstrip. + + - - - I'm not switching between HTTP and HTTPS but my session is still - getting lost - - - Sessions are maintained either by exchanging a session cookie or by - adding the a jsessionid parameter to URLs (this - happens automatically if you are using JSTL to output URLs, or if you - call HttpServletResponse.encodeUrl on URLs (before a - redirect, for example). If clients have cookies disabled, and you are - not rewriting URLs to include the jsessionid, then - the session will be lost. Note that the use of cookies is preferred for - security reasons, as it does not expose the session information in the - URL. - - - - - I'm trying to use the concurrent session-control support but it won't - let me log back in, even if I'm sure I've logged out and haven't - exceeded the allowed sessions. - - - Make sure you have added the listener to your web.xml file. It is - essential to make sure that the Spring Security session registry is - notified when a session is destroyed. Without it, the session - information will not be removed from the registry. - - org.springframework.security.web.session.HttpSessionEventPublisher - ]]> - - - - - - Spring Security is creating a session somewhere, even though I've - configured it not to, by setting the create-session - attribute to never. - - - This usually means that the user's application is creating a session - somewhere, but that they aren't aware of it. The most common culprit is - a JSP. Many people aren't aware that JSPs create sessions by default. To - prevent a JSP from creating a session, add the directive <%@ - page session="false" %> to the top of the page. - If you are having trouble working out where a session is being - created, you can add some debugging code to track down the location(s). - One way to do this would be to add a - javax.servlet.http.HttpSessionListener to your - application, which calls Thread.dumpStack() in the - sessionCreated method. - - - - - Miscellaneous - - - I'm forwarding a request to another URL using the RequestDispatcher, - but my security constraints aren't being applied. - - - Filters are not applied by default to forwards or includes. If you - really want the security filters to be applied to forwards and/or - includes, then you have to configure these explicitly in your web.xml - using the <dispatcher> element, a child element of - <filter-mapping>. - - - - - I have added Spring Security's <global-method-security> element - to my application context but if I add security annotations to my Spring - MVC controller beans (Struts actions etc.) then they don't seem to have - an effect. - - - In a Spring web application, the application context which holds the - Spring MVC beans for the dispatcher servlet is often separate from the - main application context. It is often defined in a file called - myapp-servlet.xml, where myapp is the - name assigned to the Spring DispatcherServlet in - web.xml. An application can have multiple - DispatcherServlets, each with its own isolated - application context. The beans in these child contexts - are not visible to the rest of the application. The - parent application context is loaded by the - ContextLoaderListener you define in your - web.xml and is visible to all the child contexts. - This parent context is usually where you define your security - configuration, including the - <global-method-security> element). As a result - any security constraints applied to methods in these web beans will not - be enforced, since the beans cannot be seen from the - DispatcherServlet context. You need to either - move the <global-method-security> declaration - to the web context or moved the beans you want secured into the main - application context. - Generally we would recommend applying method security at the service - layer rather than on individual web controllers. - - - - - I have a user who has definitely been authenticated, but when I try to - access the SecurityContextHolder during some - requests, the Authentication is null. Why - can't I see the user information? - - - If you have excluded the request from the security filter chain using - the attribute filters='none' in the - <intercept-url> element that matches the URL - pattern, then the SecurityContextHolder will not - be populated for that request. Check the debug log to see whether the - request is passing through the filter chain. (You are reading the debug - log, right?). - - - - -
-
- Spring Security Architecture Questions - - - - - How do I know which package class X is in? - - - The best way of locating classes is by installing the Spring Security - source in your IDE. The distribution includes source jars for each of - the modules the project is divided up into. Add these to your project - source path and you can navigate directly to Spring Security classes - (Ctrl-Shift-T in Eclipse). This also makes debugging - easier and allows you to troubleshoot exceptions by looking directly at - the code where they occur to see what's going on there. - - - - - How do the namespace elements map to conventional bean - configurations? - - - There is a general overview of what beans are created by the namespace - in the namespace appendix of the reference guide. There is also a - detailed blog article called Behind the Spring Security - Namespace on blog.springsource.com. If want to know the full details then the - code is in the spring-security-config module within - the Spring Security 3.0 distribution. You should probably read the - chapters on namespace parsing in the standard Spring Framework reference - documentation first. - - - - - What does ROLE_ mean and why do I need it on my role - names? - - - Spring Security has a voter-based architecture which means that an - access decision is made by a series of - AccessDecisionVoters. The voters act on - the configuration attributes which are specified for a - secured resource (such as a method invocation). With this approach, not - all attributes may be relevant to all voters and a voter needs to know - when it should ignore an attribute (abstain) and when it should vote to - grant or deny access based on the attribute value. The most common voter - is the RoleVoter which by default votes whenever - it finds an attribute with the ROLE_ prefix. It makes a - simple comparison of the attribute (such as ROLE_USER) - with the names of the authorities which the current user has been - assigned. If it finds a match (they have an authority called - ROLE_USER), it votes to grant access, otherwise it votes - to deny access. - The prefix can be changed by setting the - rolePrefix property of - RoleVoter. If you only need to use roles in your - application and have no need for other custom voters, then you can set - the prefix to a blank string, in which case the - RoleVoter will treat all attributes as roles. - - - - - - How do I know which dependencies to add to my application to work with - Spring Security? - - - It will depend on what features you are using and what type of - application you are developing. With Spring Security 3.0, the project - jars are divided into clearly distinct areas of functionality, so it is - straightforward to work out which Spring Security jars you need from - your application requirements. All applications will need the - spring-security-core jar. If you're developing a - web application, you need the spring-security-web - jar. If you're using security namespace configuration you need the - spring-security-config jar, for LDAP support you - need the spring-security-ldap jar and so on. - For third-party jars the situation isn't always quite so obvious. A - good starting point is to copy those from one of the pre-built sample - applications WEB-INF/lib directories. For a basic application, you can - start with the tutorial sample. If you want to use LDAP, with an - embedded test server, then use the LDAP sample as a starting point. The - reference manual also includes - an appendix listing the first-level - dependencies for each Spring Security module with some information on - whether they are optional and what they are required for. - If you are building your project with maven, then adding the - appropriate Spring Security modules as dependencies to your pom.xml will - automatically pull in the core jars that the framework requires. Any - which are marked as "optional" in the Spring Security POM files will - have to be added to your own pom.xml file if you need them. - - - - What dependencies are needed to run an embedded ApacheDS LDAP server? - If you are using Maven, you need to add the folowing to your pom dependencies: - org.apache.directory.server - apacheds-core - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - runtime - + + + I'm not switching between HTTP and HTTPS but my session is still + getting lost + + + Sessions are maintained either by exchanging a session cookie or by + adding the a jsessionid parameter to URLs (this + happens automatically if you are using JSTL to output URLs, or if you + call HttpServletResponse.encodeUrl on URLs (before a + redirect, for example). If clients have cookies disabled, and you are + not rewriting URLs to include the jsessionid, then + the session will be lost. Note that the use of cookies is preferred for + security reasons, as it does not expose the session information in the + URL. + + + + + I'm trying to use the concurrent session-control support but it won't + let me log back in, even if I'm sure I've logged out and haven't + exceeded the allowed sessions. + + + Make sure you have added the listener to your web.xml file. It is + essential to make sure that the Spring Security session registry is + notified when a session is destroyed. Without it, the session + information will not be removed from the registry. + + org.springframework.security.web.session.HttpSessionEventPublisher + ]]> + + + + + + Spring Security is creating a session somewhere, even though I've + configured it not to, by setting the create-session + attribute to never. + + + This usually means that the user's application is creating a session + somewhere, but that they aren't aware of it. The most common culprit is + a JSP. Many people aren't aware that JSPs create sessions by default. To + prevent a JSP from creating a session, add the directive <%@ + page session="false" %> to the top of the page. + If you are having trouble working out where a session is being + created, you can add some debugging code to track down the location(s). + One way to do this would be to add a + javax.servlet.http.HttpSessionListener to your + application, which calls Thread.dumpStack() in the + sessionCreated method. + + + + + Miscellaneous + + + I'm forwarding a request to another URL using the RequestDispatcher, + but my security constraints aren't being applied. + + + Filters are not applied by default to forwards or includes. If you + really want the security filters to be applied to forwards and/or + includes, then you have to configure these explicitly in your web.xml + using the <dispatcher> element, a child element of + <filter-mapping>. + + + + + I have added Spring Security's <global-method-security> element + to my application context but if I add security annotations to my Spring + MVC controller beans (Struts actions etc.) then they don't seem to have + an effect. + + + In a Spring web application, the application context which holds the + Spring MVC beans for the dispatcher servlet is often separate from the + main application context. It is often defined in a file called + myapp-servlet.xml, where myapp is the + name assigned to the Spring DispatcherServlet in + web.xml. An application can have multiple + DispatcherServlets, each with its own isolated + application context. The beans in these child contexts + are not visible to the rest of the application. The + parent application context is loaded by the + ContextLoaderListener you define in your + web.xml and is visible to all the child contexts. + This parent context is usually where you define your security + configuration, including the + <global-method-security> element). As a result + any security constraints applied to methods in these web beans will not + be enforced, since the beans cannot be seen from the + DispatcherServlet context. You need to either + move the <global-method-security> declaration + to the web context or moved the beans you want secured into the main + application context. + Generally we would recommend applying method security at the service + layer rather than on individual web controllers. + + + + + I have a user who has definitely been authenticated, but when I try to + access the SecurityContextHolder during some + requests, the Authentication is null. Why + can't I see the user information? + + + If you have excluded the request from the security filter chain using + the attribute filters='none' in the + <intercept-url> element that matches the URL + pattern, then the SecurityContextHolder will not + be populated for that request. Check the debug log to see whether the + request is passing through the filter chain. (You are reading the debug + log, right?). + + + + +
+
+ Spring Security Architecture Questions + + + + + How do I know which package class X is in? + + + The best way of locating classes is by installing the Spring Security + source in your IDE. The distribution includes source jars for each of + the modules the project is divided up into. Add these to your project + source path and you can navigate directly to Spring Security classes + (Ctrl-Shift-T in Eclipse). This also makes debugging + easier and allows you to troubleshoot exceptions by looking directly at + the code where they occur to see what's going on there. + + + + + How do the namespace elements map to conventional bean + configurations? + + + There is a general overview of what beans are created by the namespace + in the namespace appendix of the reference guide. There is also a + detailed blog article called Behind the Spring Security + Namespace on blog.springsource.com. If want to know the full details then the + code is in the spring-security-config module within + the Spring Security 3.0 distribution. You should probably read the + chapters on namespace parsing in the standard Spring Framework reference + documentation first. + + + + + What does ROLE_ mean and why do I need it on my role + names? + + + Spring Security has a voter-based architecture which means that an + access decision is made by a series of + AccessDecisionVoters. The voters act on + the configuration attributes which are specified for a + secured resource (such as a method invocation). With this approach, not + all attributes may be relevant to all voters and a voter needs to know + when it should ignore an attribute (abstain) and when it should vote to + grant or deny access based on the attribute value. The most common voter + is the RoleVoter which by default votes whenever + it finds an attribute with the ROLE_ prefix. It makes a + simple comparison of the attribute (such as ROLE_USER) + with the names of the authorities which the current user has been + assigned. If it finds a match (they have an authority called + ROLE_USER), it votes to grant access, otherwise it votes + to deny access. + The prefix can be changed by setting the + rolePrefix property of + RoleVoter. If you only need to use roles in your + application and have no need for other custom voters, then you can set + the prefix to a blank string, in which case the + RoleVoter will treat all attributes as roles. + + + + + + How do I know which dependencies to add to my application to work with + Spring Security? + + + It will depend on what features you are using and what type of + application you are developing. With Spring Security 3.0, the project + jars are divided into clearly distinct areas of functionality, so it is + straightforward to work out which Spring Security jars you need from + your application requirements. All applications will need the + spring-security-core jar. If you're developing a + web application, you need the spring-security-web + jar. If you're using security namespace configuration you need the + spring-security-config jar, for LDAP support you + need the spring-security-ldap jar and so on. + For third-party jars the situation isn't always quite so obvious. A + good starting point is to copy those from one of the pre-built sample + applications WEB-INF/lib directories. For a basic application, you can + start with the tutorial sample. If you want to use LDAP, with an + embedded test server, then use the LDAP sample as a starting point. The + reference manual also includes + an appendix listing the first-level + dependencies for each Spring Security module with some information on + whether they are optional and what they are required for. + If you are building your project with maven, then adding the + appropriate Spring Security modules as dependencies to your pom.xml will + automatically pull in the core jars that the framework requires. Any + which are marked as "optional" in the Spring Security POM files will + have to be added to your own pom.xml file if you need them. + + + + What dependencies are needed to run an embedded ApacheDS LDAP server? + If you are using Maven, you need to add the folowing to your pom dependencies: + org.apache.directory.server + apacheds-core + 1.5.5 + runtime + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + runtime + ]]>. The other required jars should be pulled in transitively. - - - - - What is a UserDetailsService and do I need - one? - - - UserDetailsService is a DAO interface - for loading data that is specific to a user account. It has no other - function other to load that data for use by other components within the - framework. It is not responsible for authenticating the user. - Authenticating a user with a username/password combination is most - commonly performed by the - DaoAuthenticationProvider, which is injected with - a UserDetailsService to allow it to load - the password (and other data) for a user in order to compare it with the - submitted value. Note that if you are using LDAP, - this approach may not work. - If you want to customize the authentication process then you should - implement AuthenticationProvider - yourself. See this blog article for an example integrating Spring Security - authentication with Google App Engine. - - - - -
-
- Common <quote>Howto</quote> Requests - - - - - I need to login in with more information than just the username. How - do I add support for extra login fields (e.g. a company name)? - - - This question comes up repeatedly in the Spring Security forum so you - will find more information there by searching the archives (or through - google). - The submitted login information is processed by an instance of - UsernamePasswordAuthenticationFilter. You will - need to customize this class to handle the extra data field(s). One - option is to use your own customized authentication token class (rather - than the standard - UsernamePasswordAuthenticationToken), another is - simply to concatenate the extra fields with the username (for example, - using a ":" as the separator) and pass them in the username property of - UsernamePasswordAuthenticationToken. - You will also need to customize the actual authentication process. If - you are using a custom authentication token class, for example, you will - have to write an AuthenticationProvider to handle - it (or extend the standard - DaoAuthenticationProvider). If you have - concatenated the fields, you can implement your own - UserDetailsService which splits them up - and loads the appropriate user data for authentication. - - - - - How do I apply different intercept-url constraints - where only the fragment value of the requested URLs differs (e.g. - /foo#bar and /foo#blah? - - - You can't do this, since the fragment is not transmitted from the - browser to the server. The URLs above are identical from the server's - perspective. This is a common question from GWT users. - - + + + + + What is a UserDetailsService and do I need + one? + + + UserDetailsService is a DAO interface + for loading data that is specific to a user account. It has no other + function other to load that data for use by other components within the + framework. It is not responsible for authenticating the user. + Authenticating a user with a username/password combination is most + commonly performed by the + DaoAuthenticationProvider, which is injected with + a UserDetailsService to allow it to load + the password (and other data) for a user in order to compare it with the + submitted value. Note that if you are using LDAP, + this approach may not work. + If you want to customize the authentication process then you should + implement AuthenticationProvider + yourself. See this blog article for an example integrating Spring Security + authentication with Google App Engine. + + + + +
+
+ Common <quote>Howto</quote> Requests + + + + + I need to login in with more information than just the username. How + do I add support for extra login fields (e.g. a company name)? + + + This question comes up repeatedly in the Spring Security forum so you + will find more information there by searching the archives (or through + google). + The submitted login information is processed by an instance of + UsernamePasswordAuthenticationFilter. You will + need to customize this class to handle the extra data field(s). One + option is to use your own customized authentication token class (rather + than the standard + UsernamePasswordAuthenticationToken), another is + simply to concatenate the extra fields with the username (for example, + using a ":" as the separator) and pass them in the username property of + UsernamePasswordAuthenticationToken. + You will also need to customize the actual authentication process. If + you are using a custom authentication token class, for example, you will + have to write an AuthenticationProvider to handle + it (or extend the standard + DaoAuthenticationProvider). If you have + concatenated the fields, you can implement your own + UserDetailsService which splits them up + and loads the appropriate user data for authentication. + + + + + How do I apply different intercept-url constraints + where only the fragment value of the requested URLs differs (e.g. + /foo#bar and /foo#blah? + + + You can't do this, since the fragment is not transmitted from the + browser to the server. The URLs above are identical from the server's + perspective. This is a common question from GWT users. + + - - - How do I access the user's IP Address (or other web-request data) in a - UserDetailsService? - - - Obviously you can't (without resorting to something like thread-local - variables) since the only information supplied to the interface is the - username. Instead of implementing - UserDetailsService, you should implement - AuthenticationProvider directly and - extract the information from the supplied - Authentication token. - In a standard web setup, the getDetails() - method on the Authentication object will - return an instance of WebAuthenticationDetails. - If you need additional information, you can inject a custom - AuthenticationDetailsSource into the - authentication filter you are using. If you are using the namespace, for - example with the <form-login> element, then you - should remove this element and replace it with a - <custom-filter> declaration pointing to an - explicitly configured - UsernamePasswordAuthenticationFilter. - - + + + How do I access the user's IP Address (or other web-request data) in a + UserDetailsService? + + + Obviously you can't (without resorting to something like thread-local + variables) since the only information supplied to the interface is the + username. Instead of implementing + UserDetailsService, you should implement + AuthenticationProvider directly and + extract the information from the supplied + Authentication token. + In a standard web setup, the getDetails() + method on the Authentication object will + return an instance of WebAuthenticationDetails. + If you need additional information, you can inject a custom + AuthenticationDetailsSource into the + authentication filter you are using. If you are using the namespace, for + example with the <form-login> element, then you + should remove this element and replace it with a + <custom-filter> declaration pointing to an + explicitly configured + UsernamePasswordAuthenticationFilter. + + - - - How do I access the HttpSession from a - UserDetailsService? - - - You can't, since the UserDetailsService - has no awareness of the servlet API. If you want to store custom user - data, then you should customize the - UserDetails object which is returned. - This can then be accessed at any point, via the thread-local - SecurityContextHolder. A call to - SecurityContextHolder.getContext().getAuthentication().getPrincipal() - will return this custom object. - If you really need to access the session, then it must be done by - customizing the web tier. - - + + + How do I access the HttpSession from a + UserDetailsService? + + + You can't, since the UserDetailsService + has no awareness of the servlet API. If you want to store custom user + data, then you should customize the + UserDetails object which is returned. + This can then be accessed at any point, via the thread-local + SecurityContextHolder. A call to + SecurityContextHolder.getContext().getAuthentication().getPrincipal() + will return this custom object. + If you really need to access the session, then it must be done by + customizing the web tier. + + - - - How do I access the user's password in a - UserDetailsService? - - - You can't (and shouldn't). You are probably misunderstanding its purpose. - See What is a UserDetailsService? - above. - - - + + + How do I access the user's password in a + UserDetailsService? + + + You can't (and shouldn't). You are probably misunderstanding its purpose. + See What is a UserDetailsService? + above. + + + - - - How do I define the secured URLs within an application - dynamically? - - - People often ask about how to store the mapping between secured URLs - and security metadata attributes in a database, rather than in the - application context. - The first thing you should ask yourself is if you really need to do - this. If an application requires securing, then it also requires that - the security be tested thoroughly based on a defined policy. It may - require auditing and acceptance testing before being rolled out into a - production environment. A security-conscious organization should be - aware that the benefits of their diligent testing process could be wiped - out instantly by allowing the security settings to be modified at - runtime by changing a row or two in a configuration database. If you - have taken this into account (perhaps using multiple layers of security - within your application) then Spring Security allows you to fully - customize the source of security metadata. You can make it fully dynamic - if you choose. - Both method and web security are protected by subclasses of - AbstractSecurityInterceptor which is configured - with a SecurityMetadataSource from which - it obtains the metadata for a particular method or filter invocation. - For web security, the interceptor class is - FilterSecurityInterceptor and it uses the marker - interface - FilterInvocationSecurityMetadataSource. - The secured object type it operates on is a - FilterInvocation. The default implementation - which is used (both in the namespace <http> and - when configuring the interceptor explicitly, stores the list of URL - patterns and their corresponding list of configuration - attributes (instances of - ConfigAttribute) in an in-memory map. - To load the data from an alternative source, you must be using an - explicitly declared security filter chain (typically Spring Security's - FilterChainProxy) in order to customize the - FilterSecurityInterceptor bean. You can't use the - namespace. You would then implement - FilterInvocationSecurityMetadataSource to - load the data as you please for a particular - FilterInvocation - The FilterInvocation object contains the - HttpServletRequest, so you can obtain the URL - or any other relevant information on which to base your decision on - what the list of returned attributes will contain. - . A very basic outline would look something like this: + + How do I define the secured URLs within an application + dynamically? + + + People often ask about how to store the mapping between secured URLs + and security metadata attributes in a database, rather than in the + application context. + The first thing you should ask yourself is if you really need to do + this. If an application requires securing, then it also requires that + the security be tested thoroughly based on a defined policy. It may + require auditing and acceptance testing before being rolled out into a + production environment. A security-conscious organization should be + aware that the benefits of their diligent testing process could be wiped + out instantly by allowing the security settings to be modified at + runtime by changing a row or two in a configuration database. If you + have taken this into account (perhaps using multiple layers of security + within your application) then Spring Security allows you to fully + customize the source of security metadata. You can make it fully dynamic + if you choose. + Both method and web security are protected by subclasses of + AbstractSecurityInterceptor which is configured + with a SecurityMetadataSource from which + it obtains the metadata for a particular method or filter invocation. + For web security, the interceptor class is + FilterSecurityInterceptor and it uses the marker + interface + FilterInvocationSecurityMetadataSource. + The secured object type it operates on is a + FilterInvocation. The default implementation + which is used (both in the namespace <http> and + when configuring the interceptor explicitly, stores the list of URL + patterns and their corresponding list of configuration + attributes (instances of + ConfigAttribute) in an in-memory map. + To load the data from an alternative source, you must be using an + explicitly declared security filter chain (typically Spring Security's + FilterChainProxy) in order to customize the + FilterSecurityInterceptor bean. You can't use the + namespace. You would then implement + FilterInvocationSecurityMetadataSource to + load the data as you please for a particular + FilterInvocation + The FilterInvocation object contains the + HttpServletRequest, so you can obtain the URL + or any other relevant information on which to base your decision on + what the list of returned attributes will contain. + . A very basic outline would look something like this: getAttributes(Object object) { - FilterInvocation fi = (FilterInvocation) object; - String url = fi.getRequestUrl(); - String httpMethod = fi.getRequest().getMethod(); - List attributes = new ArrayList(); + public List getAttributes(Object object) { + FilterInvocation fi = (FilterInvocation) object; + String url = fi.getRequestUrl(); + String httpMethod = fi.getRequest().getMethod(); + List attributes = new ArrayList(); - // Lookup your database (or other source) using this information and populate the - // list of attributes + // Lookup your database (or other source) using this information and populate the + // list of attributes - return attributes; - } + return attributes; + } - public Collection getAllConfigAttributes() { - return null; - } + public Collection getAllConfigAttributes() { + return null; + } - public boolean supports(Class clazz) { - return FilterInvocation.class.isAssignableFrom(clazz); - } + public boolean supports(Class clazz) { + return FilterInvocation.class.isAssignableFrom(clazz); + } } ]]> For more information, look at the code for - DefaultFilterInvocationSecurityMetadataSource. - - - + DefaultFilterInvocationSecurityMetadataSource. + + + - - - How do I authenticate against LDAP but load user roles from a - database? - - - The LdapAuthenticationProvider bean (which handles - normal LDAP authentication in Spring Security) is configured with two - separate strategy interfaces, one which performs the authenticatation - and one which loads the user authorities, called - LdapAuthenticator and - LdapAuthoritiesPopulator respectively. - The DefaultLdapAuthoritiesPopulator loads the - user authorities from the LDAP directory and has various configuration - parameters to allow you to specify how these should be retrieved. - To use JDBC instead, you can implement the interface yourself, using - whatever SQL is appropriate for your schema: + + How do I authenticate against LDAP but load user roles from a + database? + + + The LdapAuthenticationProvider bean (which handles + normal LDAP authentication in Spring Security) is configured with two + separate strategy interfaces, one which performs the authenticatation + and one which loads the user authorities, called + LdapAuthenticator and + LdapAuthoritiesPopulator respectively. + The DefaultLdapAuthoritiesPopulator loads the + user authorities from the LDAP directory and has various configuration + parameters to allow you to specify how these should be retrieved. + To use JDBC instead, you can implement the interface yourself, using + whatever SQL is appropriate for your schema: getGrantedAuthorities(DirContextOperations userData, String username) { - List = template.query("select role from roles where username = ?", - new String[] {username}, - new RowMapper() { - /** - * We're assuming here that you're using the standard convention of using the role - * prefix "ROLE_" to mark attributes which are supported by Spring Security's RoleVoter. - */ - public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException { - return new GrantedAuthorityImpl("ROLE_" + rs.getString(1); - } - } - } + List getGrantedAuthorities(DirContextOperations userData, String username) { + List = template.query("select role from roles where username = ?", + new String[] {username}, + new RowMapper() { + /** + * We're assuming here that you're using the standard convention of using the role + * prefix "ROLE_" to mark attributes which are supported by Spring Security's RoleVoter. + */ + public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException { + return new GrantedAuthorityImpl("ROLE_" + rs.getString(1); + } + } + } } ]]> You would then add a bean of this type to your application context and inject - it into the LdapAuthenticationProvider. This is covered in - the section on configuring LDAP using explicit Spring beans in the LDAP - chapter of the reference manual. Note that you can't use the namespace - for configuration in this case. You should also consult the Javadoc for - the relevant classes and interfaces. - - - - - I want to modify the property of a bean that is created by the - namespace, but there is nothing in the schema to support it. What can I - do short of abandoning namespace use? - - - The namespace functionality is intentionally limited, so it doesn't - cover everything that you can do with plain beans. If you want to do - something simple, like modify a bean, or inject a different dependency, - you can do this by adding a - BeanPostProcessor to your configuration. - More information can be found in the Spring Reference Manual. In order to do this, you need to know a - bit about which beans are created, so you should also read the blog - article in the above question on how the namespace maps to - Spring beans. - Normally, you would add the functionality you require to the - postProcessBeforeInitialization method of - BeanPostProcessor. Let's say that you - want to customize the - AuthenticationDetailsSource used by the - UsernamePasswordAuthenticationFilter, (created by - the form-login element). You want to extract a - particular header called CUSTOM_HEADERfrom the - request and make use of it while authenticating the user. The processor - class would look like this: LdapAuthenticationProvider. This is covered in + the section on configuring LDAP using explicit Spring beans in the LDAP + chapter of the reference manual. Note that you can't use the namespace + for configuration in this case. You should also consult the Javadoc for + the relevant classes and interfaces. + + + + + I want to modify the property of a bean that is created by the + namespace, but there is nothing in the schema to support it. What can I + do short of abandoning namespace use? + + + The namespace functionality is intentionally limited, so it doesn't + cover everything that you can do with plain beans. If you want to do + something simple, like modify a bean, or inject a different dependency, + you can do this by adding a + BeanPostProcessor to your configuration. + More information can be found in the Spring Reference Manual. In order to do this, you need to know a + bit about which beans are created, so you should also read the blog + article in the above question on how the namespace maps to + Spring beans. + Normally, you would add the functionality you require to the + postProcessBeforeInitialization method of + BeanPostProcessor. Let's say that you + want to customize the + AuthenticationDetailsSource used by the + UsernamePasswordAuthenticationFilter, (created by + the form-login element). You want to extract a + particular header called CUSTOM_HEADERfrom the + request and make use of it while authenticating the user. The processor + class would look like this: You would then register this bean in your application context. Spring will - automatically invoke it on the beans defined in the application context. - - - + automatically invoke it on the beans defined in the application context. + + + - - -
+ + +
diff --git a/itest/context/pom.xml b/itest/context/pom.xml index 78ab048d4a..e4f8750103 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -8,160 +8,160 @@ itest-context http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.python - jython - 2.5.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - javax.servlet - javax.servlet-api - 3.0.1 - test - - - junit - junit - 4.11 - test - - - org.aspectj - aspectjweaver - 1.8.4 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - - - org.springframework - spring-web - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.python + jython + 2.5.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + javax.servlet + javax.servlet-api + 3.0.1 + test + + + junit + junit + 4.11 + test + + + org.aspectj + aspectjweaver + 1.8.4 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + + + org.springframework + spring-web + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml index 3b2a055e08..eadd0dbaa3 100644 --- a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml @@ -5,99 +5,99 @@ --> + xmlns:sec="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - + - + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml index 9c77ad8834..3c6225451c 100644 --- a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml +++ b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml @@ -5,46 +5,46 @@ --> + xmlns:sec="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + diff --git a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml index be32811559..123bfdb38d 100644 --- a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml +++ b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml @@ -5,28 +5,28 @@ --> + xmlns:b="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + + diff --git a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml old mode 100755 new mode 100644 index 1cbfbc2d2d..959c1eeb82 --- a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml +++ b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml @@ -1,26 +1,26 @@ + xmlns:b="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - - - + + + - - - - - - - + + + + + + + diff --git a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml index 5da11cc959..cabc71b11b 100644 --- a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml @@ -1,26 +1,26 @@ + xmlns:sec="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - - + + + + + + - + - + - - - - - - - + + + + + + + diff --git a/itest/context/src/integration-test/resources/python-method-access-app-context.xml b/itest/context/src/integration-test/resources/python-method-access-app-context.xml old mode 100755 new mode 100644 index 54cf0ba4b8..dcacf74279 --- a/itest/context/src/integration-test/resources/python-method-access-app-context.xml +++ b/itest/context/src/integration-test/resources/python-method-access-app-context.xml @@ -1,34 +1,34 @@ + xmlns:b="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:security="http://www.springframework.org/schema/security" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - - - + + + + + + + - - - + + + - + - - - - - - - + + + + + + + diff --git a/itest/web/pom.xml b/itest/web/pom.xml index 37dd364bdd..f1522a9f65 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -8,207 +8,207 @@ itest-web http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - net.sourceforge.jwebunit - jwebunit-core - 2.2 - test - - - regexp - regexp - - - servlet-api - javax.servlet - - - - - net.sourceforge.jwebunit - jwebunit-htmlunit-plugin - 2.2 - test - - - servlet-api - javax.servlet - - - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.mortbay.jetty - jetty - 6.1.26 - test - - - servlet-api - org.mortbay.jetty - - - - - org.mortbay.jetty - jetty-util - 6.1.26 - test - - - org.mortbay.jetty - jsp-2.1-jetty - 6.1.26 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-ldap - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - test - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - test - - - org.springframework - spring-beans - 4.1.5.RELEASE - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - test - - - org.testng - testng - 5.11 - jdk15 - test - + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + net.sourceforge.jwebunit + jwebunit-core + 2.2 + test + + + regexp + regexp + + + servlet-api + javax.servlet + + + + + net.sourceforge.jwebunit + jwebunit-htmlunit-plugin + 2.2 + test + + + servlet-api + javax.servlet + + + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.mortbay.jetty + jetty + 6.1.26 + test + + + servlet-api + org.mortbay.jetty + + + + + org.mortbay.jetty + jetty-util + 6.1.26 + test + + + org.mortbay.jetty + jsp-2.1-jetty + 6.1.26 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-ldap + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + test + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + test + + + org.springframework + spring-beans + 4.1.5.RELEASE + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + test + + + org.testng + testng + 5.11 + jdk15 + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/itest/web/src/main/webapp/WEB-INF/http-security.xml b/itest/web/src/main/webapp/WEB-INF/http-security.xml index ac3bfde929..9d31e84f4a 100644 --- a/itest/web/src/main/webapp/WEB-INF/http-security.xml +++ b/itest/web/src/main/webapp/WEB-INF/http-security.xml @@ -1,36 +1,36 @@ + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - + + - - - + + + - - + + - - + + - - - + + + - + - - + + - + diff --git a/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml b/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml index f462e0188f..5cfbcb4a1d 100644 --- a/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml +++ b/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml @@ -6,17 +6,17 @@ --> + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - - - + + + - + diff --git a/itest/web/src/main/webapp/WEB-INF/testapp-servlet.xml b/itest/web/src/main/webapp/WEB-INF/testapp-servlet.xml index 6c76c4743e..317c6ff74b 100644 --- a/itest/web/src/main/webapp/WEB-INF/testapp-servlet.xml +++ b/itest/web/src/main/webapp/WEB-INF/testapp-servlet.xml @@ -1,8 +1,8 @@ + xmlns:p="http://www.springframework.org/schema/p" 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/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - + + diff --git a/itest/web/src/main/webapp/WEB-INF/web.xml b/itest/web/src/main/webapp/WEB-INF/web.xml index 7a49852f2d..cb136efed5 100644 --- a/itest/web/src/main/webapp/WEB-INF/web.xml +++ b/itest/web/src/main/webapp/WEB-INF/web.xml @@ -4,18 +4,18 @@ - Integration Tests Webapp + Integration Tests Webapp - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - + diff --git a/ldap/pom.xml b/ldap/pom.xml index 8399defd90..967fc2eb58 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -8,207 +8,207 @@ spring-security-ldap http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.ldap - spring-ldap-core - 2.0.2.RELEASE - compile - - - spring-beans - org.springframework - - - spring-core - org.springframework - - - spring-data-commons - org.springframework.data - - - commons-logging - commons-logging - - - spring-tx - org.springframework - - - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - ldapsdk - ldapsdk - 4.1 - compile - true - - - org.apache.directory.server - apacheds-core - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - compile - true - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - compile - true - - - org.apache.directory.shared - shared-ldap - 0.9.15 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.slf4j - slf4j-api - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.ldap + spring-ldap-core + 2.0.2.RELEASE + compile + + + spring-beans + org.springframework + + + spring-core + org.springframework + + + spring-data-commons + org.springframework.data + + + commons-logging + commons-logging + + + spring-tx + org.springframework + + + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + ldapsdk + ldapsdk + 4.1 + compile + true + + + org.apache.directory.server + apacheds-core + 1.5.5 + compile + true + + + org.apache.directory.server + apacheds-core-entry + 1.5.5 + compile + true + + + org.apache.directory.server + apacheds-protocol-ldap + 1.5.5 + compile + true + + + org.apache.directory.server + apacheds-protocol-shared + 1.5.5 + compile + true + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + compile + true + + + org.apache.directory.shared + shared-ldap + 0.9.15 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.slf4j + slf4j-api + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/ldap/src/integration-test/resources/logback-test.xml b/ldap/src/integration-test/resources/logback-test.xml index 60cd6fd4ee..12b953c56c 100644 --- a/ldap/src/integration-test/resources/logback-test.xml +++ b/ldap/src/integration-test/resources/logback-test.xml @@ -1,8 +1,8 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + @@ -12,7 +12,7 @@ - + diff --git a/messaging/pom.xml b/messaging/pom.xml index cfad0797cf..d9e0defbab 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -8,241 +8,241 @@ spring-security-messaging http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-expression - 4.1.5.RELEASE - compile - - - org.springframework - spring-messaging - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - compile - true - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - true - - - org.springframework - spring-websocket - 4.1.5.RELEASE - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-codec - commons-codec - 1.10 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy-all - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.hsqldb - hsqldb - 2.3.2 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.powermock - powermock-api-mockito - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-support - 1.6.0 - test - - - org.powermock - powermock-core - 1.6.0 - test - - - org.powermock - powermock-module-junit4 - 1.6.0 - test - - - org.powermock - powermock-module-junit4-common - 1.6.0 - test - - - org.powermock - powermock-reflect - 1.6.0 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-expression + 4.1.5.RELEASE + compile + + + org.springframework + spring-messaging + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + compile + true + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + true + + + org.springframework + spring-websocket + 4.1.5.RELEASE + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-codec + commons-codec + 1.10 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy-all + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.hsqldb + hsqldb + 2.3.2 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.powermock + powermock-api-mockito + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-support + 1.6.0 + test + + + org.powermock + powermock-core + 1.6.0 + test + + + org.powermock + powermock-module-junit4 + 1.6.0 + test + + + org.powermock + powermock-module-junit4-common + 1.6.0 + test + + + org.powermock + powermock-reflect + 1.6.0 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/openid/pom.xml b/openid/pom.xml index f17f3dcba1..8c8a642d4a 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -8,172 +8,172 @@ spring-security-openid http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - com.google.inject - guice - 2.0 - compile - - - org.openid4java - openid4java-nodeps - 0.9.6 - compile - - - guice - com.google.code.guice - - - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - net.sourceforge.nekohtml - nekohtml - 1.9.20 - runtime - - - org.apache.httpcomponents - httpclient - 4.2.3 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + com.google.inject + guice + 2.0 + compile + + + org.openid4java + openid4java-nodeps + 0.9.6 + compile + + + guice + com.google.code.guice + + + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + net.sourceforge.nekohtml + nekohtml + 1.9.20 + runtime + + + org.apache.httpcomponents + httpclient + 4.2.3 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/remoting/pom.xml b/remoting/pom.xml index ba6657d1ba..52ed718eea 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -8,130 +8,130 @@ spring-security-remoting http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/aspectj-jc/pom.xml b/samples/aspectj-jc/pom.xml index 726f7c98f0..50f19c2982 100644 --- a/samples/aspectj-jc/pom.xml +++ b/samples/aspectj-jc/pom.xml @@ -8,113 +8,113 @@ spring-security-samples-aspectj-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.aspectj - aspectjrt - 1.8.4 - compile - true - - - org.springframework.security - spring-security-aspects - 4.0.0.CI-SNAPSHOT - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.aspectj + aspectjrt + 1.8.4 + compile + true + + + org.springframework.security + spring-security-aspects + 4.0.0.CI-SNAPSHOT + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/aspectj-jc/src/test/resources/logback-test.xml b/samples/aspectj-jc/src/test/resources/logback-test.xml index f293b342dc..ddf04b2972 100644 --- a/samples/aspectj-jc/src/test/resources/logback-test.xml +++ b/samples/aspectj-jc/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 7ce745a03c..6d1b1bacb0 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -8,113 +8,113 @@ spring-security-samples-aspectj-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.aspectj - aspectjrt - 1.8.4 - compile - true - - - org.springframework.security - spring-security-aspects - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.aspectj + aspectjrt + 1.8.4 + compile + true + + + org.springframework.security + spring-security-aspects + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 953d422d64..6a4e89c5ba 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -9,206 +9,206 @@ spring-security-samples-cassample-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.jasig.cas.client - cas-client-core - 3.3.3 - compile - - - org.springframework.security - spring-security-cas - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - net.sf.ehcache - ehcache - 2.9.0 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework - spring-context-support - 4.1.5.RELEASE - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.eclipse.jetty - jetty-server - 8.1.9.v20130131 - test - - - org.eclipse.jetty - jetty-servlet - 8.1.9.v20130131 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.jasig.cas.client + cas-client-core + 3.3.3 + compile + + + org.springframework.security + spring-security-cas + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + net.sf.ehcache + ehcache + 2.9.0 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework + spring-context-support + 4.1.5.RELEASE + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.eclipse.jetty + jetty-server + 8.1.9.v20130131 + test + + + org.eclipse.jetty + jetty-servlet + 8.1.9.v20130131 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /spring-security-samples-cassample-xml + /spring-security-samples-cassample-xml - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml index 700604b077..cd09db0707 100644 --- a/samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -1,124 +1,124 @@ + xmlns="http://www.springframework.org/schema/security" + xmlns:p="http://www.springframework.org/schema/p" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="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-3.0.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - localhost:8443 - localhost:9443 - + + + + localhost:8443 + localhost:9443 + diff --git a/samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml b/samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml index 0c45c39474..f2f270f314 100644 --- a/samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml @@ -5,81 +5,81 @@ --> - Spring Security CAS Demo Application + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + Spring Security CAS Demo Application - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + - - webAppRootKey - cas.root - + + webAppRootKey + cas.root + - - - characterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - characterEncodingFilter - /* - - - springSecurityFilterChain - /* - + + characterEncodingFilter + /* + + + springSecurityFilterChain + /* + - - - org.jasig.cas.client.session.SingleSignOutHttpSessionListener - + + + org.jasig.cas.client.session.SingleSignOutHttpSessionListener + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - ptSampleServlet - org.springframework.security.samples.cas.web.ProxyTicketSampleServlet - + + ptSampleServlet + org.springframework.security.samples.cas.web.ProxyTicketSampleServlet + - - ptSampleServlet - /secure/ptSample - - - 403 - /403.jsp - + + ptSampleServlet + /secure/ptSample + + + 403 + /403.jsp + diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index 5578423fed..99b3e50f7e 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -9,98 +9,98 @@ spring-security-samples-casserver http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /spring-security-samples-casserver + /spring-security-samples-casserver - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml b/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml index 707c197e29..1292ebc444 100644 --- a/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml +++ b/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml @@ -1,22 +1,22 @@ + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really modify this unless you diff --git a/samples/chat-jc/pom.xml b/samples/chat-jc/pom.xml index 529a0c8390..6b3a7c7b53 100644 --- a/samples/chat-jc/pom.xml +++ b/samples/chat-jc/pom.xml @@ -9,254 +9,254 @@ spring-security-samples-chat-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - com.fasterxml.jackson.core - jackson-databind - 2.4.4 - compile - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.apache.commons - commons-pool2 - 2.2 - compile - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - compile - - - org.hibernate - hibernate-entitymanager - 3.6.10.Final - compile - - - javassist - javassist - - - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.hsqldb - hsqldb - 2.3.2 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.data - spring-data-jpa - 1.7.1.RELEASE - compile - - - aspectjrt - org.aspectj - - - - - org.springframework.data - spring-data-redis - 1.4.1.RELEASE - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-data - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-messaging - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.session - spring-session - 1.0.0.RELEASE - compile - - - org.springframework - spring-messaging - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - org.springframework - spring-websocket - 4.1.5.RELEASE - compile - - - org.thymeleaf.extras - thymeleaf-extras-tiles2-spring4 - 2.1.1.RELEASE - compile - - - org.thymeleaf - thymeleaf-spring4 - 1.2.7.RELEASE - compile - - - redis.clients - jedis - 2.4.2 - compile - - - redis.embedded - embedded-redis - 0.2 - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + com.fasterxml.jackson.core + jackson-databind + 2.4.4 + compile + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.apache.commons + commons-pool2 + 2.2 + compile + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + compile + + + org.hibernate + hibernate-entitymanager + 3.6.10.Final + compile + + + javassist + javassist + + + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.hsqldb + hsqldb + 2.3.2 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.data + spring-data-jpa + 1.7.1.RELEASE + compile + + + aspectjrt + org.aspectj + + + + + org.springframework.data + spring-data-redis + 1.4.1.RELEASE + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-data + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-messaging + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.session + spring-session + 1.0.0.RELEASE + compile + + + org.springframework + spring-messaging + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + org.springframework + spring-websocket + 4.1.5.RELEASE + compile + + + org.thymeleaf.extras + thymeleaf-extras-tiles2-spring4 + 2.1.1.RELEASE + compile + + + org.thymeleaf + thymeleaf-spring4 + 1.2.7.RELEASE + compile + + + redis.clients + jedis + 2.4.2 + compile + + + redis.embedded + embedded-redis + 0.2 + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/chat-jc/src/main/resources/tiles/tiles-def.xml b/samples/chat-jc/src/main/resources/tiles/tiles-def.xml index 944570744e..691e4c8858 100644 --- a/samples/chat-jc/src/main/resources/tiles/tiles-def.xml +++ b/samples/chat-jc/src/main/resources/tiles/tiles-def.xml @@ -1,57 +1,57 @@ + "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" + "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> - - - + template="layout"> + + + + template="messages/{1} :: content"/> + template="messages/{1} :: title"/> + template="messages/{1} :: /html/head/link"/> - - - + template="layout"> + + + + template="user/{1} :: content"/> + template="user/{1} :: title"/> + template="user/{1} :: /html/head/link"/> - - - + template="layout"> + + + + template="{1} :: content"/> + template="{1} :: title"/> + template="{1} :: /html/head/link"/> \ No newline at end of file diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index 737cb1a089..42bf3d475e 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -9,200 +9,200 @@ spring-security-samples-concurrency-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/contacts-xml/client/clientContext.xml b/samples/contacts-xml/client/clientContext.xml index d14785d835..67357e0baf 100644 --- a/samples/contacts-xml/client/clientContext.xml +++ b/samples/contacts-xml/client/clientContext.xml @@ -8,66 +8,66 @@ - - - client.properties - + + + client.properties + - - + + + --> - - - - - sample.contact.ContactManager - - - http://${serverName}:${httpPort}${contextPath}/remoting/ContactManager-httpinvoker - - - - - + + + + + sample.contact.ContactManager + + + http://${serverName}:${httpPort}${contextPath}/remoting/ContactManager-httpinvoker + + + + + - - + + - + - + diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index e4eb892f90..656c61220c 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -9,254 +9,254 @@ spring-security-samples-contacts-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-acl - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - runtime - - - net.sf.ehcache - ehcache - 2.9.0 - runtime - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - runtime - - - org.hsqldb - hsqldb - 2.3.2 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework - spring-context-support - 4.1.5.RELEASE - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-acl + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + runtime + + + net.sf.ehcache + ehcache + 2.9.0 + runtime + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + + + org.hsqldb + hsqldb + 2.3.2 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework + spring-context-support + 4.1.5.RELEASE + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml b/samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml index 547aea2a82..75fd94426a 100644 --- a/samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml +++ b/samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml @@ -1,10 +1,10 @@ + xmlns:security="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.1.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/samples/contacts-xml/src/main/resources/applicationContext-common-business.xml b/samples/contacts-xml/src/main/resources/applicationContext-common-business.xml index fe96c4af9f..d2f7452eab 100644 --- a/samples/contacts-xml/src/main/resources/applicationContext-common-business.xml +++ b/samples/contacts-xml/src/main/resources/applicationContext-common-business.xml @@ -8,42 +8,42 @@ --> + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> - - - + + + - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/web.xml b/samples/contacts-xml/src/main/webapp/WEB-INF/web.xml index a0d21a4158..3274374dcf 100644 --- a/samples/contacts-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/contacts-xml/src/main/webapp/WEB-INF/web.xml @@ -6,94 +6,94 @@ --> - Contacts Sample Application + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + Contacts Sample Application - - - contextConfigLocation - - classpath:applicationContext-common-business.xml - classpath:applicationContext-common-authorization.xml - classpath:applicationContext-security.xml - - + + + contextConfigLocation + + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml + classpath:applicationContext-security.xml + + - - webAppRootKey - contacts.root - + + webAppRootKey + contacts.root + - - localizationFilter - org.springframework.web.filter.RequestContextFilter - + + localizationFilter + org.springframework.web.filter.RequestContextFilter + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - localizationFilter - /* - + + localizationFilter + /* + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - contacts - org.springframework.web.servlet.DispatcherServlet - 1 - + - Provides core MVC application controller. See contacts-servlet.xml. + --> + + contacts + org.springframework.web.servlet.DispatcherServlet + 1 + - - remoting - org.springframework.web.servlet.DispatcherServlet - 2 - + - Provides web services endpoint. See remoting-servlet.xml. + --> + + remoting + org.springframework.web.servlet.DispatcherServlet + 2 + - - contacts - *.htm - + + contacts + *.htm + - - remoting - /remoting/* - + + remoting + /remoting/* + - - index.jsp - + + index.jsp + - - 403 - /error.html - + + 403 + /error.html + diff --git a/samples/data-jc/pom.xml b/samples/data-jc/pom.xml index 78e913d8d3..0fcbdfbfef 100644 --- a/samples/data-jc/pom.xml +++ b/samples/data-jc/pom.xml @@ -8,136 +8,136 @@ spring-security-samples-data-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - compile - - - org.hibernate - hibernate-entitymanager - 3.6.10.Final - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.hsqldb - hsqldb - 2.3.2 - compile - - - org.springframework.data - spring-data-jpa - 1.7.1.RELEASE - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-data - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + compile + + + org.hibernate + hibernate-entitymanager + 3.6.10.Final + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.hsqldb + hsqldb + 2.3.2 + compile + + + org.springframework.data + spring-data-jpa + 1.7.1.RELEASE + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-data + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index f6e02d3e29..11a1353209 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -8,149 +8,149 @@ spring-security-samples-dms-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-acl - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - net.sf.ehcache - ehcache - 2.9.0 - compile - true - - - org.hsqldb - hsqldb - 2.3.2 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework - spring-context-support - 4.1.5.RELEASE - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-context - 4.1.5.RELEASE - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-acl + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + net.sf.ehcache + ehcache + 2.9.0 + compile + true + + + org.hsqldb + hsqldb + 2.3.2 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework + spring-context-support + 4.1.5.RELEASE + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-context + 4.1.5.RELEASE + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/dms-xml/src/test/resources/logback-test.xml b/samples/dms-xml/src/test/resources/logback-test.xml index f293b342dc..ddf04b2972 100644 --- a/samples/dms-xml/src/test/resources/logback-test.xml +++ b/samples/dms-xml/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index cafa3cd39e..dadbebcc01 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -9,248 +9,248 @@ spring-security-samples-form-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index e0fd77b14a..156ac4f807 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -9,206 +9,206 @@ spring-security-samples-gae-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - com.google.appengine - appengine-api-1.0-sdk - 1.4.2 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-context-support - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.slf4j - slf4j-jdk14 - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - com.google.appengine - appengine-api-labs - 1.4.2 - test - - - com.google.appengine - appengine-api-stubs - 1.4.2 - test - - - com.google.appengine - appengine-testing - 1.4.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + com.google.appengine + appengine-api-1.0-sdk + 1.4.2 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-context-support + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.slf4j + slf4j-jdk14 + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + com.google.appengine + appengine-api-labs + 1.4.2 + test + + + com.google.appengine + appengine-api-stubs + 1.4.2 + test + + + com.google.appengine + appengine-testing + 1.4.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /spring-security-samples-gae-xml + /spring-security-samples-gae-xml - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/web.xml b/samples/gae-xml/src/main/webapp/WEB-INF/web.xml index 09a622be25..a907c44705 100644 --- a/samples/gae-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/gae-xml/src/main/webapp/WEB-INF/web.xml @@ -1,46 +1,46 @@ + xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - gae - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/gae-servlet.xml - - + + gae + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/gae-servlet.xml + + - - gae - / - + + gae + / + - - gae - *.htm - + + gae + *.htm + diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index 3c0cc73ec5..90a686c715 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -9,206 +9,206 @@ spring-security-samples-hellojs-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - com.fasterxml.jackson.core - jackson-databind - 2.2.1 - compile - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + com.fasterxml.jackson.core + jackson-databind + 2.2.1 + compile + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index 62d78960f4..64bace7745 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -9,206 +9,206 @@ spring-security-samples-hellomvc-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework.security - spring-security-test - 4.0.0.CI-SNAPSHOT - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework.security + spring-security-test + 4.0.0.CI-SNAPSHOT + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index b7b4016c3e..0e7f1a4d8a 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -9,182 +9,182 @@ spring-security-samples-helloworld-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/helloworld-xml/pom.xml b/samples/helloworld-xml/pom.xml index 38681aa01d..fc6e08d1d1 100644 --- a/samples/helloworld-xml/pom.xml +++ b/samples/helloworld-xml/pom.xml @@ -9,182 +9,182 @@ spring-security-samples-helloworld-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index e45056d518..907abc58fa 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -9,206 +9,206 @@ spring-security-samples-inmemory-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework.security - spring-security-test - 4.0.0.CI-SNAPSHOT - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework.security + spring-security-test + 4.0.0.CI-SNAPSHOT + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 476b41fa99..79cc01bb75 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -9,170 +9,170 @@ spring-security-samples-insecure http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 7d0cc00add..8b22f62438 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -9,182 +9,182 @@ spring-security-samples-insecuremvc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index bbbb329fb9..2f3d0d6d5d 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -9,212 +9,212 @@ spring-security-samples-jaas-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - runtime - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework - spring-context-support - 4.1.5.RELEASE - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + runtime + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework + spring-context-support + 4.1.5.RELEASE + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/jaas-xml/src/main/webapp/WEB-INF/web.xml b/samples/jaas-xml/src/main/webapp/WEB-INF/web.xml index 3af33ec5df..c4a755a8c4 100644 --- a/samples/jaas-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/jaas-xml/src/main/webapp/WEB-INF/web.xml @@ -6,58 +6,58 @@ --> - JAAS Sample Application + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + JAAS Sample Application - - - contextConfigLocation - - classpath:applicationContext-security.xml - - + + + contextConfigLocation + + classpath:applicationContext-security.xml + + - - webAppRootKey - jaas.root - + + webAppRootKey + jaas.root + - - localizationFilter - org.springframework.web.filter.RequestContextFilter - + + localizationFilter + org.springframework.web.filter.RequestContextFilter + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - localizationFilter - /* - + + localizationFilter + /* + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - index.jsp - + + index.jsp + diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index de957b65ab..50d85bcd9d 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -9,248 +9,248 @@ spring-security-samples-jdbc-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index 52910ece38..9e9f67e8f5 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -9,290 +9,290 @@ spring-security-samples-ldap-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.apache.directory.server - apacheds-core - 1.5.5 - compile - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - compile - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - compile - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - compile - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - compile - - - org.apache.directory.shared - shared-ldap - 0.9.15 - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-ldap - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.apache.directory.server + apacheds-core + 1.5.5 + compile + + + org.apache.directory.server + apacheds-core-entry + 1.5.5 + compile + + + org.apache.directory.server + apacheds-protocol-ldap + 1.5.5 + compile + + + org.apache.directory.server + apacheds-protocol-shared + 1.5.5 + compile + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + compile + + + org.apache.directory.shared + shared-ldap + 0.9.15 + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-ldap + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index fd0d0640f4..b75616f186 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -9,218 +9,218 @@ spring-security-samples-ldap-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - compile - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - org.apache.directory.server - apacheds-core - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-core-entry - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-protocol-ldap - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - runtime - - - org.apache.directory.shared - shared-ldap - 0.9.15 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-ldap - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - commons-httpclient - commons-httpclient - 3.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.gebish - geb-spock - 0.10.0 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.seleniumhq.selenium - selenium-htmlunit-driver - 2.44.0 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + compile + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + org.apache.directory.server + apacheds-core + 1.5.5 + runtime + + + org.apache.directory.server + apacheds-core-entry + 1.5.5 + runtime + + + org.apache.directory.server + apacheds-protocol-ldap + 1.5.5 + runtime + + + org.apache.directory.server + apacheds-protocol-shared + 1.5.5 + runtime + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + runtime + + + org.apache.directory.shared + shared-ldap + 0.9.15 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-ldap + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + commons-httpclient + commons-httpclient + 3.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.gebish + geb-spock + 0.10.0 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.seleniumhq.selenium + selenium-htmlunit-driver + 2.44.0 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/web.xml b/samples/ldap-xml/src/main/webapp/WEB-INF/web.xml index 6e119b6253..91104c0a33 100644 --- a/samples/ldap-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/ldap-xml/src/main/webapp/WEB-INF/web.xml @@ -1,44 +1,44 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - Spring Security LDAP Demo Application + Spring Security LDAP Demo Application - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + - - webAppRootKey - ldap.root - + + webAppRootKey + ldap.root + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index 89352e25d7..8b31820363 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -8,220 +8,220 @@ spring-security-samples-messages-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - compile - - - org.hibernate - hibernate-entitymanager - 3.6.10.Final - compile - - - javassist - javassist - - - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.hsqldb - hsqldb - 2.3.2 - compile - - - org.springframework.data - spring-data-jpa - 1.7.1.RELEASE - compile - - - aspectjrt - org.aspectj - - - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-aspects - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - org.springframework - spring-instrument - 4.1.5.RELEASE - compile - - - org.springframework - spring-orm - 4.1.5.RELEASE - compile - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - org.thymeleaf.extras - thymeleaf-extras-tiles2-spring4 - 2.1.1.RELEASE - compile - - - org.thymeleaf - thymeleaf-spring4 - 1.2.7.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + compile + + + org.hibernate + hibernate-entitymanager + 3.6.10.Final + compile + + + javassist + javassist + + + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.hsqldb + hsqldb + 2.3.2 + compile + + + org.springframework.data + spring-data-jpa + 1.7.1.RELEASE + compile + + + aspectjrt + org.aspectj + + + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-aspects + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + org.springframework + spring-instrument + 4.1.5.RELEASE + compile + + + org.springframework + spring-orm + 4.1.5.RELEASE + compile + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + org.thymeleaf.extras + thymeleaf-extras-tiles2-spring4 + 2.1.1.RELEASE + compile + + + org.thymeleaf + thymeleaf-spring4 + 1.2.7.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 9934be4aca..d1e6a65571 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -9,212 +9,212 @@ spring-security-samples-openid-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-openid - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - net.sourceforge.nekohtml - nekohtml - 1.9.10 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-openid + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + net.sourceforge.nekohtml + nekohtml + 1.9.10 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 1deb5fdda5..126db1f1b7 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -9,140 +9,140 @@ spring-security-samples-openid-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-openid - 4.0.0.CI-SNAPSHOT - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - runtime - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-openid + 4.0.0.CI-SNAPSHOT + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + runtime + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /spring-security-samples-openid-xml + /spring-security-samples-openid-xml - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml index 797ccaf576..b55979205c 100644 --- a/samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -1,63 +1,63 @@ + xmlns:b="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + diff --git a/samples/openid-xml/src/main/webapp/WEB-INF/web.xml b/samples/openid-xml/src/main/webapp/WEB-INF/web.xml index 1f0d7bfb27..0b01e67188 100644 --- a/samples/openid-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/openid-xml/src/main/webapp/WEB-INF/web.xml @@ -1,44 +1,44 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - Spring Security OpenID Demo Application + Spring Security OpenID Demo Application - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + - - webAppRootKey - openid.root - + + webAppRootKey + openid.root + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 14531938ec..62389387f9 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -9,200 +9,200 @@ spring-security-samples-preauth-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/preauth-jc/src/main/webapp/WEB-INF/web.xml b/samples/preauth-jc/src/main/webapp/WEB-INF/web.xml index c6fe21d9b3..b212e36bd2 100644 --- a/samples/preauth-jc/src/main/webapp/WEB-INF/web.xml +++ b/samples/preauth-jc/src/main/webapp/WEB-INF/web.xml @@ -1,35 +1,35 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - FORM - - /login - /login?error - - + + FORM + + /login + /login?error + + - - ROLE_USER - - - - Public - Matches unconstrained pages - /login - /logout - /resources/* - - - - - Secured Areas - /* - - - ROLE_USER - - + + ROLE_USER + + + + Public + Matches unconstrained pages + /login + /logout + /resources/* + + + + + Secured Areas + /* + + + ROLE_USER + + diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index 2d0b454017..cfb3d4cd09 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -9,110 +9,110 @@ spring-security-samples-preauth-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - commons-logging - commons-logging - 1.2 - compile - true - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml index 5f62ef19ba..a8f7e5c98d 100644 --- a/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -6,85 +6,85 @@ --> + xmlns:sec="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - - - - - + + + + + - + - - - + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + diff --git a/samples/preauth-xml/src/main/webapp/WEB-INF/web.xml b/samples/preauth-xml/src/main/webapp/WEB-INF/web.xml index 7b91fd916e..cd4173c21d 100644 --- a/samples/preauth-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/preauth-xml/src/main/webapp/WEB-INF/web.xml @@ -1,60 +1,60 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - Spring Security Preauthentication Demo Application + Spring Security Preauthentication Demo Application - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + - - filterChainProxy - org.springframework.web.filter.DelegatingFilterProxy - + + filterChainProxy + org.springframework.web.filter.DelegatingFilterProxy + - - filterChainProxy - /* - + + filterChainProxy + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - BASIC - Preauth Realm - + + BASIC + Preauth Realm + - - ROLE_USER - - - ROLE_SUPERVISOR - - - - All areas - /* - - - ROLE_USER - - + + ROLE_USER + + + ROLE_SUPERVISOR + + + + All areas + /* + + + ROLE_USER + + diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index d9d1feede1..5693ade4ab 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -9,200 +9,200 @@ spring-security-samples-rememberme-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 83960f8159..1a1c9e5b9f 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -9,170 +9,170 @@ spring-security-samples-servletapi-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework - spring-context-support - 4.1.5.RELEASE - runtime - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework + spring-context-support + 4.1.5.RELEASE + runtime + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /spring-security-samples-servletapi-xml + /spring-security-samples-servletapi-xml - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/servletapi-xml/src/main/resources/applicationContext-security.xml b/samples/servletapi-xml/src/main/resources/applicationContext-security.xml index aa16072d53..da64fd140f 100644 --- a/samples/servletapi-xml/src/main/resources/applicationContext-security.xml +++ b/samples/servletapi-xml/src/main/resources/applicationContext-security.xml @@ -5,19 +5,19 @@ xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="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-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> - + - - - - - - + + + + + + \ No newline at end of file diff --git a/samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml b/samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml index c2e65fbe8a..af75e5fc0a 100644 --- a/samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml @@ -1,57 +1,57 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - - - contextConfigLocation - - classpath:applicationContext-security.xml - - + + + contextConfigLocation + + classpath:applicationContext-security.xml + + - - webAppRootKey - servletapi.root - + + webAppRootKey + servletapi.root + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - true - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + true + - - springSecurityFilterChain - /* - REQUEST - ASYNC - + + springSecurityFilterChain + /* + REQUEST + ASYNC + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - spring - org.springframework.web.servlet.DispatcherServlet - 1 - true - - - spring - / - + + spring + org.springframework.web.servlet.DispatcherServlet + 1 + true + + + spring + / + diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index 2792b51970..8a7d619b88 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -9,170 +9,170 @@ spring-security-samples-tutorial-xml http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - runtime - - - ch.qos.logback - logback-core - 1.1.2 - runtime - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - runtime - - - org.apache.taglibs - taglibs-standard-jstlel - 1.2.1 - runtime - - - org.slf4j - jcl-over-slf4j - 1.7.7 - runtime - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-taglibs - 4.0.0.CI-SNAPSHOT - runtime - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - runtime - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + runtime + + + ch.qos.logback + logback-core + 1.1.2 + runtime + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + runtime + + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + + + org.slf4j + jcl-over-slf4j + 1.7.7 + runtime + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-taglibs + 4.0.0.CI-SNAPSHOT + runtime + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + runtime + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml index b0b6a685aa..d2e64307bf 100644 --- a/samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -6,59 +6,59 @@ --> + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml b/samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml index 37b9078afa..3d0b9550b3 100644 --- a/samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml +++ b/samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml @@ -5,69 +5,69 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - Spring Security Tutorial Application + Spring Security Tutorial Application - - - contextConfigLocation - - classpath:applicationContext-business.xml - /WEB-INF/applicationContext-security.xml - - + + + contextConfigLocation + + classpath:applicationContext-business.xml + /WEB-INF/applicationContext-security.xml + + - - webAppRootKey - tutorial.root - + + webAppRootKey + tutorial.root + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - - org.springframework.security.web.session.HttpSessionEventPublisher - + + + org.springframework.security.web.session.HttpSessionEventPublisher + - - bank - org.springframework.web.servlet.DispatcherServlet - 1 - + - Provides core MVC application controller. See bank-servlet.xml. + --> + + bank + org.springframework.web.servlet.DispatcherServlet + 1 + - - bank - *.html - + + bank + *.html + - - index.jsp - + + index.jsp + diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index decd94474c..d663621541 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -9,200 +9,200 @@ spring-security-samples-x509-jc http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - compile - - - javax.validation - validation-api - 1.0.0.GA - compile - - - org.hibernate - hibernate-validator - 4.2.0.Final - compile - - - org.slf4j - jcl-over-slf4j - 1.7.7 - compile - - - org.slf4j - jul-to-slf4j - 1.7.7 - compile - - - org.slf4j - log4j-over-slf4j - 1.7.7 - compile - - - org.slf4j - slf4j-api - 1.7.7 - compile - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - cglib - cglib-nodep - 3.1 - runtime - - - ch.qos.logback - logback-classic - 0.9.30 - runtime - - - opensymphony - sitemesh - 2.4.2 - runtime - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + compile + + + javax.validation + validation-api + 1.0.0.GA + compile + + + org.hibernate + hibernate-validator + 4.2.0.Final + compile + + + org.slf4j + jcl-over-slf4j + 1.7.7 + compile + + + org.slf4j + jul-to-slf4j + 1.7.7 + compile + + + org.slf4j + log4j-over-slf4j + 1.7.7 + compile + + + org.slf4j + slf4j-api + 1.7.7 + compile + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-samples-messages-jc + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + cglib + cglib-nodep + 3.1 + runtime + + + ch.qos.logback + logback-classic + 0.9.30 + runtime + + + opensymphony + sitemesh + 2.4.2 + runtime + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - /sample + /sample - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + diff --git a/samples/x509-jc/src/etc/server.xml b/samples/x509-jc/src/etc/server.xml index db856b68a6..f7378201bd 100644 --- a/samples/x509-jc/src/etc/server.xml +++ b/samples/x509-jc/src/etc/server.xml @@ -5,9 +5,9 @@ this work for additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at + the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -15,32 +15,32 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - + + + + + - - - + + + - - + + - + - + - - - - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml b/samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml index a4542da250..7df83f1950 100644 --- a/samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml +++ b/samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml @@ -1,5 +1,5 @@ - - /* - + + /* + diff --git a/sandbox/heavyduty/jetty-jmx.xml b/sandbox/heavyduty/jetty-jmx.xml index 53fe158000..f109d6c233 100644 --- a/sandbox/heavyduty/jetty-jmx.xml +++ b/sandbox/heavyduty/jetty-jmx.xml @@ -3,52 +3,52 @@ - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml old mode 100755 new mode 100644 index 3a6bc054fb..e9b746edf5 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml @@ -17,144 +17,144 @@ - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - My Realm - + + My Realm + - + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - + + - + - + - - - + + + - - - - - - - + + + + + + + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml old mode 100755 new mode 100644 index 0940ec5720..3f9784b418 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml @@ -5,20 +5,20 @@ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> - org.hibernate.ejb.HibernatePersistence - sample.domain.User - - - - - - - - - + org.hibernate.ejb.HibernatePersistence + sample.domain.User + + + + + + + + + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml old mode 100755 new mode 100644 index 731f474975..eebf0d9123 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/web.xml @@ -8,78 +8,78 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - Spring Security Tutorial Application + Spring Security Tutorial Application - - - contextConfigLocation - - classpath:applicationContext-business.xml - /WEB-INF/appContext-persistence.xml - /WEB-INF/appContext-security.xml - - + + + contextConfigLocation + + classpath:applicationContext-business.xml + /WEB-INF/appContext-persistence.xml + /WEB-INF/appContext-security.xml + + - - log4jConfigLocation - /WEB-INF/classes/log4j.properties - + + log4jConfigLocation + /WEB-INF/classes/log4j.properties + - - webAppRootKey - heavyduty.root - + + webAppRootKey + heavyduty.root + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - org.springframework.web.util.Log4jConfigListener - + + org.springframework.web.util.Log4jConfigListener + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - - org.springframework.security.web.session.HttpSessionEventPublisher - + + + org.springframework.security.web.session.HttpSessionEventPublisher + - - heavyduty - org.springframework.web.servlet.DispatcherServlet - 1 - + - Provides core MVC application controller. + --> + + heavyduty + org.springframework.web.servlet.DispatcherServlet + 1 + - - heavyduty - *.htm - + + heavyduty + *.htm + - - index.jsp - + + index.jsp + diff --git a/sandbox/webflow/src/main/webapp/WEB-INF/secure.xml b/sandbox/webflow/src/main/webapp/WEB-INF/secure.xml index 01586adf48..43f1ef9eec 100644 --- a/sandbox/webflow/src/main/webapp/WEB-INF/secure.xml +++ b/sandbox/webflow/src/main/webapp/WEB-INF/secure.xml @@ -1,19 +1,19 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> - + - + - - - + + + - - - + + + \ No newline at end of file diff --git a/sandbox/webflow/src/main/webapp/WEB-INF/web.xml b/sandbox/webflow/src/main/webapp/WEB-INF/web.xml index 02cf95a435..2291e594e4 100644 --- a/sandbox/webflow/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/webflow/src/main/webapp/WEB-INF/web.xml @@ -8,67 +8,67 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - Spring Security Tutorial Application + Spring Security Tutorial Application - - - contextConfigLocation - - /WEB-INF/security-config.xml - - + + + contextConfigLocation + + /WEB-INF/security-config.xml + + - - log4jConfigLocation - /WEB-INF/classes/log4j.properties - + + log4jConfigLocation + /WEB-INF/classes/log4j.properties + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - - org.springframework.web.context.ContextLoaderListener - + + + org.springframework.web.context.ContextLoaderListener + - - - org.springframework.security.ui.session.HttpSessionEventPublisher - + + + org.springframework.security.ui.session.HttpSessionEventPublisher + - - org.springframework.web.util.Log4jConfigListener - + + org.springframework.web.util.Log4jConfigListener + - - webflow - org.springframework.web.servlet.DispatcherServlet - 1 - + - Provides core MVC application controller. See contacts-servlet.xml. + --> + + webflow + org.springframework.web.servlet.DispatcherServlet + 1 + - - webflow - /app/* - + + webflow + /app/* + diff --git a/taglibs/pom.xml b/taglibs/pom.xml index b533d03921..d47e1624ab 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -8,196 +8,196 @@ spring-security-taglibs http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-acl - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-aop - 4.1.5.RELEASE - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-expression - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.2.1 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy-all - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-acl + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-aop + 4.1.5.RELEASE + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-expression + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.2.1 + provided + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy-all + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/test/pom.xml b/test/pom.xml index 0e5a7631de..0da5719917 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -8,173 +8,173 @@ spring-security-test http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework.security - spring-security-web - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.springframework.security - spring-security-config - 4.0.0.CI-SNAPSHOT - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - junit - junit - 4.11 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.powermock - powermock-api-mockito - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-support - 1.6.0 - test - - - org.powermock - powermock-core - 1.6.0 - test - - - org.powermock - powermock-module-junit4 - 1.6.0 - test - - - org.powermock - powermock-module-junit4-common - 1.6.0 - test - - - org.powermock - powermock-reflect - 1.6.0 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - test - + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework.security + spring-security-web + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.springframework.security + spring-security-config + 4.0.0.CI-SNAPSHOT + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.11 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.powermock + powermock-api-mockito + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-support + 1.6.0 + test + + + org.powermock + powermock-core + 1.6.0 + test + + + org.powermock + powermock-module-junit4 + 1.6.0 + test + + + org.powermock + powermock-module-junit4-common + 1.6.0 + test + + + org.powermock + powermock-reflect + 1.6.0 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/web/pom.xml b/web/pom.xml index 311a489ce4..56467626d7 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -8,247 +8,247 @@ spring-security-web http://spring.io/spring-security - spring.io - http://spring.io/ + spring.io + http://spring.io/ - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + - - rwinch - Rob Winch - rwinch@gopivotal.com - + + rwinch + Rob Winch + rwinch@gopivotal.com + - scm:git:git://github.com/spring-projects/spring-security - scm:git:git://github.com/spring-projects/spring-security - https://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security - - spring-snasphot - https://repo.spring.io/snapshot - + + spring-snasphot + https://repo.spring.io/snapshot + - - aopalliance - aopalliance - 1.0 - compile - - - org.springframework.security - spring-security-core - 4.0.0.CI-SNAPSHOT - compile - - - org.springframework - spring-beans - 4.1.5.RELEASE - compile - - - org.springframework - spring-context - 4.1.5.RELEASE - compile - - - org.springframework - spring-core - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-expression - 4.1.5.RELEASE - compile - - - org.springframework - spring-web - 4.1.5.RELEASE - compile - - - commons-logging - commons-logging - 1.2 - compile - true - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-tx - 4.1.5.RELEASE - compile - true - - - org.springframework - spring-webmvc - 4.1.5.RELEASE - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - commons-codec - commons-codec - 1.3 - test - - - junit - junit - 4.11 - test - - - org.codehaus.groovy - groovy-all - 2.3.8 - test - - - org.easytesting - fest-assert - 1.4 - test - - - org.hsqldb - hsqldb - 2.3.2 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.powermock - powermock-api-mockito - 1.6.0 - test - - - mockito-all - org.mockito - - - - - org.powermock - powermock-api-support - 1.6.0 - test - - - org.powermock - powermock-core - 1.6.0 - test - - - org.powermock - powermock-module-junit4 - 1.6.0 - test - - - org.powermock - powermock-module-junit4-common - 1.6.0 - test - - - org.powermock - powermock-reflect - 1.6.0 - test - - - org.slf4j - jcl-over-slf4j - 1.7.7 - test - - - org.spockframework - spock-core - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.spockframework - spock-spring - 0.7-groovy-2.0 - test - - - junit-dep - junit - - - - - org.springframework - spring-test - 4.1.5.RELEASE - test - + + aopalliance + aopalliance + 1.0 + compile + + + org.springframework.security + spring-security-core + 4.0.0.CI-SNAPSHOT + compile + + + org.springframework + spring-beans + 4.1.5.RELEASE + compile + + + org.springframework + spring-context + 4.1.5.RELEASE + compile + + + org.springframework + spring-core + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + + + + + org.springframework + spring-expression + 4.1.5.RELEASE + compile + + + org.springframework + spring-web + 4.1.5.RELEASE + compile + + + commons-logging + commons-logging + 1.2 + compile + true + + + org.springframework + spring-jdbc + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-tx + 4.1.5.RELEASE + compile + true + + + org.springframework + spring-webmvc + 4.1.5.RELEASE + compile + true + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + commons-codec + commons-codec + 1.3 + test + + + junit + junit + 4.11 + test + + + org.codehaus.groovy + groovy-all + 2.3.8 + test + + + org.easytesting + fest-assert + 1.4 + test + + + org.hsqldb + hsqldb + 2.3.2 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.powermock + powermock-api-mockito + 1.6.0 + test + + + mockito-all + org.mockito + + + + + org.powermock + powermock-api-support + 1.6.0 + test + + + org.powermock + powermock-core + 1.6.0 + test + + + org.powermock + powermock-module-junit4 + 1.6.0 + test + + + org.powermock + powermock-module-junit4-common + 1.6.0 + test + + + org.powermock + powermock-reflect + 1.6.0 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.spockframework + spock-core + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.spockframework + spock-spring + 0.7-groovy-2.0 + test + + + junit-dep + junit + + + + + org.springframework + spring-test + 4.1.5.RELEASE + test + - - - maven-compiler-plugin - - 1.7 - 1.7 - - - + + + maven-compiler-plugin + + 1.7 + 1.7 + + + diff --git a/web/src/test/resources/logback-test.xml b/web/src/test/resources/logback-test.xml index f293b342dc..ddf04b2972 100644 --- a/web/src/test/resources/logback-test.xml +++ b/web/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - + diff --git a/web/src/test/resources/webxml/NoRoles.web.xml b/web/src/test/resources/webxml/NoRoles.web.xml old mode 100755 new mode 100644 index 92ae4051c0..9a94d8b634 --- a/web/src/test/resources/webxml/NoRoles.web.xml +++ b/web/src/test/resources/webxml/NoRoles.web.xml @@ -1,51 +1,51 @@ - poc-acegi-web - - contextConfigLocation - classpath:j2ee-acegi-security.xml - - - log4jConfigLocation - /WEB-INF/classes/log4j.properties - + poc-acegi-web + + contextConfigLocation + classpath:j2ee-acegi-security.xml + + + log4jConfigLocation + /WEB-INF/classes/log4j.properties + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - org.springframework.web.util.Log4jConfigListener - - - org.springframework.web.context.ContextLoaderListener - - - org.acegisecurity.ui.session.HttpSessionEventPublisher - + + org.springframework.web.util.Log4jConfigListener + + + org.springframework.web.context.ContextLoaderListener + + + org.acegisecurity.ui.session.HttpSessionEventPublisher + - - dispatch - org.springframework.web.servlet.DispatcherServlet - 1 - - - dispatch - *.form - - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - + + dispatch + org.springframework.web.servlet.DispatcherServlet + 1 + + + dispatch + *.form + + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + diff --git a/web/src/test/resources/webxml/Role1-4.web.xml b/web/src/test/resources/webxml/Role1-4.web.xml old mode 100755 new mode 100644 index 36a8b6670d..eb07eca720 --- a/web/src/test/resources/webxml/Role1-4.web.xml +++ b/web/src/test/resources/webxml/Role1-4.web.xml @@ -1,88 +1,88 @@ - poc-acegi-web - - contextConfigLocation - classpath:j2ee-acegi-security.xml - - - log4jConfigLocation - /WEB-INF/classes/log4j.properties - + poc-acegi-web + + contextConfigLocation + classpath:j2ee-acegi-security.xml + + + log4jConfigLocation + /WEB-INF/classes/log4j.properties + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + - - springSecurityFilterChain - /* - + + springSecurityFilterChain + /* + - - org.springframework.web.util.Log4jConfigListener - - - org.springframework.web.context.ContextLoaderListener - - - org.acegisecurity.ui.session.HttpSessionEventPublisher - + + org.springframework.web.util.Log4jConfigListener + + + org.springframework.web.context.ContextLoaderListener + + + org.acegisecurity.ui.session.HttpSessionEventPublisher + - - dispatch - org.springframework.web.servlet.DispatcherServlet - 1 - - - dispatch - *.form - - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - - - jms/testQueue - javax.jms.Queue - Container - Shareable - - - jms/testQCF - javax.jms.QueueConnectionFactory - Container - Shareable - - - - Default - /* - - - * - - - - - Role1 - - - - Role2 - - - - Role3 - - - - Role4 - + + dispatch + org.springframework.web.servlet.DispatcherServlet + 1 + + + dispatch + *.form + + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + + jms/testQueue + javax.jms.Queue + Container + Shareable + + + jms/testQCF + javax.jms.QueueConnectionFactory + Container + Shareable + + + + Default + /* + + + * + + + + + Role1 + + + + Role2 + + + + Role3 + + + + Role4 +