Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-24 03:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-562: Repackaging adapters module.

Browse Source
This commit is contained in:
Luke Taylor 2007-09-22 11:54:13 +00:00
parent d8497a1642
commit 757b153430
39 changed files with 152 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adapters/cas/pom.xml
View File

@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-cas</artifactId> <artifactId>spring-security-cas</artifactId>
<name>Acegi Security System for Spring - CAS adapter</name> <name>Spring Security - CAS adapter</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cas</groupId> <groupId>cas</groupId>

10
adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
View File

@ -13,13 +13,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.cas; package org.springframework.security.adapters.cas;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationManager; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

4
adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.cas; package org.springframework.security.adapters.cas;
import edu.yale.its.tp.cas.auth.PasswordHandler; import edu.yale.its.tp.cas.auth.PasswordHandler;
@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletRequest;
* authentication requests to that instance.</p> * authentication requests to that instance.</p>
* <p>To configure CAS to use this class, edit CAS' <code>web.xml</code> and define the * <p>To configure CAS to use this class, edit CAS' <code>web.xml</code> and define the
* <code>edu.yale.its.tp.cas.authHandler</code> context parameter with the value * <code>edu.yale.its.tp.cas.authHandler</code> context parameter with the value
* <code>org.acegisecurity.adapters.cas.CasPasswordHandlerProxy</code>.</p> * <code>org.springframework.security.adapters.cas.CasPasswordHandlerProxy</code>.</p>
* *
* @author Ben Alex * @author Ben Alex
* @version $Id$ * @version $Id$

0
adapters/cas/src/main/java/org/acegisecurity/adapters/cas/package.html → adapters/cas/src/main/java/org/springframework/security/adapters/cas/package.html
View File

10
adapters/cas/src/main/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandler.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
View File

@ -13,12 +13,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.cas3; package org.springframework.security.adapters.cas3;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationManager; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -65,7 +65,7 @@ public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuth
try { try {
this.authenticationManager.authenticate(authenticationRequest); this.authenticationManager.authenticate(authenticationRequest);
} catch (final org.acegisecurity.AuthenticationException e) { } catch (final org.springframework.security.AuthenticationException e) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e); log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e);
} }

8
adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml → adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
View File

@ -24,7 +24,7 @@
<beans> <beans>
<!-- Data access object which stores authentication information --> <!-- Data access object which stores authentication information -->
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLES_IGNORED_BY_CAS marissa=koala,ROLES_IGNORED_BY_CAS
@ -35,11 +35,11 @@
</property> </property>
</bean> </bean>
<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
</bean> </bean>
<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref bean="daoAuthenticationProvider"/> <ref bean="daoAuthenticationProvider"/>
@ -47,7 +47,7 @@
</property> </property>
</bean> </bean>
<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler"> <bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
<property name="authenticationManager"><ref bean="authenticationManager"/></property> <property name="authenticationManager"><ref bean="authenticationManager"/></property>
</bean> </bean>
</beans> </beans>

8
adapters/cas/src/main/resources/org/acegisecurity/adapters/cas3/applicationContext.xml → adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
View File

@ -27,7 +27,7 @@
<beans> <beans>
<!-- Data access object which stores authentication information --> <!-- Data access object which stores authentication information -->
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLES_IGNORED_BY_CAS marissa=koala,ROLES_IGNORED_BY_CAS
@ -38,11 +38,11 @@
</property> </property>
</bean> </bean>
<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
</bean> </bean>
<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref bean="daoAuthenticationProvider"/> <ref bean="daoAuthenticationProvider"/>
@ -50,7 +50,7 @@
</property> </property>
</bean> </bean>
<bean id="casAuthenticationHandler" class="org.acegisecurity.adapters.cas3.CasAuthenticationHandler"> <bean id="casAuthenticationHandler" class="org.springframework.security.adapters.cas3.CasAuthenticationHandler">
<property name="authenticationManager" ref="authenticationManager" /> <property name="authenticationManager" ref="authenticationManager" />
</bean> </bean>
</beans> </beans>

8
adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.cas; package org.springframework.security.adapters.cas;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -54,7 +54,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
public void testDetectsIfHttpServletRequestNotPassed() { public void testDetectsIfHttpServletRequestNotPassed() {
CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
"org/acegisecurity/adapters/cas/applicationContext-valid.xml"); "org/springframework/security/adapters/cas/applicationContext-valid.xml");
try { try {
proxy.authenticate(null, "x", "y"); proxy.authenticate(null, "x", "y");
@ -66,7 +66,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
public void testDetectsMissingDelegate() { public void testDetectsMissingDelegate() {
CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
"org/acegisecurity/adapters/cas/applicationContext-invalid.xml"); "org/springframework/security/adapters/cas/applicationContext-invalid.xml");
try { try {
proxy.authenticate(new MockHttpServletRequest(), "x", "y"); proxy.authenticate(new MockHttpServletRequest(), "x", "y");
@ -78,7 +78,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
public void testNormalOperation() { public void testNormalOperation() {
CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( 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")); assertTrue(proxy.authenticate(new MockHttpServletRequest(), "marissa", "koala"));
assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", "WRONG_PASSWORD")); assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", "WRONG_PASSWORD"));
assertFalse(proxy.authenticate(new MockHttpServletRequest(), "INVALID_USER_NAME", "WRONG_PASSWORD")); assertFalse(proxy.authenticate(new MockHttpServletRequest(), "INVALID_USER_NAME", "WRONG_PASSWORD"));

4
adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
View File

@ -13,11 +13,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.cas; package org.springframework.security.adapters.cas;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.MockAuthenticationManager; import org.springframework.security.MockAuthenticationManager;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;

6
adapters/cas/src/test/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandlerTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
View File

@ -13,9 +13,9 @@
* limitations under the License. * 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.handler.AuthenticationException;
import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; import org.jasig.cas.authentication.principal.UsernamePasswordCredentials;
@ -38,7 +38,7 @@ public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSp
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
protected String[] getConfigLocations() { 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) { private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) {

6
adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml → adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
View File

@ -20,7 +20,7 @@
<beans> <beans>
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@ -31,11 +31,11 @@
</property> </property>
</bean> </bean>
<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
</bean> </bean>
<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref bean="daoAuthenticationProvider"/> <ref bean="daoAuthenticationProvider"/>

8
adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml → adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
View File

@ -20,7 +20,7 @@
<beans> <beans>
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@ -31,11 +31,11 @@
</property> </property>
</bean> </bean>
<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
</bean> </bean>
<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref bean="daoAuthenticationProvider"/> <ref bean="daoAuthenticationProvider"/>
@ -43,7 +43,7 @@
</property> </property>
</bean> </bean>
<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler"> <bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
<property name="authenticationManager"><ref bean="authenticationManager"/></property> <property name="authenticationManager"><ref bean="authenticationManager"/></property>
</bean> </bean>
</beans> </beans>

8
adapters/catalina/pom.xml
View File

@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-catalina</artifactId> <artifactId>spring-security-catalina</artifactId>
<name>Acegi Security System for Spring - Catalina adapter</name> <name>Spring Security - Catalina adapter</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>tomcat</groupId> <groupId>tomcat</groupId>

12
adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java → adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealm.java
View File

@ -13,15 +13,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.catalina; package org.springframework.security.adapters.catalina;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationManager; 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.Container;
import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleException;

0
adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/package.html → adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/package.html
View File

2
adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml → adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-invalid.xml
View File

@ -22,7 +22,7 @@
<beans> <beans>
<!-- Data access object which stores authentication information --> <!-- Data access object which stores authentication information -->
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR

6
adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml → adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-valid.xml
View File

@ -22,7 +22,7 @@
<beans> <beans>
<!-- Data access object which stores authentication information --> <!-- Data access object which stores authentication information -->
<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
<property name="userMap"> <property name="userMap">
<value> <value>
marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@ -34,13 +34,13 @@
</bean> </bean>
<!-- Authentication provider that queries our data access object --> <!-- Authentication provider that queries our data access object -->
<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
<property name="forcePrincipalAsString"><value>true</value></property> <property name="forcePrincipalAsString"><value>true</value></property>
</bean> </bean>
<!-- The authentication manager that iterates through our only authentication provider --> <!-- The authentication manager that iterates through our only authentication provider -->
<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
<property name="providers"> <property name="providers">
<list> <list>
<ref bean="daoAuthenticationProvider"/> <ref bean="daoAuthenticationProvider"/>

10
adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java → adapters/catalina/src/test/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealmTests.java
View File

@ -13,14 +13,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.catalina; package org.springframework.security.adapters.catalina;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.springframework.security.adapters.PrincipalAcegiUserToken;
import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleException;
@ -62,7 +62,7 @@ public class CatalinaAcegiUserRealmTests extends TestCase {
throws Exception { throws Exception {
CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm(); 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) { if (url == null) {
throw new Exception("Could not find " + fileName + " - cannot continue"); throw new Exception("Could not find " + fileName + " - cannot continue");

8
adapters/jboss/pom.xml
View File

@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-jboss</artifactId> <artifactId>spring-security-jboss</artifactId>
<name>Acegi Security System for Spring - JBoss adapter</name> <name>Spring Security - JBoss adapter</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>jboss</groupId> <groupId>jboss</groupId>

16
adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java → adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModule.java
View File

@ -13,17 +13,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jboss; package org.springframework.security.adapters.jboss;
import org.acegisecurity.AccountExpiredException; import org.springframework.security.AccountExpiredException;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationManager; import org.springframework.security.AuthenticationManager;
import org.acegisecurity.CredentialsExpiredException; 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.SimpleGroup;
import org.jboss.security.SimplePrincipal; import org.jboss.security.SimplePrincipal;

10
adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java → adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossIntegrationFilter.java
View File

@ -13,13 +13,13 @@
* limitations under the License. * 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.springframework.security.context.SecurityContextHolder;
import org.acegisecurity.context.HttpSessionContextIntegrationFilter; import org.springframework.security.context.HttpSessionContextIntegrationFilter;
import org.acegisecurity.context.SecurityContext; import org.springframework.security.context.SecurityContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

0
adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/package.html → adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/package.html
View File

28
adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModuleTests.java
View File

@ -13,11 +13,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jboss; package org.springframework.security.adapters.jboss;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.springframework.security.adapters.PrincipalAcegiUserToken;
import org.jboss.security.SimplePrincipal; import org.jboss.security.SimplePrincipal;
import org.jboss.security.SimpleGroup; import org.jboss.security.SimpleGroup;
@ -76,7 +76,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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 { try {
adapter.initialize(null, null, null, props); adapter.initialize(null, null, null, props);
@ -116,7 +116,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
try { try {
adapter.initialize(null, null, null, props); adapter.initialize(null, null, null, props);
@ -127,7 +127,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
props = new Properties(); props = new Properties();
props.put("key", ""); props.put("key", "");
props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml"); props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
try { try {
adapter.initialize(null, null, null, props); adapter.initialize(null, null, null, props);
@ -158,7 +158,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
@ -176,7 +176,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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); adapter.initialize(null, null, null, props);
assertTrue(true); assertTrue(true);
} }
@ -186,7 +186,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo"); CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo");
@ -206,7 +206,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler("melissa", "koala"); CallbackHandler callback = new MockCallbackHandler("melissa", "koala");
@ -225,7 +225,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); CallbackHandler callback = new MockCallbackHandler("marissa", "koala");
@ -252,7 +252,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler("marissa", null); CallbackHandler callback = new MockCallbackHandler("marissa", null);
@ -272,7 +272,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler(null, null); CallbackHandler callback = new MockCallbackHandler(null, null);
@ -292,7 +292,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler(null, "kangaroo"); CallbackHandler callback = new MockCallbackHandler(null, "kangaroo");
@ -311,7 +311,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
JbossAcegiLoginModule adapter = new JbossAcegiLoginModule(); JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
Properties props = new Properties(); Properties props = new Properties();
props.put("key", ADAPTER_KEY); 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(); Subject subject = new Subject();
CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); CallbackHandler callback = new MockCallbackHandler("marissa", "koala");

12
adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossIntegrationFilterTests.java
View File

@ -13,17 +13,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jboss; package org.springframework.security.adapters.jboss;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.springframework.security.adapters.PrincipalAcegiUserToken;
import org.acegisecurity.context.SecurityContextHolder; import org.springframework.security.context.SecurityContextHolder;
import org.acegisecurity.context.SecurityContextImpl; import org.springframework.security.context.SecurityContextImpl;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;

2
adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jboss; package org.springframework.security.adapters.jboss;
import java.util.Hashtable; import java.util.Hashtable;

2
adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jboss; package org.springframework.security.adapters.jboss;
import javax.naming.Context; import javax.naming.Context;
import javax.naming.NamingException; import javax.naming.NamingException;

8
adapters/jetty/pom.xml
View File

@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-jetty</artifactId> <artifactId>spring-security-jetty</artifactId>
<name>Acegi Security System for Spring - Jetty adapter</name> <name>Spring Security - Jetty adapter</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>jetty</groupId> <groupId>jetty</groupId>

10
adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java → adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealm.java
View File

@ -13,13 +13,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jetty; package org.springframework.security.adapters.jetty;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationManager; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

8
adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java → adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserToken.java
View File

@ -13,17 +13,17 @@
* limitations under the License. * 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; 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 * @author Ben Alex
* @version $Id$ * @version $Id$

0
adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/package.html → adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/package.html
View File

4
adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java → adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealmTests.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jetty; package org.springframework.security.adapters.jetty;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -50,7 +50,7 @@ public class JettyAcegiUserRealmTests extends TestCase {
private JettyAcegiUserRealm makeAdapter(String fileName) private JettyAcegiUserRealm makeAdapter(String fileName)
throws Exception { throws Exception {
String useFile = "org/acegisecurity/adapters/" + fileName; String useFile = "org/springframework/security/adapters/" + fileName;
return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile); return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile);
} }

6
adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java → adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserTokenTests.java
View File

@ -13,12 +13,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.jetty; package org.springframework.security.adapters.jetty;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
/** /**

12
adapters/pom.xml
View File

@ -1,17 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-parent</artifactId> <artifactId>spring-security-parent</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<name>Acegi Security System for Spring - Adapters</name> <name>Spring Security System for Spring - Adapters</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security</artifactId> <artifactId>spring-security-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

8
adapters/resin/pom.xml
View File

@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-adapters</artifactId> <artifactId>spring-security-adapters</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-resin</artifactId> <artifactId>spring-security-resin</artifactId>
<name>Acegi Security System for Spring - Resin adapter</name> <name>Spring Security - Resin adapter</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.caucho</groupId> <groupId>com.caucho</groupId>

12
adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java → adapters/resin/src/main/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticator.java
View File

@ -13,17 +13,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.resin; package org.springframework.security.adapters.resin;
import com.caucho.http.security.AbstractAuthenticator; import com.caucho.http.security.AbstractAuthenticator;
import org.acegisecurity.Authentication; import org.springframework.security.Authentication;
import org.acegisecurity.AuthenticationException; import org.springframework.security.AuthenticationException;
import org.acegisecurity.AuthenticationManager; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

0
adapters/resin/src/main/java/org/acegisecurity/adapters/resin/package.html → adapters/resin/src/main/java/org/springframework/security/adapters/resin/package.html
View File

36
adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java → adapters/resin/src/test/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticatorTests.java
View File

@ -13,14 +13,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.adapters.resin; package org.springframework.security.adapters.resin;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.acegisecurity.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.springframework.security.adapters.PrincipalAcegiUserToken;
import java.security.Principal; import java.security.Principal;
@ -61,7 +61,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean() public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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); adapter.setKey(ADAPTER_KEY);
try { try {
@ -97,7 +97,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAdapterAbortsIfNoKeySpecified() throws Exception { public void testAdapterAbortsIfNoKeySpecified() throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
try { try {
adapter.init(); adapter.init();
@ -132,7 +132,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAdapterStartsUpSuccess() throws Exception { public void testAdapterStartsUpSuccess() throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertTrue(true); assertTrue(true);
@ -141,7 +141,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationFailsForIncorrectPassword() public void testAuthenticationFailsForIncorrectPassword()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertEquals(null, adapter.loginImpl("marissa", "kangaroo")); assertEquals(null, adapter.loginImpl("marissa", "kangaroo"));
@ -150,7 +150,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationFailsForIncorrectUserName() public void testAuthenticationFailsForIncorrectUserName()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertEquals(null, adapter.loginImpl("melissa", "koala")); assertEquals(null, adapter.loginImpl("melissa", "koala"));
@ -158,7 +158,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationSuccess() throws Exception { public void testAuthenticationSuccess() throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
@ -179,7 +179,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationSuccessUsingAlternateMethod() public void testAuthenticationSuccessUsingAlternateMethod()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
@ -200,7 +200,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationWithNullPasswordHandledGracefully() public void testAuthenticationWithNullPasswordHandledGracefully()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertEquals(null, adapter.loginImpl("marissa", null)); assertEquals(null, adapter.loginImpl("marissa", null));
@ -209,7 +209,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testAuthenticationWithNullUserNameHandledGracefully() public void testAuthenticationWithNullUserNameHandledGracefully()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertEquals(null, adapter.loginImpl(null, "koala")); assertEquals(null, adapter.loginImpl(null, "koala"));
@ -217,15 +217,15 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testGetters() throws Exception { public void testGetters() throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
assertEquals(ADAPTER_KEY, adapter.getKey()); 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 { public void testHasRoleWithANullPrincipalFails() throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE")); assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE"));
@ -234,7 +234,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails() public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails()
throws Exception { throws Exception {
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertTrue(!adapter.isUserInRole(null, null, null, 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")}, new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
null); null);
ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); 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.setKey(ADAPTER_KEY);
adapter.init(); adapter.init();
assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE")); assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE"));

2
core/pom.xml
View File

@ -155,7 +155,7 @@
</resource> </resource>
<resource> <resource>
<directory> <directory>
${basedir}/src/main/resources/org/acegisecurity/taglibs ${basedir}/src/main/resources/org/springframework/security/taglibs
</directory> </directory>
<targetPath>META-INF</targetPath> <targetPath>META-INF</targetPath>
<includes> <includes>

2
pom.xml
View File

@ -9,7 +9,7 @@
<modules> <modules>
<module>core</module> <module>core</module>
<module>core-tiger</module> <module>core-tiger</module>
<!--module>adapters</module--> <module>adapters</module>
<module>portlet</module> <module>portlet</module>
<module>samples</module> <module>samples</module>
<module>ntlm</module> <module>ntlm</module>