From 757b15343058aa0f0ca0f25a1e0ba601e172b61f Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 22 Sep 2007 11:54:13 +0000 Subject: [PATCH] SEC-562: Repackaging adapters module. --- adapters/cas/pom.xml | 8 ++--- .../adapters/cas/CasPasswordHandler.java | 10 +++--- .../adapters/cas/CasPasswordHandlerProxy.java | 4 +-- .../security}/adapters/cas/package.html | 0 .../cas3/CasAuthenticationHandler.java | 10 +++--- .../adapters/cas/applicationContext.xml | 8 ++--- .../adapters/cas3/applicationContext.xml | 8 ++--- .../cas/CasPasswordHandlerProxyTests.java | 8 ++--- .../adapters/cas/CasPasswordHandlerTests.java | 4 +-- .../cas3/CasAuthenticationHandlerTests.java | 6 ++-- .../cas/applicationContext-invalid.xml | 6 ++-- .../adapters/cas/applicationContext-valid.xml | 8 ++--- adapters/catalina/pom.xml | 8 ++--- .../catalina/CatalinaAcegiUserRealm.java | 12 +++---- .../security}/adapters/catalina/package.html | 0 .../adapters/catalinaAdapterTest-invalid.xml | 2 +- .../adapters/catalinaAdapterTest-valid.xml | 6 ++-- .../catalina/CatalinaAcegiUserRealmTests.java | 10 +++--- adapters/jboss/pom.xml | 8 ++--- .../adapters/jboss/JbossAcegiLoginModule.java | 16 ++++----- .../jboss/JbossIntegrationFilter.java | 10 +++--- .../security}/adapters/jboss/package.html | 0 .../jboss/JbossAcegiLoginModuleTests.java | 28 +++++++-------- .../jboss/JbossIntegrationFilterTests.java | 12 +++---- .../adapters/jboss/MockInitialContext.java | 2 +- .../jboss/MockJbossIntegrationFilter.java | 2 +- adapters/jetty/pom.xml | 8 ++--- .../adapters/jetty/JettyAcegiUserRealm.java | 10 +++--- .../adapters/jetty/JettyAcegiUserToken.java | 8 ++--- .../security}/adapters/jetty/package.html | 0 .../jetty/JettyAcegiUserRealmTests.java | 4 +-- .../jetty/JettyAcegiUserTokenTests.java | 6 ++-- adapters/pom.xml | 12 +++---- adapters/resin/pom.xml | 8 ++--- .../resin/ResinAcegiAuthenticator.java | 12 +++---- .../security}/adapters/resin/package.html | 0 .../resin/ResinAcegiAuthenticatorTests.java | 36 +++++++++---------- core/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 152 insertions(+), 152 deletions(-) rename adapters/cas/src/main/java/org/{acegisecurity => springframework/security}/adapters/cas/CasPasswordHandler.java (91%) rename adapters/cas/src/main/java/org/{acegisecurity => springframework/security}/adapters/cas/CasPasswordHandlerProxy.java (97%) rename adapters/cas/src/main/java/org/{acegisecurity => springframework/security}/adapters/cas/package.html (100%) rename adapters/cas/src/main/java/org/{acegisecurity => springframework/security}/adapters/cas3/CasAuthenticationHandler.java (91%) rename adapters/cas/src/main/resources/org/{acegisecurity => springframework/security}/adapters/cas/applicationContext.xml (78%) rename adapters/cas/src/main/resources/org/{acegisecurity => springframework/security}/adapters/cas3/applicationContext.xml (80%) rename adapters/cas/src/test/java/org/{acegisecurity => springframework/security}/adapters/cas/CasPasswordHandlerProxyTests.java (91%) rename adapters/cas/src/test/java/org/{acegisecurity => springframework/security}/adapters/cas/CasPasswordHandlerTests.java (96%) rename adapters/cas/src/test/java/org/{acegisecurity => springframework/security}/adapters/cas3/CasAuthenticationHandlerTests.java (94%) rename adapters/cas/src/test/resources/org/{acegisecurity => springframework/security}/adapters/cas/applicationContext-invalid.xml (79%) rename adapters/cas/src/test/resources/org/{acegisecurity => springframework/security}/adapters/cas/applicationContext-valid.xml (75%) rename adapters/catalina/src/main/java/org/{acegisecurity => springframework/security}/adapters/catalina/CatalinaAcegiUserRealm.java (94%) rename adapters/catalina/src/main/java/org/{acegisecurity => springframework/security}/adapters/catalina/package.html (100%) rename adapters/catalina/src/main/resources/org/{acegisecurity => springframework/security}/adapters/catalinaAdapterTest-invalid.xml (92%) rename adapters/catalina/src/main/resources/org/{acegisecurity => springframework/security}/adapters/catalinaAdapterTest-valid.xml (82%) rename adapters/catalina/src/test/java/org/{acegisecurity => springframework/security}/adapters/catalina/CatalinaAcegiUserRealmTests.java (97%) rename adapters/jboss/src/main/java/org/{acegisecurity => springframework/security}/adapters/jboss/JbossAcegiLoginModule.java (95%) rename adapters/jboss/src/main/java/org/{acegisecurity => springframework/security}/adapters/jboss/JbossIntegrationFilter.java (93%) rename adapters/jboss/src/main/java/org/{acegisecurity => springframework/security}/adapters/jboss/package.html (100%) rename adapters/jboss/src/test/java/org/{acegisecurity => springframework/security}/adapters/jboss/JbossAcegiLoginModuleTests.java (89%) rename adapters/jboss/src/test/java/org/{acegisecurity => springframework/security}/adapters/jboss/JbossIntegrationFilterTests.java (94%) rename adapters/jboss/src/test/java/org/{acegisecurity => springframework/security}/adapters/jboss/MockInitialContext.java (99%) rename adapters/jboss/src/test/java/org/{acegisecurity => springframework/security}/adapters/jboss/MockJbossIntegrationFilter.java (96%) rename adapters/jetty/src/main/java/org/{acegisecurity => springframework/security}/adapters/jetty/JettyAcegiUserRealm.java (94%) rename adapters/jetty/src/main/java/org/{acegisecurity => springframework/security}/adapters/jetty/JettyAcegiUserToken.java (87%) rename adapters/jetty/src/main/java/org/{acegisecurity => springframework/security}/adapters/jetty/package.html (100%) rename adapters/jetty/src/test/java/org/{acegisecurity => springframework/security}/adapters/jetty/JettyAcegiUserRealmTests.java (98%) rename adapters/jetty/src/test/java/org/{acegisecurity => springframework/security}/adapters/jetty/JettyAcegiUserTokenTests.java (92%) rename adapters/resin/src/main/java/org/{acegisecurity => springframework/security}/adapters/resin/ResinAcegiAuthenticator.java (93%) rename adapters/resin/src/main/java/org/{acegisecurity => springframework/security}/adapters/resin/package.html (100%) rename adapters/resin/src/test/java/org/{acegisecurity => springframework/security}/adapters/resin/ResinAcegiAuthenticatorTests.java (84%) diff --git a/adapters/cas/pom.xml b/adapters/cas/pom.xml index 6aed474f0d..99d576de8d 100644 --- a/adapters/cas/pom.xml +++ b/adapters/cas/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.acegisecurity - acegi-security-adapters + org.springframework.security + spring-security-adapters 2.0-SNAPSHOT - acegi-security-cas - Acegi Security System for Spring - CAS adapter + spring-security-cas + Spring Security - CAS adapter cas diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java b/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java similarity index 91% rename from adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java rename to adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java index 6f82451b7b..bb7e4bc711 100644 --- a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java +++ b/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas; +package org.springframework.security.adapters.cas; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java b/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java similarity index 97% rename from adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java rename to adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java index 5c64ada68b..ae8ce329ca 100644 --- a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java +++ b/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas; +package org.springframework.security.adapters.cas; import edu.yale.its.tp.cas.auth.PasswordHandler; @@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletRequest; * authentication requests to that instance.

*

To configure CAS to use this class, edit CAS' web.xml and define the * edu.yale.its.tp.cas.authHandler context parameter with the value - * org.acegisecurity.adapters.cas.CasPasswordHandlerProxy.

+ * org.springframework.security.adapters.cas.CasPasswordHandlerProxy.

* * @author Ben Alex * @version $Id$ diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/package.html b/adapters/cas/src/main/java/org/springframework/security/adapters/cas/package.html similarity index 100% rename from adapters/cas/src/main/java/org/acegisecurity/adapters/cas/package.html rename to adapters/cas/src/main/java/org/springframework/security/adapters/cas/package.html diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandler.java b/adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java similarity index 91% rename from adapters/cas/src/main/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandler.java rename to adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java index 216eaf3e18..e8d0b90df8 100644 --- a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandler.java +++ b/adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas3; +package org.springframework.security.adapters.cas3; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationManager; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +65,7 @@ public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuth try { this.authenticationManager.authenticate(authenticationRequest); - } catch (final org.acegisecurity.AuthenticationException e) { + } catch (final org.springframework.security.AuthenticationException e) { if (log.isDebugEnabled()) { log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e); } diff --git a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml b/adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml similarity index 78% rename from adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml rename to adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml index 5b62e9282a..3cb3fbdcd4 100644 --- a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml +++ b/adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml @@ -24,7 +24,7 @@ - + marissa=koala,ROLES_IGNORED_BY_CAS @@ -35,11 +35,11 @@ - + - + @@ -47,7 +47,7 @@ - + diff --git a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas3/applicationContext.xml b/adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml similarity index 80% rename from adapters/cas/src/main/resources/org/acegisecurity/adapters/cas3/applicationContext.xml rename to adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml index 145866569c..c44d5b0e38 100644 --- a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas3/applicationContext.xml +++ b/adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml @@ -27,7 +27,7 @@ - + marissa=koala,ROLES_IGNORED_BY_CAS @@ -38,11 +38,11 @@ - + - + @@ -50,7 +50,7 @@ - + diff --git a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java b/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java similarity index 91% rename from adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java rename to adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java index 626d738a47..5d2894d925 100644 --- a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java +++ b/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas; +package org.springframework.security.adapters.cas; import junit.framework.TestCase; @@ -54,7 +54,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testDetectsIfHttpServletRequestNotPassed() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "org/acegisecurity/adapters/cas/applicationContext-valid.xml"); + "org/springframework/security/adapters/cas/applicationContext-valid.xml"); try { proxy.authenticate(null, "x", "y"); @@ -66,7 +66,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testDetectsMissingDelegate() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "org/acegisecurity/adapters/cas/applicationContext-invalid.xml"); + "org/springframework/security/adapters/cas/applicationContext-invalid.xml"); try { proxy.authenticate(new MockHttpServletRequest(), "x", "y"); @@ -78,7 +78,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testNormalOperation() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "org/acegisecurity/adapters/cas/applicationContext-valid.xml"); + "org/springframework/security/adapters/cas/applicationContext-valid.xml"); assertTrue(proxy.authenticate(new MockHttpServletRequest(), "marissa", "koala")); assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", "WRONG_PASSWORD")); assertFalse(proxy.authenticate(new MockHttpServletRequest(), "INVALID_USER_NAME", "WRONG_PASSWORD")); diff --git a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java b/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java similarity index 96% rename from adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java rename to adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java index 3d09d5e67e..88e0e83766 100644 --- a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java +++ b/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas; +package org.springframework.security.adapters.cas; import junit.framework.TestCase; -import org.acegisecurity.MockAuthenticationManager; +import org.springframework.security.MockAuthenticationManager; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandlerTests.java b/adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java similarity index 94% rename from adapters/cas/src/test/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandlerTests.java rename to adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java index c4093160c2..9798e79a7a 100644 --- a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandlerTests.java +++ b/adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.adapters.cas3; +package org.springframework.security.adapters.cas3; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.AuthenticationManager; import org.jasig.cas.authentication.handler.AuthenticationException; import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; @@ -38,7 +38,7 @@ public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSp //~ Methods ======================================================================================================== protected String[] getConfigLocations() { - return new String[] {"/org/acegisecurity/adapters/cas/applicationContext-valid.xml"}; + return new String[] {"/org/springframework/security/adapters/cas/applicationContext-valid.xml"}; } private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) { diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml b/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml similarity index 79% rename from adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml rename to adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml index aae10f013a..4e477e1823 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml +++ b/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -31,11 +31,11 @@ - + - + diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml b/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml similarity index 75% rename from adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml rename to adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml index 89e17407f3..0a7de8a773 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml +++ b/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -31,11 +31,11 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml index 900b38aff2..a68be23ea3 100644 --- a/adapters/catalina/pom.xml +++ b/adapters/catalina/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.acegisecurity - acegi-security-adapters + org.springframework.security + spring-security-adapters 2.0-SNAPSHOT - acegi-security-catalina - Acegi Security System for Spring - Catalina adapter + spring-security-catalina + Spring Security - Catalina adapter tomcat diff --git a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java b/adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealm.java similarity index 94% rename from adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java rename to adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealm.java index f1658cd951..1cd09a2533 100644 --- a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java +++ b/adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealm.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package org.acegisecurity.adapters.catalina; +package org.springframework.security.adapters.catalina; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; diff --git a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/package.html b/adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/package.html similarity index 100% rename from adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/package.html rename to adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/package.html diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml b/adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-invalid.xml similarity index 92% rename from adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml rename to adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-invalid.xml index 8bcb630628..a11f77e501 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml +++ b/adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-invalid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml b/adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-valid.xml similarity index 82% rename from adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml rename to adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-valid.xml index 87e1f1b7bd..bdd59cd3ed 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml +++ b/adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-valid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -34,13 +34,13 @@ - + true - + diff --git a/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java b/adapters/catalina/src/test/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealmTests.java similarity index 97% rename from adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java rename to adapters/catalina/src/test/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealmTests.java index bdf5f32dd4..cc66290171 100644 --- a/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java +++ b/adapters/catalina/src/test/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealmTests.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.acegisecurity.adapters.catalina; +package org.springframework.security.adapters.catalina; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; import org.apache.catalina.LifecycleException; @@ -62,7 +62,7 @@ public class CatalinaAcegiUserRealmTests extends TestCase { throws Exception { CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm(); - URL url = Thread.currentThread().getContextClassLoader().getResource("org/acegisecurity/adapters/" + fileName); + URL url = Thread.currentThread().getContextClassLoader().getResource("org/springframework/security/adapters/" + fileName); if (url == null) { throw new Exception("Could not find " + fileName + " - cannot continue"); diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml index 4263a8d261..e27ad8720d 100644 --- a/adapters/jboss/pom.xml +++ b/adapters/jboss/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.acegisecurity - acegi-security-adapters + org.springframework.security + spring-security-adapters 2.0-SNAPSHOT - acegi-security-jboss - Acegi Security System for Spring - JBoss adapter + spring-security-jboss + Spring Security - JBoss adapter jboss diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java b/adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModule.java similarity index 95% rename from adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java rename to adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModule.java index 7cafa95f95..4516ca2ce0 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java +++ b/adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModule.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; -import org.acegisecurity.AccountExpiredException; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; -import org.acegisecurity.CredentialsExpiredException; +import org.springframework.security.AccountExpiredException; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; +import org.springframework.security.CredentialsExpiredException; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java b/adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossIntegrationFilter.java similarity index 93% rename from adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java rename to adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossIntegrationFilter.java index 313a02c7fb..87de9cd4be 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java +++ b/adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossIntegrationFilter.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.context.HttpSessionContextIntegrationFilter; -import org.acegisecurity.context.SecurityContext; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.context.HttpSessionContextIntegrationFilter; +import org.springframework.security.context.SecurityContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/package.html b/adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/package.html similarity index 100% rename from adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/package.html rename to adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/package.html diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModuleTests.java similarity index 89% rename from adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java rename to adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModuleTests.java index ea214fd221..1d8c6d200b 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java +++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModuleTests.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; import junit.framework.TestCase; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; import org.jboss.security.SimplePrincipal; import org.jboss.security.SimpleGroup; @@ -76,7 +76,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-invalid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-invalid.xml"); try { adapter.initialize(null, null, null, props); @@ -116,7 +116,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); try { adapter.initialize(null, null, null, props); @@ -127,7 +127,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { props = new Properties(); props.put("key", ""); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); try { adapter.initialize(null, null, null, props); @@ -158,7 +158,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); @@ -176,7 +176,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); adapter.initialize(null, null, null, props); assertTrue(true); } @@ -186,7 +186,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo"); @@ -206,7 +206,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("melissa", "koala"); @@ -225,7 +225,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); @@ -252,7 +252,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", null); @@ -272,7 +272,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler(null, null); @@ -292,7 +292,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler(null, "kangaroo"); @@ -311,7 +311,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); Properties props = new Properties(); props.put("key", ADAPTER_KEY); - props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); + props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossIntegrationFilterTests.java similarity index 94% rename from adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java rename to adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossIntegrationFilterTests.java index 9ab16c8013..941c6154cf 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java +++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossIntegrationFilterTests.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.context.SecurityContextImpl; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextImpl; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java similarity index 99% rename from adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java rename to adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java index b60dfa5466..64fa674be6 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java +++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; import java.util.Hashtable; diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java similarity index 96% rename from adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java rename to adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java index 731b219788..957b687d94 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java +++ b/adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jboss; +package org.springframework.security.adapters.jboss; import javax.naming.Context; import javax.naming.NamingException; diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml index b9d776158e..e221bc287b 100644 --- a/adapters/jetty/pom.xml +++ b/adapters/jetty/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.acegisecurity - acegi-security-adapters + org.springframework.security + spring-security-adapters 2.0-SNAPSHOT - acegi-security-jetty - Acegi Security System for Spring - Jetty adapter + spring-security-jetty + Spring Security - Jetty adapter jetty diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java b/adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealm.java similarity index 94% rename from adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java rename to adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealm.java index b0c3997983..3fa9cee548 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java +++ b/adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealm.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jetty; +package org.springframework.security.adapters.jetty; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java b/adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserToken.java similarity index 87% rename from adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java rename to adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserToken.java index cdc814472d..a8b2e5181c 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java +++ b/adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserToken.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jetty; +package org.springframework.security.adapters.jetty; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.GrantedAuthority; -import org.acegisecurity.adapters.AbstractAdapterAuthenticationToken; +import org.springframework.security.adapters.AbstractAdapterAuthenticationToken; import org.mortbay.http.UserPrincipal; /** - * A Jetty compatible {@link org.acegisecurity.Authentication} object. + * A Jetty compatible {@link org.springframework.security.Authentication} object. * * @author Ben Alex * @version $Id$ diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/package.html b/adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/package.html similarity index 100% rename from adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/package.html rename to adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/package.html diff --git a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java b/adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealmTests.java similarity index 98% rename from adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java rename to adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealmTests.java index 4994a6c25f..aa91f61426 100644 --- a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java +++ b/adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealmTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jetty; +package org.springframework.security.adapters.jetty; import junit.framework.TestCase; @@ -50,7 +50,7 @@ public class JettyAcegiUserRealmTests extends TestCase { private JettyAcegiUserRealm makeAdapter(String fileName) throws Exception { - String useFile = "org/acegisecurity/adapters/" + fileName; + String useFile = "org/springframework/security/adapters/" + fileName; return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile); } diff --git a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java b/adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserTokenTests.java similarity index 92% rename from adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java rename to adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserTokenTests.java index bf47c4b1c0..4f97d03255 100644 --- a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java +++ b/adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserTokenTests.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.acegisecurity.adapters.jetty; +package org.springframework.security.adapters.jetty; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; /** diff --git a/adapters/pom.xml b/adapters/pom.xml index 72cfdb990c..a1af7a0f70 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - org.acegisecurity - acegi-security-parent + org.springframework.security + spring-security-parent 2.0-SNAPSHOT - acegi-security-adapters - Acegi Security System for Spring - Adapters + spring-security-adapters + Spring Security System for Spring - Adapters pom - org.acegisecurity - acegi-security + org.springframework.security + spring-security-core ${project.version} diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml index 01be0336d0..7b525b7a85 100644 --- a/adapters/resin/pom.xml +++ b/adapters/resin/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.acegisecurity - acegi-security-adapters + org.springframework.security + spring-security-adapters 2.0-SNAPSHOT - acegi-security-resin - Acegi Security System for Spring - Resin adapter + spring-security-resin + Spring Security - Resin adapter com.caucho diff --git a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java b/adapters/resin/src/main/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticator.java similarity index 93% rename from adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java rename to adapters/resin/src/main/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticator.java index ecb901e95f..7ddbcb9b8b 100644 --- a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java +++ b/adapters/resin/src/main/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticator.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.acegisecurity.adapters.resin; +package org.springframework.security.adapters.resin; import com.caucho.http.security.AbstractAuthenticator; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/package.html b/adapters/resin/src/main/java/org/springframework/security/adapters/resin/package.html similarity index 100% rename from adapters/resin/src/main/java/org/acegisecurity/adapters/resin/package.html rename to adapters/resin/src/main/java/org/springframework/security/adapters/resin/package.html diff --git a/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java b/adapters/resin/src/test/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticatorTests.java similarity index 84% rename from adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java rename to adapters/resin/src/test/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticatorTests.java index 8f2b4d792c..8b909278ce 100644 --- a/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java +++ b/adapters/resin/src/test/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticatorTests.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.acegisecurity.adapters.resin; +package org.springframework.security.adapters.resin; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; -import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.springframework.security.adapters.PrincipalAcegiUserToken; import java.security.Principal; @@ -61,7 +61,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-invalid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-invalid.xml"); adapter.setKey(ADAPTER_KEY); try { @@ -97,7 +97,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAdapterAbortsIfNoKeySpecified() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); try { adapter.init(); @@ -132,7 +132,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAdapterStartsUpSuccess() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(true); @@ -141,7 +141,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationFailsForIncorrectPassword() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("marissa", "kangaroo")); @@ -150,7 +150,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationFailsForIncorrectUserName() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("melissa", "koala")); @@ -158,7 +158,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationSuccess() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); @@ -179,7 +179,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationSuccessUsingAlternateMethod() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); @@ -200,7 +200,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationWithNullPasswordHandledGracefully() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("marissa", null)); @@ -209,7 +209,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationWithNullUserNameHandledGracefully() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl(null, "koala")); @@ -217,15 +217,15 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testGetters() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); assertEquals(ADAPTER_KEY, adapter.getKey()); - assertEquals("org/acegisecurity/adapters/adaptertest-valid.xml", adapter.getAppContextLocation()); + assertEquals("org/springframework/security/adapters/adaptertest-valid.xml", adapter.getAppContextLocation()); } public void testHasRoleWithANullPrincipalFails() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE")); @@ -234,7 +234,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(!adapter.isUserInRole(null, null, null, @@ -251,7 +251,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")}, null); ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); - adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); + adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE")); diff --git a/core/pom.xml b/core/pom.xml index 5f17fa5ab3..8e0ea3288b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -155,7 +155,7 @@ - ${basedir}/src/main/resources/org/acegisecurity/taglibs + ${basedir}/src/main/resources/org/springframework/security/taglibs META-INF diff --git a/pom.xml b/pom.xml index 62d6a41b6b..d97e276ff5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ core core-tiger - + adapters portlet samples ntlm