diff --git a/acl/pom.xml b/acl/pom.xml index 3676b0f030..017cad20f1 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -3,7 +3,7 @@ spring-security-parent org.springframework.security - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT 4.0.0 org.springframework.security diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml index e6fce377a4..c8b0253f0e 100644 --- a/adapters/catalina/pom.xml +++ b/adapters/catalina/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-catalina Spring Security - Catalina adapter diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml index 36f1f91c11..e567b1f671 100644 --- a/adapters/jboss/pom.xml +++ b/adapters/jboss/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-jboss Spring Security - JBoss adapter diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml index 2e01223b0c..86bf919518 100644 --- a/adapters/jetty/pom.xml +++ b/adapters/jetty/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-jetty Spring Security - Jetty adapter diff --git a/adapters/pom.xml b/adapters/pom.xml index a07d5c1127..60a1e97c63 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-adapters Spring Security - Adapters diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml index 027411ffb9..23dbe3b1e7 100644 --- a/adapters/resin/pom.xml +++ b/adapters/resin/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-resin Spring Security - Resin adapter diff --git a/cas/pom.xml b/cas/pom.xml index 63146d48f5..30303bd6e1 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-cas-client Spring Security - CAS support diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml index 4d5eedd5fb..97e7206550 100644 --- a/core-tiger/pom.xml +++ b/core-tiger/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT bundle spring-security-core-tiger diff --git a/core/pom.xml b/core/pom.xml index 60faa540ec..ae9e7198c1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT bundle spring-security-core @@ -47,27 +47,27 @@ spring-mock true - - org.aspectj - aspectjrt - true - - - org.aspectj - aspectjweaver - true - + + org.aspectj + aspectjrt + true + + + org.aspectj + aspectjweaver + true + org.springframework.ldap spring-ldap true - - cglib - cglib-nodep - test - true - + + cglib + cglib-nodep + test + true + net.sf.ehcache ehcache @@ -95,7 +95,7 @@ jaxen 1.1.1 true - + javax.servlet servlet-api @@ -122,6 +122,12 @@ compile true + + org.apache.tomcat + annotations-api + 6.0.14 + true + org.slf4j slf4j-log4j12 @@ -141,14 +147,14 @@ true - - - - org.springframework.security.*;version=${pom.version} - - - !com.ibm.websphere.security, + + + org.springframework.security.*;version=${pom.version} + + + + !com.ibm.websphere.security, javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", @@ -180,19 +186,19 @@ javax.sql.*, javax.xml.parsers.*, org.w3c.dom.*, - org.xml.sax.*, - *;resolution:=optional - + org.xml.sax.*, + *;resolution:=optional + - - !org.springframework.security.* - - - org.springframework.security.core + org.springframework.security.core diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java b/core/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java rename to core/src/main/java/org/springframework/security/annotation/Jsr250MethodDefinitionSource.java diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java b/core/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java rename to core/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/Jsr250Voter.java b/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/security/annotation/Jsr250Voter.java rename to core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/Secured.java b/core/src/main/java/org/springframework/security/annotation/Secured.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/security/annotation/Secured.java rename to core/src/main/java/org/springframework/security/annotation/Secured.java diff --git a/core-tiger/src/main/java/org/springframework/security/annotation/SecuredMethodDefinitionSource.java b/core/src/main/java/org/springframework/security/annotation/SecuredMethodDefinitionSource.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/security/annotation/SecuredMethodDefinitionSource.java rename to core/src/main/java/org/springframework/security/annotation/SecuredMethodDefinitionSource.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java b/core/src/test/java/org/springframework/security/annotation/BusinessService.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java rename to core/src/test/java/org/springframework/security/annotation/BusinessService.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/Department.java b/core/src/test/java/org/springframework/security/annotation/Department.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/Department.java rename to core/src/test/java/org/springframework/security/annotation/Department.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/DepartmentService.java b/core/src/test/java/org/springframework/security/annotation/DepartmentService.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/DepartmentService.java rename to core/src/test/java/org/springframework/security/annotation/DepartmentService.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/Entity.java b/core/src/test/java/org/springframework/security/annotation/Entity.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/Entity.java rename to core/src/test/java/org/springframework/security/annotation/Entity.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java rename to core/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java b/core/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java rename to core/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java rename to core/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/Entity.java b/core/src/test/java/org/springframework/security/annotation/test/Entity.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/Entity.java rename to core/src/test/java/org/springframework/security/annotation/test/Entity.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/Organisation.java b/core/src/test/java/org/springframework/security/annotation/test/Organisation.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/Organisation.java rename to core/src/test/java/org/springframework/security/annotation/test/Organisation.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationService.java b/core/src/test/java/org/springframework/security/annotation/test/OrganisationService.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationService.java rename to core/src/test/java/org/springframework/security/annotation/test/OrganisationService.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java similarity index 93% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java index 6e84906b71..85e970970d 100644 --- a/core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java +++ b/core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java @@ -16,11 +16,8 @@ package org.springframework.security.annotation.test; /** - * DOCUMENT ME! * - * @author $author$ - * @version $Revision: 1496 $ - */ + */ public class OrganisationServiceImpl extends ServiceImpl implements OrganisationService { //~ Methods ======================================================================================================== diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/Person.java b/core/src/test/java/org/springframework/security/annotation/test/Person.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/Person.java rename to core/src/test/java/org/springframework/security/annotation/test/Person.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/PersonService.java b/core/src/test/java/org/springframework/security/annotation/test/PersonService.java similarity index 92% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/PersonService.java rename to core/src/test/java/org/springframework/security/annotation/test/PersonService.java index 8685ebf774..1d87a2068c 100644 --- a/core-tiger/src/test/java/org/springframework/security/annotation/test/PersonService.java +++ b/core/src/test/java/org/springframework/security/annotation/test/PersonService.java @@ -16,11 +16,8 @@ package org.springframework.security.annotation.test; /** - * DOCUMENT ME! * - * @author $author$ - * @version $Revision: 1496 $ - */ + */ public interface PersonService extends Service { //~ Methods ======================================================================================================== diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/Service.java b/core/src/test/java/org/springframework/security/annotation/test/Service.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/Service.java rename to core/src/test/java/org/springframework/security/annotation/test/Service.java diff --git a/core-tiger/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java b/core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java similarity index 92% rename from core-tiger/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java rename to core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java index 941fd174c9..83ce3c4ea5 100644 --- a/core-tiger/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java +++ b/core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java @@ -19,12 +19,7 @@ import java.util.Collection; /** - * DOCUMENT ME! * - * @author $author$ - * @version $Revision: 1496 $ - * - * @param DOCUMENT ME! */ public class ServiceImpl implements Service { //~ Methods ======================================================================================================== diff --git a/core-tiger/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java rename to core/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java diff --git a/core-tiger/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java rename to core/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java diff --git a/core-tiger/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java rename to core/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java diff --git a/itest/pom.xml b/itest/pom.xml index 5f16b3f54e..ee94d1c546 100644 --- a/itest/pom.xml +++ b/itest/pom.xml @@ -59,17 +59,6 @@ commons-logging - - - org.springframework.security - spring-security-core-tiger - ${project.version} - - - commons-logging - commons-logging - - org.aspectj diff --git a/ntlm/pom.xml b/ntlm/pom.xml index 5b5ae079c5..19b016582c 100755 --- a/ntlm/pom.xml +++ b/ntlm/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT jar spring-security-ntlm diff --git a/openid/pom.xml b/openid/pom.xml index deb773cb63..671436cd98 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -3,12 +3,12 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-openid Spring Security - OpenID support Spring Security - Support for OpenID - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT bundle diff --git a/pom.xml b/pom.xml index 9b6f162914..b9490a4904 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,12 @@ 4.0.0 org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT Spring Security pom - core - core-tiger + core adapters portlet ntlm @@ -284,30 +283,10 @@ org.apache.maven.plugins maven-compiler-plugin 2.0.2 - - - java-1.4-compile - compile - - compile - - - 1.4 - 1.4 - - - - java-1.5-compile - process-test-sources - - testCompile - - - 1.5 - 1.5 - - - + + 1.5 + 1.5 + org.apache.maven.plugins diff --git a/portlet/pom.xml b/portlet/pom.xml index 44e4bb81ee..1cce6d6b05 100644 --- a/portlet/pom.xml +++ b/portlet/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-portlet Spring Security - Portlet support diff --git a/samples/annotations/.cvsignore b/samples/annotations/.cvsignore deleted file mode 100644 index 7b85662386..0000000000 --- a/samples/annotations/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -classes -generated -reports -target diff --git a/samples/annotations/pom.xml b/samples/annotations/pom.xml deleted file mode 100644 index fdc4c63bf6..0000000000 --- a/samples/annotations/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - org.springframework.security - spring-security-samples - 2.0-SNAPSHOT - - spring-security-sample-annotations - Spring Security - Annotations sample - - - org.springframework.security - spring-security-core-tiger - ${project.version} - jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - diff --git a/samples/annotations/src/main/java/sample/annotations/BankService.java b/samples/annotations/src/main/java/sample/annotations/BankService.java deleted file mode 100644 index 4f37a70abe..0000000000 --- a/samples/annotations/src/main/java/sample/annotations/BankService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed 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 - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package sample.annotations; - -import org.acegisecurity.annotation.Secured; - - -/** - * BankService sample using Java 5 Annotations. - * - * @author Mark St.Godard - * @version $Id$ - * - * @see org.acegisecurity.annotation.Secured - */ -@Secured({"ROLE_TELLER"}) -public interface BankService { - //~ Methods ======================================================================================================== - - /** - * Get the account balance. - * - * @param accountNumber The account number - * - * @return The balance - */ - @Secured({"ROLE_PERMISSION_BALANCE"}) - public float balance(String accountNumber); - - /** - * List accounts - * - * @return The list of accounts - */ - @Secured({"ROLE_PERMISSION_LIST"}) - public String[] listAccounts(); -} diff --git a/samples/annotations/src/main/java/sample/annotations/BankServiceImpl.java b/samples/annotations/src/main/java/sample/annotations/BankServiceImpl.java deleted file mode 100644 index a2b3a10907..0000000000 --- a/samples/annotations/src/main/java/sample/annotations/BankServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed 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 - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package sample.annotations; - -/** - * BankService sample implementation. - * - * @author Mark St.Godard - * @version $Id$ - */ -public class BankServiceImpl implements BankService { - //~ Methods ======================================================================================================== - - public float balance(String accountNumber) { - return 42000000; - } - - public String[] listAccounts() { - return new String[] {"1", "2", "3"}; - } -} diff --git a/samples/annotations/src/main/java/sample/annotations/Main.java b/samples/annotations/src/main/java/sample/annotations/Main.java deleted file mode 100644 index 56199097b4..0000000000 --- a/samples/annotations/src/main/java/sample/annotations/Main.java +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed 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 - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package sample.annotations; - -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; - -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.context.SecurityContextImpl; - -import org.acegisecurity.providers.TestingAuthenticationToken; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - - -/** - * -DOCUMENT ME! - * - * @author Mark St.Godard - * @version $Id$ - */ -public class Main { - //~ Methods ======================================================================================================== - - /** - * This can be done in a web app by using a filter or SpringMvcIntegrationInterceptor. - */ - private static void createSecureContext() { - TestingAuthenticationToken auth = new TestingAuthenticationToken("test", "test", - new GrantedAuthority[] { - new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl("ROLE_PERMISSION_LIST") - }); - - SecurityContextHolder.getContext().setAuthentication(auth); - } - - private static void destroySecureContext() { - SecurityContextHolder.setContext(new SecurityContextImpl()); - } - - public static void main(String[] args) throws Exception { - createSecureContext(); - - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "applicationContext-annotations.xml"); - BankService service = (BankService) context.getBean("bankService"); - - // will succeed - service.listAccounts(); - - // will fail - try { - System.out.println( - "We expect an AccessDeniedException now, as we do not hold the ROLE_PERMISSION_BALANCE granted authority, and we're using a unanimous access decision manager... "); - service.balance("1"); - } catch (AccessDeniedException e) { - e.printStackTrace(); - } - - destroySecureContext(); - } -} diff --git a/samples/annotations/src/main/resources/applicationContext-annotations.xml b/samples/annotations/src/main/resources/applicationContext-annotations.xml deleted file mode 100644 index c5c5195cf3..0000000000 --- a/samples/annotations/src/main/resources/applicationContext-annotations.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - my_run_as_password - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - diff --git a/samples/annotations/src/test/java/samples/annotations/BankTests.java b/samples/annotations/src/test/java/samples/annotations/BankTests.java deleted file mode 100644 index d968d0bf9a..0000000000 --- a/samples/annotations/src/test/java/samples/annotations/BankTests.java +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed 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 - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package samples.annotations; - -import junit.framework.TestCase; - -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; - -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.context.SecurityContextImpl; - -import org.acegisecurity.providers.TestingAuthenticationToken; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import sample.annotations.BankService; - - -/** - * Tests security objects. - * - * @author Ben Alex - * @version $Id$ - */ -public class BankTests extends TestCase { - //~ Instance fields ================================================================================================ - - private BankService service; - private ClassPathXmlApplicationContext ctx; - - //~ Constructors =================================================================================================== - - public BankTests() { - super(); - } - - public BankTests(String arg0) { - super(arg0); - } - - //~ Methods ======================================================================================================== - - private static void createSecureContext() { - TestingAuthenticationToken auth = new TestingAuthenticationToken("test", "test", - new GrantedAuthority[] { - new GrantedAuthorityImpl("ROLE_TELLER"), new GrantedAuthorityImpl("ROLE_PERMISSION_LIST") - }); - - SecurityContextHolder.getContext().setAuthentication(auth); - } - - private static void destroySecureContext() { - SecurityContextHolder.setContext(new SecurityContextImpl()); - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(BankTests.class); - } - - public final void setUp() throws Exception { - super.setUp(); - ctx = new ClassPathXmlApplicationContext("applicationContext-annotations.xml"); - service = (BankService) ctx.getBean("bankService"); - } - - public void testDeniedAccess() throws Exception { - createSecureContext(); - - try { - service.balance("1"); - fail("Should have thrown AccessDeniedException"); - } catch (AccessDeniedException expected) { - assertTrue(true); - } - - destroySecureContext(); - } - - public void testListAccounts() throws Exception { - createSecureContext(); - service.listAccounts(); - destroySecureContext(); - } -} diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml index 2d7382fce0..f691b797ee 100644 --- a/samples/cas/client/pom.xml +++ b/samples/cas/client/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-cas-client diff --git a/samples/cas/pom.xml b/samples/cas/pom.xml index 58d92a2e6b..35c78d2425 100644 --- a/samples/cas/pom.xml +++ b/samples/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-cas diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index ee77b758c3..e03f00cb11 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-cas-server diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml index c5b582ba8e..c257930de3 100644 --- a/samples/contacts/pom.xml +++ b/samples/contacts/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-samples-contacts Spring Security - Contacts sample diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml index ad207b2557..11ce2c5e80 100644 --- a/samples/dms/pom.xml +++ b/samples/dms/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT spring-security-samples-dms Spring Security - DMS sample diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml index 4248c651ee..6a391773ea 100644 --- a/samples/ldap/pom.xml +++ b/samples/ldap/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-ldap @@ -15,11 +15,6 @@ spring-security-core ${project.version} - - org.springframework.security - spring-security-core-tiger - ${project.version} - org.springframework spring-web diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml index a845bf6d69..1d539e0b38 100644 --- a/samples/openid/pom.xml +++ b/samples/openid/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-openid diff --git a/samples/pom.xml b/samples/pom.xml index 18abb13201..fae9d3d73d 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml index 9f134d2d80..7961b18be4 100644 --- a/samples/portlet/pom.xml +++ b/samples/portlet/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-portlet diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml index 4e4a18e35f..91c1be8a20 100644 --- a/samples/preauth/pom.xml +++ b/samples/preauth/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-preauth @@ -15,11 +15,6 @@ spring-security-core ${project.version} - - org.springframework.security - spring-security-core-tiger - ${project.version} - org.springframework spring-web diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index 8e770d3649..f74ee57e65 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-samples-tutorial @@ -15,11 +15,6 @@ spring-security-core ${project.version} - - org.springframework.security - spring-security-core-tiger - ${project.version} - org.springframework.security spring-security-taglibs @@ -47,7 +42,7 @@ javax.servlet servlet-api provided - + javax.servlet jstl @@ -62,7 +57,7 @@ log4j log4j runtime - + @@ -102,4 +97,4 @@ - \ No newline at end of file + diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml index 2f224f7df6..7e30b559b5 100755 --- a/sandbox/heavyduty/pom.xml +++ b/sandbox/heavyduty/pom.xml @@ -4,18 +4,13 @@ spring-security-heavyduty Spring Security - Heavy Duty Sample war - 2.0.4-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.security spring-security-core ${spring.security.version} - - org.springframework.security - spring-security-core-tiger - ${spring.security.version} - org.springframework.security spring-security-taglibs diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml index ea62ecd8fb..edbcb02778 100644 --- a/sandbox/webflow/pom.xml +++ b/sandbox/webflow/pom.xml @@ -10,23 +10,18 @@ org.springframework.security spring-security-samples-webflow Spring Security - Webflow sample - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT war org.springframework.security spring-security-core - 2.0.4 - - - org.springframework.security - spring-security-core-tiger - 2.0.4 + ${project.version} org.springframework.security spring-security-taglibs - 2.0.4 + ${project.version} org.springframework.webflow diff --git a/taglibs/pom.xml b/taglibs/pom.xml index ca015050a8..c791ff32ab 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -3,13 +3,13 @@ spring-security-parent org.springframework.security - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT 4.0.0 org.springframework.security spring-security-taglibs Spring Security - JSP taglibs - 2.0.5-SNAPSHOT + 2.5.0-SNAPSHOT jar