diff --git a/portlet/pom.xml b/portlet/pom.xml index 70bf9d3d7b..15e7516f05 100644 --- a/portlet/pom.xml +++ b/portlet/pom.xml @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.acegisecurity - acegi-security-parent + org.springframework.security + spring-security-parent 2.0-SNAPSHOT - acegi-security-portlet + spring-security-portlet Acegi Security System for Spring - Portlet support Acegi Security System for Spring - Support for JSR 168 Portlets 0.1-SNAPSHOT - org.acegisecurity - acegi-security + org.springframework.security + spring-security-core 2.0-SNAPSHOT diff --git a/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java b/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java index 08c59b60e4..514bca398c 100644 --- a/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java +++ b/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.context; +package org.springframework.security.context; import java.lang.reflect.Method; @@ -48,7 +48,7 @@ import org.springframework.web.portlet.ModelAndView; *

If a valid SecurityContext cannot be obtained from the PortletSession for * whatever reason, a fresh SecurityContext will be created and used instead. The created object * will be of the instance defined by the {@link #setContext(Class)} method (which defaults to - * {@link org.acegisecurity.context.SecurityContextImpl}.

+ * {@link org.springframework.security.context.SecurityContextImpl}.

* *

A PortletSession may be created by this interceptor if one does not already exist. If at the * end of the portlet request the PortletSession does not exist, one will only be created if @@ -67,7 +67,7 @@ import org.springframework.web.portlet.ModelAndView; * true (setting it to false will cause a startup-time error).

*

This interceptor must be executed before

any authentication processing mechanisms. These - * mechanisms (specifically {@link org.acegisecurity.ui.portlet.PortletProcessingInterceptor}) expect the + * mechanisms (specifically {@link org.springframework.security.ui.portlet.PortletProcessingInterceptor}) expect the * SecurityContextHolder to contain a valid SecurityContext by the time they execute.

* *

An important nuance to this interceptor is that (by default) the SecurityContext is stored @@ -179,7 +179,7 @@ public class PortletSessionContextIntegrationInterceptor // check that the value of context is legal if ((this.context == null) || (!SecurityContext.class.isAssignableFrom(this.context))) { throw new IllegalArgumentException("context must be defined and implement SecurityContext " - + "(typically use org.acegisecurity.context.SecurityContextImpl; existing class is " + + "(typically use org.springframework.security.context.SecurityContextImpl; existing class is " + this.context + ")"); } diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java index 6261feb2a7..4a8efb07e8 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; import java.security.Principal; import java.util.Map; import javax.portlet.PortletRequest; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationServiceException; -import org.acegisecurity.BadCredentialsException; -import org.acegisecurity.providers.AuthenticationProvider; -import org.acegisecurity.providers.portlet.cache.NullUserCache; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationServiceException; +import org.springframework.security.BadCredentialsException; +import org.springframework.security.providers.AuthenticationProvider; +import org.springframework.security.providers.portlet.cache.NullUserCache; +import org.springframework.security.userdetails.UserDetails; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; @@ -35,7 +35,7 @@ import org.springframework.util.Assert; /** *

Processes a JSR 168 Portlet authentication request. The request will typically - * originate from {@link org.acegisecurity.ui.portlet.PortletProcessingInterceptor}.

+ * originate from {@link org.springframework.security.ui.portlet.PortletProcessingInterceptor}.

* *

Be aware that this provider is trusting the portal and portlet container to handle * actual authentication. If a valid {@link PortletAuthenticationToken} is presented with diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java index b468468ecc..b031e03f94 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.providers.AbstractAuthenticationToken; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.providers.AbstractAuthenticationToken; /** * Authentication implementation for JSR 168 Portlet authentication.

The diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java index a4b4f5440b..5d92544d13 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.userdetails.UserDetails; /** * Populates the UserDetails associated with the diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java index 90e3193d54..2ff7147265 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetails; /** * Provides a cache of {@link UserDetails} objects for the diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java index 742e248d01..91b0870161 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.cache; +package org.springframework.security.providers.portlet.cache; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheException; import net.sf.ehcache.Element; -import org.acegisecurity.providers.portlet.UserCache; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.providers.portlet.UserCache; +import org.springframework.security.userdetails.UserDetails; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java index aa5083b5a4..9d89887111 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.cache; +package org.springframework.security.providers.portlet.cache; -import org.acegisecurity.providers.portlet.UserCache; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.providers.portlet.UserCache; +import org.springframework.security.userdetails.UserDetails; /** * UserCache implementation for portlets that does nothing. diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java index 044860971c..d48a2ec48a 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.populator; +package org.springframework.security.providers.portlet.populator; import java.util.ArrayList; import java.util.Iterator; @@ -22,15 +22,15 @@ import java.util.List; import javax.portlet.PortletRequest; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationServiceException; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.providers.portlet.PortletAuthenticationProvider; -import org.acegisecurity.providers.portlet.PortletAuthoritiesPopulator; -import org.acegisecurity.userdetails.User; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationServiceException; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.providers.portlet.PortletAuthenticationProvider; +import org.springframework.security.providers.portlet.PortletAuthoritiesPopulator; +import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.UserDetails; /** *

Populates the portlet authorities via role information from the portlet container. diff --git a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java index 56ea370ecd..2e76a9ef94 100644 --- a/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java +++ b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.populator; +package org.springframework.security.providers.portlet.populator; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationServiceException; -import org.acegisecurity.providers.portlet.PortletAuthenticationProvider; -import org.acegisecurity.providers.portlet.PortletAuthoritiesPopulator; -import org.acegisecurity.userdetails.UserDetails; -import org.acegisecurity.userdetails.UserDetailsService; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationServiceException; +import org.springframework.security.providers.portlet.PortletAuthenticationProvider; +import org.springframework.security.providers.portlet.PortletAuthoritiesPopulator; +import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetailsService; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java index c6ea753ea3..dea51beba5 100644 --- a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java +++ b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.portlet; +package org.springframework.security.ui.portlet; import java.io.IOException; @@ -23,8 +23,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.ui.AuthenticationEntryPoint; +import org.springframework.security.AuthenticationException; +import org.springframework.security.ui.AuthenticationEntryPoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.Ordered; @@ -37,7 +37,7 @@ import org.springframework.core.Ordered; * already failed. Therefore the commence method in this case will * always return HttpServletResponse.SC_FORBIDDEN (HTTP 403 error). * - * @see org.acegisecurity.ui.ExceptionTranslationFilter + * @see org.springframework.security.ui.ExceptionTranslationFilter * @author John A. Lewis * @since 2.0 * @version $Id$ diff --git a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java index 37c6c75264..d12c11f2a1 100644 --- a/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java +++ b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.portlet; +package org.springframework.security.ui.portlet; import java.io.IOException; import java.security.Principal; @@ -30,15 +30,15 @@ import javax.portlet.PortletSession; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; -import org.acegisecurity.context.SecurityContext; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.providers.portlet.PortletAuthenticationProvider; -import org.acegisecurity.providers.portlet.PortletAuthenticationToken; -import org.acegisecurity.providers.portlet.populator.ContainerPortletAuthoritiesPopulator; -import org.acegisecurity.ui.AbstractProcessingFilter; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; +import org.springframework.security.context.SecurityContext; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.portlet.PortletAuthenticationProvider; +import org.springframework.security.providers.portlet.PortletAuthenticationToken; +import org.springframework.security.providers.portlet.populator.ContainerPortletAuthoritiesPopulator; +import org.springframework.security.ui.AbstractProcessingFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; @@ -75,8 +75,8 @@ import org.springframework.web.portlet.ModelAndView; * will replace this with the USER_INFO map in the resulting Authentication * object.

* - * @see org.acegisecurity.ui.AbstractProcessingFilter - * @see org.acegisecurity.ui.webapp.AuthenticationProcessingFilter + * @see org.springframework.security.ui.AbstractProcessingFilter + * @see org.springframework.security.ui.webapp.AuthenticationProcessingFilter * @author John A. Lewis * @since 2.0 * @version $Id$ diff --git a/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java b/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java index 8d03c8c464..dcb4d63eab 100644 --- a/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java +++ b/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.acegisecurity.context; +package org.springframework.security.context; import javax.portlet.PortletSession; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.providers.portlet.PortletAuthenticationToken; -import org.acegisecurity.providers.portlet.PortletTestUtils; -import org.acegisecurity.userdetails.User; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.providers.portlet.PortletAuthenticationToken; +import org.springframework.security.providers.portlet.PortletTestUtils; +import org.springframework.security.userdetails.User; import org.springframework.mock.web.portlet.MockActionRequest; import org.springframework.mock.web.portlet.MockActionResponse; import org.springframework.mock.web.portlet.MockRenderRequest; diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java index be494016a2..bf375998c9 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; import junit.framework.TestCase; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.BadCredentialsException; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.BadCredentialsException; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.userdetails.UserDetails; /** * Tests {@link PortletAuthenticationProvider} diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java index 6a3e9eb653..3f1b62dd39 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; import junit.framework.TestCase; diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java index c2e4156e32..2477945dc0 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet; +package org.springframework.security.providers.portlet; import javax.portlet.PortletRequest; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.context.SecurityContext; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.context.SecurityContextImpl; -import org.acegisecurity.providers.TestingAuthenticationToken; -import org.acegisecurity.userdetails.User; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.context.SecurityContext; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextImpl; +import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.UserDetails; import org.springframework.mock.web.portlet.MockActionRequest; import org.springframework.mock.web.portlet.MockActionResponse; import org.springframework.mock.web.portlet.MockPortletRequest; diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java index dc37b68c2b..5f4f284e0e 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.cache; +package org.springframework.security.providers.portlet.cache; import java.io.IOException; import junit.framework.TestCase; import net.sf.ehcache.Cache; -import org.acegisecurity.providers.portlet.PortletTestUtils; +import org.springframework.security.providers.portlet.PortletTestUtils; import org.springframework.cache.ehcache.EhCacheFactoryBean; /** diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java index 02871cb4ec..16dc728269 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.populator; +package org.springframework.security.providers.portlet.populator; import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; -import org.acegisecurity.AuthenticationServiceException; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.providers.portlet.PortletAuthenticationToken; -import org.acegisecurity.providers.portlet.PortletTestUtils; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.AuthenticationServiceException; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.providers.portlet.PortletAuthenticationToken; +import org.springframework.security.providers.portlet.PortletTestUtils; +import org.springframework.security.userdetails.UserDetails; /** diff --git a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java index a40607a55b..0c4622729a 100644 --- a/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java +++ b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.acegisecurity.providers.portlet.populator; +package org.springframework.security.providers.portlet.populator; import junit.framework.TestCase; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.providers.portlet.PortletAuthenticationToken; -import org.acegisecurity.providers.portlet.PortletTestUtils; -import org.acegisecurity.userdetails.UserDetails; -import org.acegisecurity.userdetails.UserDetailsService; -import org.acegisecurity.userdetails.UsernameNotFoundException; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.providers.portlet.PortletAuthenticationToken; +import org.springframework.security.providers.portlet.PortletTestUtils; +import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.dao.DataAccessException; diff --git a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java index 58176b395e..7eb5d75180 100644 --- a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java +++ b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.acegisecurity.ui.portlet; +package org.springframework.security.ui.portlet; import javax.servlet.http.HttpServletResponse; import junit.framework.TestCase; -import org.acegisecurity.BadCredentialsException; +import org.springframework.security.BadCredentialsException; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java index a619258c8d..6779b59d76 100644 --- a/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java +++ b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.portlet; +package org.springframework.security.ui.portlet; import java.util.ArrayList; import java.util.HashMap; @@ -24,18 +24,18 @@ import javax.portlet.PortletSession; import junit.framework.TestCase; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationManager; -import org.acegisecurity.BadCredentialsException; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.providers.TestingAuthenticationToken; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.providers.portlet.PortletAuthenticationToken; -import org.acegisecurity.providers.portlet.PortletTestUtils; -import org.acegisecurity.ui.AbstractProcessingFilter; -import org.acegisecurity.userdetails.User; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationManager; +import org.springframework.security.BadCredentialsException; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.portlet.PortletAuthenticationToken; +import org.springframework.security.providers.portlet.PortletTestUtils; +import org.springframework.security.ui.AbstractProcessingFilter; +import org.springframework.security.userdetails.User; import org.springframework.mock.web.portlet.MockActionRequest; import org.springframework.mock.web.portlet.MockActionResponse; import org.springframework.mock.web.portlet.MockRenderRequest;