A public secure object is a secure object diff --git a/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java index b672a06359..ef44972671 100644 --- a/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java @@ -4,7 +4,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; /** * Facade which isolates Spring Security's requirements for evaluation method-security expressions diff --git a/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java index 4b27b8b958..25acb4dfbe 100644 --- a/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java @@ -2,7 +2,7 @@ package org.springframework.security.access.expression; import java.io.Serializable; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; /** * Strategy used in expression evaluation to determine whether a user has a permission or permissions diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java index aaa02d859f..a9ebb24298 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java @@ -7,13 +7,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; -import org.springframework.security.Authentication; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.access.expression.MethodSecurityExpressionHandler; import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.intercept.AfterInvocationProvider; +import org.springframework.security.core.Authentication; /** * AfterInvocationProvider which handles the @PostAuthorize and @PostFilter annotation expressions. diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java index 20c7359835..30162c6502 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java @@ -8,12 +8,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; -import org.springframework.security.Authentication; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.access.expression.MethodSecurityExpressionHandler; import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.vote.AccessDecisionVoter; +import org.springframework.security.core.Authentication; /** * Voter which performs the actions for @PreFilter and @PostAuthorize annotations. diff --git a/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java index 48f7afffd2..7e6cda029b 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java @@ -14,12 +14,12 @@ import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationTrustResolver; -import org.springframework.security.AuthenticationTrustResolverImpl; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.access.expression.MethodSecurityExpressionHandler; import org.springframework.security.access.expression.PermissionEvaluator; +import org.springframework.security.authentication.AuthenticationTrustResolver; +import org.springframework.security.authentication.AuthenticationTrustResolverImpl; +import org.springframework.security.core.Authentication; /** * The standard implementation of SecurityExpressionHandler. diff --git a/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java index 035ba3c8b8..836fd86b4f 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java @@ -4,8 +4,8 @@ import java.io.Serializable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.Authentication; import org.springframework.security.access.expression.PermissionEvaluator; +import org.springframework.security.core.Authentication; /** * A null PermissionEvaluator which denies all access. Used by default for situations when permission diff --git a/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java index 4d1198b4d5..9bf4ef0074 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java @@ -6,7 +6,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.ParameterNameDiscoverer; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; import org.springframework.util.ClassUtils; /** diff --git a/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java index 292cb4eb01..ff08e0dd3c 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java @@ -2,8 +2,8 @@ package org.springframework.security.access.expression.support; import java.io.Serializable; -import org.springframework.security.Authentication; import org.springframework.security.access.expression.PermissionEvaluator; +import org.springframework.security.core.Authentication; /** diff --git a/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java index b7d89a6eb8..0c4dbb436c 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java @@ -2,10 +2,10 @@ package org.springframework.security.access.expression.support; import java.util.Set; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationTrustResolver; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.authentication.AuthenticationTrustResolver; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.GrantedAuthority; /** diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java index f08ee94e68..332f6c067f 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java @@ -16,7 +16,7 @@ package org.springframework.security.access.hierarchicalroles; import java.util.List; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** * The simple interface of a role hierarchy. diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java index a639c34b05..be23735813 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java @@ -15,8 +15,8 @@ package org.springframework.security.access.hierarchicalroles; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.GrantedAuthorityImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java index 5cb67b8bba..8f2c6e9eb8 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java @@ -16,7 +16,7 @@ package org.springframework.security.access.hierarchicalroles; import java.util.List; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; import org.springframework.security.userdetails.UserDetails; /** diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index 741b6943ed..32b7def514 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -29,18 +29,18 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationCredentialsNotFoundException; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.access.AccessDecisionManager; import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.access.AuthenticationCredentialsNotFoundEvent; -import org.springframework.security.access.AuthorizationFailureEvent; -import org.springframework.security.access.AuthorizedEvent; import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.access.PublicInvocationEvent; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent; +import org.springframework.security.access.event.AuthorizationFailureEvent; +import org.springframework.security.access.event.AuthorizedEvent; +import org.springframework.security.access.event.PublicInvocationEvent; +import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.SpringSecurityMessageSource; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.Assert; /** @@ -55,7 +55,7 @@ import org.springframework.util.Assert; *
ConfigAttributes for the secure
* object invocation):
* false, or the {@link #alwaysReauthenticate} is
* true, authenticate the request against the configured {@link AuthenticationManager}.
* When authenticated, replace the Authentication object on the
@@ -282,7 +282,7 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean, A
/**
* Checks the current authentication token and passes it to the AuthenticationManager if
- * {@link org.springframework.security.Authentication#isAuthenticated()} returns false or the property
+ * {@link org.springframework.security.core.Authentication#isAuthenticated()} returns false or the property
* alwaysReauthenticate has been set to true.
*
* @return an authenticated Authentication object.
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
index 7dc567955f..944b7828ac 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
@@ -17,9 +17,9 @@ package org.springframework.security.access.intercept;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
* Reviews the Object returned from a secure object invocation,
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java
index 7baadf7ba9..0ec526ba79 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java
@@ -17,9 +17,9 @@ package org.springframework.security.access.intercept;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
index 6afe1f3148..3e98c1d1b3 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
index 7fdfdf3d7a..ec1c2154f0 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
@@ -17,8 +17,8 @@ package org.springframework.security.access.intercept;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
index 1a9ad1a6d6..250b0b8f2d 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
@@ -17,8 +17,8 @@ package org.springframework.security.access.intercept;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
index 33b3caa3af..9bd539665c 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
@@ -15,12 +15,12 @@
package org.springframework.security.access.intercept;
-import org.springframework.security.SpringSecurityMessageSource;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.providers.AuthenticationProvider;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.beans.factory.InitializingBean;
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
index 1efc9921e3..d8081d7635 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
@@ -17,8 +17,8 @@ package org.springframework.security.access.intercept;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
* Creates a new temporary {@link Authentication} object for the current secure
@@ -30,7 +30,7 @@ import org.springframework.security.access.ConfigAttribute;
* object invocation only. The {@link
* org.springframework.security.access.intercept.AbstractSecurityInterceptor} will replace
* the Authentication object held in the
- * {@link org.springframework.security.context.SecurityContext SecurityContext}
+ * {@link org.springframework.security.core.context.SecurityContext SecurityContext}
* for the duration of the secure object callback only, returning it to
* the original Authentication object when the callback ends.
*
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
index 1641f67548..76e727ea98 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
@@ -19,10 +19,10 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthorityImpl;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
index 8ee38c096d..2d4c8015d5 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
@@ -18,14 +18,14 @@ package org.springframework.security.access.intercept;
import java.util.Arrays;
import java.util.List;
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.providers.AbstractAuthenticationToken;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
/**
- * An immutable {@link org.springframework.security.Authentication} implementation that supports {@link RunAsManagerImpl}.
+ * An immutable {@link org.springframework.security.core.Authentication} implementation that supports {@link RunAsManagerImpl}.
*
* @author Ben Alex
* @version $Id$
diff --git a/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java b/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java
index 1014182bfb..926d67cfcb 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java
@@ -21,10 +21,10 @@ import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
index 021a9bc38e..54ba336420 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
@@ -20,10 +20,10 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.security.SpringSecurityMessageSource;
import org.springframework.security.access.AccessDecisionManager;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
diff --git a/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java b/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java
index 5582523a11..b99ffbe367 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java
@@ -17,8 +17,8 @@ package org.springframework.security.access.vote;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
index 6639a6dbee..03818be860 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
@@ -17,9 +17,9 @@ package org.springframework.security.access.vote;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
index e70b683b75..5dcfdc8a55 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
@@ -17,10 +17,10 @@ package org.springframework.security.access.vote;
import java.util.List;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationTrustResolver;
-import org.springframework.security.AuthenticationTrustResolverImpl;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.authentication.AuthenticationTrustResolver;
+import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
+import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
@@ -31,8 +31,8 @@ import org.springframework.util.Assert;
*
* The current Authentication will be inspected to determine if the principal has a particular
* level of authentication. The "FULLY" authenticated option means the user is authenticated fully (i.e. {@link
- * org.springframework.security.AuthenticationTrustResolver#isAnonymous(Authentication)} is false and {@link
- * org.springframework.security.AuthenticationTrustResolver#isRememberMe(Authentication)} is false). The "REMEMBERED" will grant
+ * org.springframework.security.authentication.AuthenticationTrustResolver#isAnonymous(Authentication)} is false and {@link
+ * org.springframework.security.authentication.AuthenticationTrustResolver#isRememberMe(Authentication)} is false). The "REMEMBERED" will grant
* access if the principal was either authenticated via remember-me OR is fully authenticated. The "ANONYMOUSLY" will
* grant access if the principal was authenticated via remember-me, OR anonymously, OR via full authentication.
*
diff --git a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java index b28ccfa563..eaee380acd 100644 --- a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java @@ -17,9 +17,9 @@ package org.springframework.security.access.vote; import java.util.List; -import org.springframework.security.Authentication; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.core.Authentication; /** * Simple concrete implementation of {@link org.springframework.security.access.AccessDecisionManager} that uses a diff --git a/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java index 652cfe7462..5a5147754b 100644 --- a/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java @@ -21,8 +21,8 @@ import java.util.Map; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.Authentication; import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java index 840979b762..88a91297fe 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java @@ -2,9 +2,9 @@ package org.springframework.security.access.vote; import java.util.List; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; import org.springframework.security.access.hierarchicalroles.RoleHierarchy; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; import org.springframework.util.Assert; /** diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java index 3b60a75b31..cf0133bb5d 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java @@ -17,9 +17,9 @@ package org.springframework.security.access.vote; import java.util.List; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; /** * Votes if any {@link ConfigAttribute#getAttribute()} starts with a prefix @@ -30,7 +30,7 @@ import org.springframework.security.access.ConfigAttribute; *
* Abstains from voting if no configuration attribute commences with the role
* prefix. Votes to grant access if there is an exact matching
- * {@link org.springframework.security.GrantedAuthority} to a ConfigAttribute
+ * {@link org.springframework.security.core.GrantedAuthority} to a ConfigAttribute
* starting with the role prefix. Votes to deny access if there is no exact
* matching GrantedAuthority to a ConfigAttribute
* starting with the role prefix.
diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
index 36068f4bd8..ff32704dca 100644
--- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
@@ -18,9 +18,9 @@ package org.springframework.security.access.vote;
import java.util.ArrayList;
import java.util.List;
-import org.springframework.security.Authentication;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationManager.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java
rename to core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationManager.java
index 0a1d7626bb..55fe54b088 100644
--- a/core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationManager.java
@@ -13,7 +13,10 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
* An abstract implementation of the {@link AuthenticationManager}.
@@ -74,7 +77,7 @@ public abstract class AbstractAuthenticationManager implements AuthenticationMan
* before rethrowing it. This is useful for use with remoting protocols where the information shouldn't
* be serialized to the client. Defaults to 'false'.
*
- * @see org.springframework.security.AuthenticationException#getExtraInformation()
+ * @see org.springframework.security.core.AuthenticationException#getExtraInformation()
*/
public void setClearExtraInformation(boolean clearExtraInformation) {
this.clearExtraInformation = clearExtraInformation;
diff --git a/core/src/main/java/org/springframework/security/providers/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/providers/AbstractAuthenticationToken.java
rename to core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
index acda56535e..b6d03a8c27 100644
--- a/core/src/main/java/org/springframework/security/providers/AbstractAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
@@ -13,14 +13,14 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import java.security.Principal;
import java.util.Collections;
import java.util.List;
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/AccountExpiredException.java b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/AccountExpiredException.java
rename to core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
index 9bed62c7d6..a7f9180b9e 100644
--- a/core/src/main/java/org/springframework/security/AccountExpiredException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
/**
* Thrown if an authentication request is rejected because the account has expired. Makes no assertion as to
diff --git a/core/src/main/java/org/springframework/security/AccountStatusException.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
similarity index 81%
rename from core/src/main/java/org/springframework/security/AccountStatusException.java
rename to core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
index 484fffb856..c0237d1563 100644
--- a/core/src/main/java/org/springframework/security/AccountStatusException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
@@ -1,4 +1,6 @@
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.AuthenticationException;
/**
* Base class for authentication exceptions which are caused by a particular
diff --git a/core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
similarity index 78%
rename from core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java
rename to core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
index de28c595c4..83a2676bea 100644
--- a/core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
@@ -1,12 +1,8 @@
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.security.userdetails.UserDetailsChecker;
import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.LockedException;
-import org.springframework.security.DisabledException;
-import org.springframework.security.AccountExpiredException;
-import org.springframework.security.CredentialsExpiredException;
-import org.springframework.security.SpringSecurityMessageSource;
import org.springframework.context.support.MessageSourceAccessor;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
index e5bedc65d2..e5156726d4 100644
--- a/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
@@ -13,16 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.SpringSecurityMessageSource;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java
rename to core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
index ad2d232a69..e6b82dcd34 100644
--- a/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
import java.io.Serializable;
diff --git a/core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
similarity index 85%
rename from core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
index a985486c7c..24514c432a 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
@@ -13,11 +13,14 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
* Thrown if an authentication request is rejected because there is no {@link Authentication} object in the {@link
- * org.springframework.security.context.SecurityContext SecurityContext}.
+ * org.springframework.security.core.context.SecurityContext SecurityContext}.
*
* @author Ben Alex
* @version $Id$
@@ -25,7 +28,7 @@ package org.springframework.security;
public class AuthenticationCredentialsNotFoundException extends AuthenticationException {
//~ Constructors ===================================================================================================
-/**
+ /**
* Constructs an AuthenticationCredentialsNotFoundException
* with the specified message.
*
@@ -35,7 +38,7 @@ public class AuthenticationCredentialsNotFoundException extends AuthenticationEx
super(msg);
}
-/**
+ /**
* Constructs an AuthenticationCredentialsNotFoundException
* with the specified message and root cause.
*
diff --git a/core/src/main/java/org/springframework/security/AuthenticationDetails.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetails.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/AuthenticationDetails.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationDetails.java
index 1176ad4f4b..878c210a84 100755
--- a/core/src/main/java/org/springframework/security/AuthenticationDetails.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetails.java
@@ -1,4 +1,4 @@
-package org.springframework.security;
+package org.springframework.security.authentication;
import java.io.Serializable;
diff --git a/core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
similarity index 82%
rename from core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
index 6290cf06fd..fee52c58aa 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
@@ -13,12 +13,14 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.Authentication;
/**
- * Provides a {@link org.springframework.security.Authentication#getDetails()} object for
+ * Provides a {@link org.springframework.security.core.Authentication#getDetails()} object for
* a given web request.
*
* @author Ben Alex
diff --git a/core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
similarity index 95%
rename from core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
index 249b085850..f444b10dca 100755
--- a/core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
@@ -1,8 +1,8 @@
-package org.springframework.security;
+package org.springframework.security.authentication;
import java.lang.reflect.Constructor;
-import org.springframework.security.AuthenticationDetailsSource;
+import org.springframework.security.authentication.AuthenticationDetailsSource;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
diff --git a/core/src/main/java/org/springframework/security/AuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
similarity index 93%
rename from core/src/main/java/org/springframework/security/AuthenticationManager.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
index 622f016297..6ed7cab4c8 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
@@ -13,7 +13,10 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
* Processes an {@link Authentication} request.
diff --git a/core/src/main/java/org/springframework/security/providers/AuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
similarity index 88%
rename from core/src/main/java/org/springframework/security/providers/AuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
index 04ed348132..455f650de7 100644
--- a/core/src/main/java/org/springframework/security/providers/AuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
* Indicates a class can process a specific {@link
- * org.springframework.security.Authentication} implementation.
+ * org.springframework.security.core.Authentication} implementation.
*
* @author Ben Alex
* @version $Id$
@@ -31,7 +31,7 @@ public interface AuthenticationProvider {
/**
* Performs authentication with the same contract as {@link
- * org.springframework.security.AuthenticationManager#authenticate(Authentication)}.
+ * org.springframework.security.authentication.AuthenticationManager#authenticate(Authentication)}.
*
* @param authentication the authentication request object.
*
diff --git a/core/src/main/java/org/springframework/security/AuthenticationServiceException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/AuthenticationServiceException.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
index bd3f1a30ac..c07ae4f5ac 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationServiceException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
@@ -13,7 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.AuthenticationException;
/**
* Thrown if an authentication request could not be processed due to a system problem.
This might be thrown if a
diff --git a/core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
index d730c990f9..de9351ac46 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
@@ -13,7 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.Authentication;
/**
* Evaluates Authentication tokens
diff --git a/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java
rename to core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
index db65d2f7cd..c37f69af28 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
@@ -13,10 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
-import org.springframework.security.providers.AnonymousAuthenticationToken;
-import org.springframework.security.providers.RememberMeAuthenticationToken;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/BadCredentialsException.java b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
similarity index 93%
rename from core/src/main/java/org/springframework/security/BadCredentialsException.java
rename to core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
index a7a39e992f..044b1fb43b 100644
--- a/core/src/main/java/org/springframework/security/BadCredentialsException.java
+++ b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
@@ -13,7 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.AuthenticationException;
/**
* Thrown if an authentication request is rejected because the credentials are invalid. For this exception to be
diff --git a/core/src/main/java/org/springframework/security/CredentialsExpiredException.java b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/CredentialsExpiredException.java
rename to core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
index 8b2714218c..145c3a4f7a 100644
--- a/core/src/main/java/org/springframework/security/CredentialsExpiredException.java
+++ b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
/**
* Thrown if an authentication request is rejected because the account's credentials have expired. Makes no
diff --git a/core/src/main/java/org/springframework/security/DisabledException.java b/core/src/main/java/org/springframework/security/authentication/DisabledException.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/DisabledException.java
rename to core/src/main/java/org/springframework/security/authentication/DisabledException.java
index e318dd9cb2..6476a6678b 100644
--- a/core/src/main/java/org/springframework/security/DisabledException.java
+++ b/core/src/main/java/org/springframework/security/authentication/DisabledException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
/**
* Thrown if an authentication request is rejected because the account is disabled. Makes no assertion as to
diff --git a/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
similarity index 68%
rename from core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java
rename to core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
index 5f79204349..f5991411ae 100644
--- a/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
@@ -13,14 +13,19 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.AuthenticationException;
+
/**
- * Thrown if an authentication request is rejected because the credentials are not sufficiently trusted.
{{@link
- * org.springframework.security.access.vote.AccessDecisionVoter}s will typically throw this exception if they are dissatisfied with the
- * level of the authentication, such as if performed using a remember-me mechanism or anonymously. The commonly used
- * {@link org.springframework.security.ui.ExceptionTranslationFilter} will thus cause the AuthenticationEntryPoint
- * to be called, allowing the principal to authenticate with a stronger level of authentication.}
+ * {@link org.springframework.security.access.vote.AccessDecisionVoter}s will typically throw this exception if
+ * they are dissatisfied with the level of the authentication, such as if performed using a remember-me mechanism or
+ * anonymously. The commonly used {@link org.springframework.security.web.ExceptionTranslationFilter} will thus cause
+ * the AuthenticationEntryPoint to be called, allowing the principal to authenticate with a stronger
+ * level of authentication.
InsufficientAuthenticationException with the
* specified message.
*
@@ -38,7 +43,7 @@ public class InsufficientAuthenticationException extends AuthenticationException
super(msg);
}
-/**
+ /**
* Constructs an InsufficientAuthenticationException with the
* specified message and root cause.
*
diff --git a/core/src/main/java/org/springframework/security/LockedException.java b/core/src/main/java/org/springframework/security/authentication/LockedException.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/LockedException.java
rename to core/src/main/java/org/springframework/security/authentication/LockedException.java
index d6b32c8038..aedf5c362c 100644
--- a/core/src/main/java/org/springframework/security/LockedException.java
+++ b/core/src/main/java/org/springframework/security/authentication/LockedException.java
@@ -13,7 +13,8 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.authentication;
+
/**
* Thrown if an authentication request is rejected because the account is locked. Makes no assertion as to whether
diff --git a/core/src/main/java/org/springframework/security/providers/ProviderManager.java b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java
similarity index 88%
rename from core/src/main/java/org/springframework/security/providers/ProviderManager.java
rename to core/src/main/java/org/springframework/security/authentication/ProviderManager.java
index 0a12cc5310..12d298cfa8 100644
--- a/core/src/main/java/org/springframework/security/providers/ProviderManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -29,31 +29,23 @@ import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.security.AbstractAuthenticationManager;
-import org.springframework.security.AccountExpiredException;
-import org.springframework.security.AccountStatusException;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.AuthenticationServiceException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.CredentialsExpiredException;
-import org.springframework.security.DisabledException;
-import org.springframework.security.LockedException;
-import org.springframework.security.SpringSecurityMessageSource;
-import org.springframework.security.concurrent.ConcurrentLoginException;
-import org.springframework.security.concurrent.ConcurrentSessionController;
-import org.springframework.security.concurrent.NullConcurrentSessionController;
-import org.springframework.security.event.authentication.AbstractAuthenticationEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureBadCredentialsEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureConcurrentLoginEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureCredentialsExpiredEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureDisabledEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureExpiredEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureLockedEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureProviderNotFoundEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureProxyUntrustedEvent;
-import org.springframework.security.event.authentication.AuthenticationFailureServiceExceptionEvent;
-import org.springframework.security.event.authentication.AuthenticationSuccessEvent;
+import org.springframework.security.authentication.concurrent.ConcurrentLoginException;
+import org.springframework.security.authentication.concurrent.ConcurrentSessionController;
+import org.springframework.security.authentication.concurrent.NullConcurrentSessionController;
+import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureConcurrentLoginEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureCredentialsExpiredEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureDisabledEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureExpiredEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureLockedEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureProviderNotFoundEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureProxyUntrustedEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureServiceExceptionEvent;
+import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.security.userdetails.UsernameNotFoundException;
import org.springframework.util.Assert;
@@ -80,13 +72,13 @@ import org.springframework.util.Assert;
*
* If a valid Authentication is returned by an AuthenticationProvider, the
* ProviderManager will publish an
- * {@link org.springframework.security.event.authentication.AuthenticationSuccessEvent}. If an
+ * {@link org.springframework.security.authentication.event.AuthenticationSuccessEvent}. If an
* AuthenticationException is detected, the final AuthenticationException thrown will be
* used to publish an appropriate failure event. By default ProviderManager maps common exceptions to
* events, but this can be fine-tuned by providing a new exceptionMappingsjava.util.Properties
* object. In the properties object, each of the keys represent the fully qualified classname of the exception, and
* each of the values represent the name of an event class which subclasses
- * {@link org.springframework.security.event.authentication.AbstractAuthenticationFailureEvent}
+ * {@link org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent}
* and provides its constructor.
*
*
@@ -129,7 +121,7 @@ public class ProviderManager extends AbstractAuthenticationManager implements In
AuthenticationFailureConcurrentLoginEvent.class.getName());
DEFAULT_EXCEPTION_MAPPINGS.put(ProviderNotFoundException.class.getName(),
AuthenticationFailureProviderNotFoundEvent.class.getName());
- DEFAULT_EXCEPTION_MAPPINGS.put("org.springframework.security.providers.cas.ProxyUntrustedException",
+ DEFAULT_EXCEPTION_MAPPINGS.put("org.springframework.security.authentication.cas.ProxyUntrustedException",
AuthenticationFailureProxyUntrustedEvent.class.getName());
}
diff --git a/core/src/main/java/org/springframework/security/providers/ProviderNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
similarity index 88%
rename from core/src/main/java/org/springframework/security/providers/ProviderNotFoundException.java
rename to core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
index 990fc8186f..d1e9279e3e 100644
--- a/core/src/main/java/org/springframework/security/providers/ProviderNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
@@ -13,14 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
+
+import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.AuthenticationException;
/**
* Thrown by {@link ProviderManager} if no {@link AuthenticationProvider} could be found that supports the
- * presented {@link org.springframework.security.Authentication} object.
+ * presented {@link org.springframework.security.core.Authentication} object.
*
* @author Ben Alex
* @version $Id$
diff --git a/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
index 77bb447fe7..e4cf311534 100644
--- a/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
@@ -13,16 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.SpringSecurityMessageSource;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java
rename to core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
index e808154880..16a0e79b48 100644
--- a/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
@@ -13,13 +13,13 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/TestingAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
similarity index 89%
rename from core/src/main/java/org/springframework/security/providers/TestingAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
index 091f446712..ae118e5bc4 100644
--- a/core/src/main/java/org/springframework/security/providers/TestingAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
@@ -13,10 +13,10 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/TestingAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
similarity index 88%
rename from core/src/main/java/org/springframework/security/providers/TestingAuthenticationToken.java
rename to core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
index 95305554a0..0a2943ed25 100644
--- a/core/src/main/java/org/springframework/security/providers/TestingAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
@@ -13,17 +13,17 @@
* limitations under the License.
*/
-package org.springframework.security.providers;
+package org.springframework.security.authentication;
import java.util.Arrays;
import java.util.List;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.util.AuthorityUtils;
+import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.GrantedAuthority;
/**
- * An {@link org.springframework.security.Authentication} implementation that is designed for use whilst unit testing.
+ * An {@link org.springframework.security.core.Authentication} implementation that is designed for use whilst unit testing.
*
* The corresponding authentication provider is {@link TestingAuthenticationProvider}. * diff --git a/core/src/main/java/org/springframework/security/providers/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java similarity index 93% rename from core/src/main/java/org/springframework/security/providers/UsernamePasswordAuthenticationToken.java rename to core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java index 72f8b03320..fd5c920cf5 100644 --- a/core/src/main/java/org/springframework/security/providers/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package org.springframework.security.providers; +package org.springframework.security.authentication; import java.util.Arrays; import java.util.List; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** - * An {@link org.springframework.security.Authentication} implementation that is designed for simple presentation of a + * An {@link org.springframework.security.core.Authentication} implementation that is designed for simple presentation of a * username and password. *
* The principal and credentials should be set with an Object that provides
diff --git a/core/src/main/java/org/springframework/security/concurrent/ConcurrentLoginException.java b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentLoginException.java
similarity index 89%
rename from core/src/main/java/org/springframework/security/concurrent/ConcurrentLoginException.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentLoginException.java
index b7258aa646..ca5632735b 100644
--- a/core/src/main/java/org/springframework/security/concurrent/ConcurrentLoginException.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentLoginException.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.AuthenticationException;
/**
diff --git a/core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionController.java b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionController.java
similarity index 89%
rename from core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionController.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionController.java
index aa568b53ed..c09e570d51 100644
--- a/core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionController.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionController.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
* Provides two methods that can be called by an {@link
- * org.springframework.security.AuthenticationManager} to integrate with the
+ * org.springframework.security.authentication.AuthenticationManager} to integrate with the
* concurrent session handling infrastructure.
*
* @author Ben Alex
diff --git a/core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionControllerImpl.java b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionControllerImpl.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionControllerImpl.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionControllerImpl.java
index bc838ad036..10df5b2ca2 100644
--- a/core/src/main/java/org/springframework/security/concurrent/ConcurrentSessionControllerImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/ConcurrentSessionControllerImpl.java
@@ -13,11 +13,11 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.SpringSecurityMessageSource;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.beans.factory.InitializingBean;
diff --git a/core/src/main/java/org/springframework/security/concurrent/NullConcurrentSessionController.java b/core/src/main/java/org/springframework/security/authentication/concurrent/NullConcurrentSessionController.java
similarity index 77%
rename from core/src/main/java/org/springframework/security/concurrent/NullConcurrentSessionController.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/NullConcurrentSessionController.java
index 27dabcfef8..0e42e07860 100644
--- a/core/src/main/java/org/springframework/security/concurrent/NullConcurrentSessionController.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/NullConcurrentSessionController.java
@@ -13,14 +13,14 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
/**
- * No-op implementation of {@link org.springframework.security.concurrent.ConcurrentSessionController}.
+ * No-op implementation of {@link org.springframework.security.authentication.concurrent.ConcurrentSessionController}.
*
* @author Ben Alex
* @version $Id$
diff --git a/core/src/main/java/org/springframework/security/concurrent/SessionAlreadyUsedException.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionAlreadyUsedException.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/concurrent/SessionAlreadyUsedException.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/SessionAlreadyUsedException.java
index 564dc548f6..b4df1c7a41 100644
--- a/core/src/main/java/org/springframework/security/concurrent/SessionAlreadyUsedException.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionAlreadyUsedException.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.AuthenticationException;
+import org.springframework.security.core.AuthenticationException;
/**
diff --git a/core/src/main/java/org/springframework/security/concurrent/SessionIdentifierAware.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionIdentifierAware.java
similarity index 84%
rename from core/src/main/java/org/springframework/security/concurrent/SessionIdentifierAware.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/SessionIdentifierAware.java
index 5a42245db8..a84a4468d2 100644
--- a/core/src/main/java/org/springframework/security/concurrent/SessionIdentifierAware.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionIdentifierAware.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
/**
- * Implemented by {@link org.springframework.security.Authentication#getDetails()}
+ * Implemented by {@link org.springframework.security.core.Authentication#getDetails()}
* implementations that are capable of returning a session ID.
*
*
* This interface is used by {@link
- * org.springframework.security.concurrent.SessionRegistryUtils} to extract the session
+ * org.springframework.security.authentication.concurrent.SessionRegistryUtils} to extract the session
* ID from an Authentication object. In turn,
* SessionRegistryUtils is used by {@link
* ConcurrentSessionControllerImpl}. If not using this latter implementation,
diff --git a/core/src/main/java/org/springframework/security/concurrent/SessionInformation.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionInformation.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/concurrent/SessionInformation.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/SessionInformation.java
index ee1327f722..0217bf35d4 100644
--- a/core/src/main/java/org/springframework/security/concurrent/SessionInformation.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionInformation.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/concurrent/SessionRegistry.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistry.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/concurrent/SessionRegistry.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistry.java
index 7b953003f2..f8a7236515 100644
--- a/core/src/main/java/org/springframework/security/concurrent/SessionRegistry.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistry.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
/**
* Maintains a registry of SessionInformation instances.
diff --git a/core/src/main/java/org/springframework/security/concurrent/SessionRegistryUtils.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/concurrent/SessionRegistryUtils.java
rename to core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java
index 3d495a63ff..4c80219c03 100644
--- a/core/src/main/java/org/springframework/security/concurrent/SessionRegistryUtils.java
+++ b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java
@@ -13,10 +13,10 @@
* limitations under the License.
*/
-package org.springframework.security.concurrent;
+package org.springframework.security.authentication.concurrent;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/concurrent/package.html b/core/src/main/java/org/springframework/security/authentication/concurrent/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/concurrent/package.html
rename to core/src/main/java/org/springframework/security/authentication/concurrent/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
similarity index 95%
rename from core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
index 4e0cea833a..4be23d476b 100644
--- a/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
@@ -13,19 +13,19 @@
* limitations under the License.
*/
-package org.springframework.security.providers.dao;
+package org.springframework.security.authentication.dao;
-import org.springframework.security.AccountExpiredException;
-import org.springframework.security.SpringSecurityMessageSource;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.CredentialsExpiredException;
-import org.springframework.security.DisabledException;
-import org.springframework.security.LockedException;
-import org.springframework.security.providers.AuthenticationProvider;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.AccountExpiredException;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.SpringSecurityMessageSource;
import org.springframework.security.userdetails.UserCache;
import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
similarity index 87%
rename from core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
index 81ed329297..cebee3df5b 100644
--- a/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers.dao;
+package org.springframework.security.authentication.dao;
-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.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.encoding.PasswordEncoder;
-import org.springframework.security.providers.encoding.PlaintextPasswordEncoder;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
+import org.springframework.security.core.AuthenticationException;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.dao.DataAccessException;
@@ -139,7 +139,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
* thrown BadCredentialsException. Defaults to true, but can be set to false if the exception will be
* used with a remoting protocol, for example.
*
- * @deprecated use {@link org.springframework.security.providers.ProviderManager#setClearExtraInformation(boolean)}
+ * @deprecated use {@link org.springframework.security.authentication.ProviderManager#setClearExtraInformation(boolean)}
*/
public void setIncludeDetailsObject(boolean includeDetailsObject) {
this.includeDetailsObject = includeDetailsObject;
diff --git a/core/src/main/java/org/springframework/security/providers/dao/SaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
similarity index 95%
rename from core/src/main/java/org/springframework/security/providers/dao/SaltSource.java
rename to core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
index 2523356887..daba51ac92 100644
--- a/core/src/main/java/org/springframework/security/providers/dao/SaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.providers.dao;
+package org.springframework.security.authentication.dao;
import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/providers/dao/package.html b/core/src/main/java/org/springframework/security/authentication/dao/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/dao/package.html
rename to core/src/main/java/org/springframework/security/authentication/dao/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/dao/salt/ReflectionSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java
similarity index 95%
rename from core/src/main/java/org/springframework/security/providers/dao/salt/ReflectionSaltSource.java
rename to core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java
index 365a099339..c3ab47e482 100644
--- a/core/src/main/java/org/springframework/security/providers/dao/salt/ReflectionSaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java
@@ -13,11 +13,11 @@
* limitations under the License.
*/
-package org.springframework.security.providers.dao.salt;
+package org.springframework.security.authentication.dao.salt;
-import org.springframework.security.AuthenticationServiceException;
-import org.springframework.security.providers.dao.SaltSource;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.authentication.dao.SaltSource;
import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/providers/dao/salt/SystemWideSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/providers/dao/salt/SystemWideSaltSource.java
rename to core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java
index fbf7445af0..2ce8f33ac8 100644
--- a/core/src/main/java/org/springframework/security/providers/dao/salt/SystemWideSaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.providers.dao.salt;
+package org.springframework.security.authentication.dao.salt;
-import org.springframework.security.providers.dao.SaltSource;
+import org.springframework.security.authentication.dao.SaltSource;
import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/providers/dao/salt/package.html b/core/src/main/java/org/springframework/security/authentication/dao/salt/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/dao/salt/package.html
rename to core/src/main/java/org/springframework/security/authentication/dao/salt/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/encoding/BaseDigestPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/providers/encoding/BaseDigestPasswordEncoder.java
rename to core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
index 6a6d07dd70..7c43e19785 100644
--- a/core/src/main/java/org/springframework/security/providers/encoding/BaseDigestPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.providers.encoding;
+package org.springframework.security.authentication.encoding;
/**
*
Convenience base for digest password encoders.
diff --git a/core/src/main/java/org/springframework/security/providers/encoding/BasePasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java similarity index 98% rename from core/src/main/java/org/springframework/security/providers/encoding/BasePasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java index df232c6e90..9d94126f5d 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/BasePasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; /** *Convenience base for all password encoders.
diff --git a/core/src/main/java/org/springframework/security/providers/encoding/LdapShaPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java similarity index 99% rename from core/src/main/java/org/springframework/security/providers/encoding/LdapShaPasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java index f565254027..7df8005392 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/LdapShaPasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; import org.apache.commons.codec.binary.Base64; diff --git a/core/src/main/java/org/springframework/security/providers/encoding/Md4.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java similarity index 96% rename from core/src/main/java/org/springframework/security/providers/encoding/Md4.java rename to core/src/main/java/org/springframework/security/authentication/encoding/Md4.java index d22f88d169..ad8ab5750f 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/Md4.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; /** * Implementation of the MD4 message digest derived from the RSA Data Security, Inc, MD4 Message-Digest Algorithm. diff --git a/core/src/main/java/org/springframework/security/providers/encoding/Md4PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/encoding/Md4PasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java index 16f4acd049..1fbd84b58c 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/Md4PasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/org/springframework/security/providers/encoding/Md5PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/encoding/Md5PasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java index 6a2b1f598b..55f4ac67fd 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/Md5PasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; /** *MD5 implementation of PasswordEncoder.
diff --git a/core/src/main/java/org/springframework/security/providers/encoding/MessageDigestPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java similarity index 94% rename from core/src/main/java/org/springframework/security/providers/encoding/MessageDigestPasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java index 1ce21cb6ce..5e10708622 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/MessageDigestPasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java @@ -1,4 +1,4 @@ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; @@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException; *
* This PasswordEncoder can be used directly as in the following example:
*
- * <bean id="passwordEncoder" class="org.springframework.security.providers.encoding.MessageDigestPasswordEncoder"> + * <bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder"> * <constructor-arg value="MD5"/> * </bean> *diff --git a/core/src/main/java/org/springframework/security/providers/encoding/PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java similarity index 98% rename from core/src/main/java/org/springframework/security/providers/encoding/PasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java index 53e095a7e9..ac9d3ac9ab 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/PasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; import org.springframework.dao.DataAccessException; diff --git a/core/src/main/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java similarity index 98% rename from core/src/main/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java index 97565dcc5a..707520e5aa 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; /** *
Plaintext implementation of PasswordEncoder.
diff --git a/core/src/main/java/org/springframework/security/providers/encoding/ShaPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java similarity index 94% rename from core/src/main/java/org/springframework/security/providers/encoding/ShaPasswordEncoder.java rename to core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java index 949c21c291..0f64a270ba 100644 --- a/core/src/main/java/org/springframework/security/providers/encoding/ShaPasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.encoding; +package org.springframework.security.authentication.encoding; /** *SHA implementation of PasswordEncoder.
@@ -25,7 +25,7 @@ package org.springframework.security.providers.encoding; ** The applicationContext example... *
- * <bean id="passwordEncoder" class="org.springframework.security.providers.encoding.ShaPasswordEncoder"> + * <bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder"> * <constructor-arg value="256"/> * </bean> *diff --git a/core/src/main/java/org/springframework/security/providers/encoding/package.html b/core/src/main/java/org/springframework/security/authentication/encoding/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/providers/encoding/package.html rename to core/src/main/java/org/springframework/security/authentication/encoding/package.html diff --git a/core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java similarity index 93% rename from core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java index 5b3181316d..5b8606db49 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; import org.springframework.context.ApplicationEvent; diff --git a/core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationFailureEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java similarity index 90% rename from core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationFailureEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java index d9de8d5200..b389c13056 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AbstractAuthenticationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureBadCredentialsEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureBadCredentialsEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java index 281ef8377e..4301d251f0 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureBadCredentialsEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureConcurrentLoginEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureConcurrentLoginEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureConcurrentLoginEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureConcurrentLoginEvent.java index 815087d9dd..48c6c65444 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureConcurrentLoginEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureConcurrentLoginEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java index c862a90b15..f1031f75f5 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureDisabledEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureDisabledEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java index 8005d02891..9ed1a7b3a3 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureDisabledEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureExpiredEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java index 3054d13ce2..963d7ce018 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureExpiredEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureLockedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureLockedEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java index 2f65f92664..ae17e53a93 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureLockedEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProviderNotFoundEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java similarity index 87% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProviderNotFoundEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java index 74648ccbbd..1f3cd27020 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProviderNotFoundEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProxyUntrustedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProxyUntrustedEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java index 530c0b22bc..84437ca104 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureProxyUntrustedEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureServiceExceptionEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java similarity index 86% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureServiceExceptionEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java index 82b4793220..460ef00502 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationFailureServiceExceptionEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java similarity index 90% rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationSuccessEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java index f6e12655c2..1064fea060 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; /** diff --git a/core/src/main/java/org/springframework/security/event/authentication/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java similarity index 94% rename from core/src/main/java/org/springframework/security/event/authentication/InteractiveAuthenticationSuccessEvent.java rename to core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java index 831cddc6a2..0deee4da6f 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/InteractiveAuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/event/authentication/LoggerListener.java b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java similarity index 98% rename from core/src/main/java/org/springframework/security/event/authentication/LoggerListener.java rename to core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java index bcbe38d7c1..9530608710 100644 --- a/core/src/main/java/org/springframework/security/event/authentication/LoggerListener.java +++ b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.event.authentication; +package org.springframework.security.authentication.event; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/springframework/security/authentication/event/package.html b/core/src/main/java/org/springframework/security/authentication/event/package.html new file mode 100644 index 0000000000..2aabcd0a02 --- /dev/null +++ b/core/src/main/java/org/springframework/security/authentication/event/package.html @@ -0,0 +1,9 @@ + + +Enables authentication events to be published to the Spring application context. + +
The ProviderManager automatically publishes
+events to the application context. These events are received by all
+registered Spring ApplicationListeners.
This AuthenticationProvider is capable of validating {@link
- * org.springframework.security.providers.UsernamePasswordAuthenticationToken} requests contain the correct username and
+ * org.springframework.security.authentication.UsernamePasswordAuthenticationToken} requests contain the correct username and
* password.
This implementation is backed by a JAAS configuration. The @@ -75,7 +75,7 @@ import org.springframework.util.Assert; * The loginContextName should coincide with a given index in the loginConfig specifed. The loginConfig file * used in the JUnit tests appears as the following... *
JAASTest {
- * org.springframework.security.providers.jaas.TestLoginModule required;
+ * org.springframework.security.authentication.jaas.TestLoginModule required;
* };
*
* Using the example login configuration above, the loginContextName property would be set as JAASTest...
@@ -92,14 +92,14 @@ import org.springframework.util.Assert;
* {@link JaasAuthenticationCallbackHandler} for each Callback passed.
*
* {@link JaasAuthenticationCallbackHandler}s are passed to the JaasAuthenticationProvider through the {@link - * #setCallbackHandlers(org.springframework.security.providers.jaas.JaasAuthenticationCallbackHandler[]) callbackHandlers} + * #setCallbackHandlers(org.springframework.security.authentication.jaas.JaasAuthenticationCallbackHandler[]) callbackHandlers} * property. *
* <property name="callbackHandlers">
* <list>
- * <bean class="org.springframework.security.providers.jaas.TestCallbackHandler"/>
- * <bean class="{@link JaasNameCallbackHandler org.springframework.security.providers.jaas.JaasNameCallbackHandler}"/>
- * <bean class="{@link JaasPasswordCallbackHandler org.springframework.security.providers.jaas.JaasPasswordCallbackHandler}"/>
+ * <bean class="org.springframework.security.authentication.jaas.TestCallbackHandler"/>
+ * <bean class="{@link JaasNameCallbackHandler org.springframework.security.authentication.jaas.JaasNameCallbackHandler}"/>
+ * <bean class="{@link JaasPasswordCallbackHandler org.springframework.security.authentication.jaas.JaasPasswordCallbackHandler}"/>
* </list>
* </property>
*
@@ -115,7 +115,7 @@ import org.springframework.util.Assert;
* * <property name="authorityGranters"> * <list> - * <bean class="org.springframework.security.providers.jaas.TestAuthorityGranter"/> + * <bean class="org.springframework.security.authentication.jaas.TestAuthorityGranter"/> * </list> * </property> *diff --git a/core/src/main/java/org/springframework/security/providers/jaas/JaasAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java similarity index 90% rename from core/src/main/java/org/springframework/security/providers/jaas/JaasAuthenticationToken.java rename to core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java index 65b16a8936..985f81534c 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/JaasAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; import java.util.List; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; import javax.security.auth.login.LoginContext; diff --git a/core/src/main/java/org/springframework/security/providers/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java similarity index 92% rename from core/src/main/java/org/springframework/security/providers/jaas/JaasGrantedAuthority.java rename to core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java index effc1b7720..a00501c432 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/JaasGrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; -import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.core.GrantedAuthorityImpl; import java.security.Principal; diff --git a/core/src/main/java/org/springframework/security/providers/jaas/JaasNameCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/jaas/JaasNameCallbackHandler.java rename to core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java index ac8f0d8c4a..615d201072 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/JaasNameCallbackHandler.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; import org.springframework.security.userdetails.UserDetails; import java.io.IOException; diff --git a/core/src/main/java/org/springframework/security/providers/jaas/JaasPasswordCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/jaas/JaasPasswordCallbackHandler.java rename to core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java index ca80515d38..7b5341535b 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/JaasPasswordCallbackHandler.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; import java.io.IOException; diff --git a/core/src/main/java/org/springframework/security/providers/jaas/LoginExceptionResolver.java b/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java similarity index 88% rename from core/src/main/java/org/springframework/security/providers/jaas/LoginExceptionResolver.java rename to core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java index e6ff331251..d67815a9ef 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/LoginExceptionResolver.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; -import org.springframework.security.SpringSecurityException; +import org.springframework.security.core.SpringSecurityException; import javax.security.auth.login.LoginException; @@ -26,7 +26,7 @@ import javax.security.auth.login.LoginException; * instance, a configured login module could throw a * ScrewedUpPasswordException that extends LoginException, in this instance * the LoginExceptionResolver implementation would return a {@link - * org.springframework.security.BadCredentialsException}. + * org.springframework.security.authentication.BadCredentialsException}. * * @author Ray Krueger * @version $Revision: 2176 $ diff --git a/core/src/main/java/org/springframework/security/providers/jaas/SecurityContextLoginModule.java b/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/jaas/SecurityContextLoginModule.java rename to core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java index c5d2ad7720..b3ae120f20 100644 --- a/core/src/main/java/org/springframework/security/providers/jaas/SecurityContextLoginModule.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.springframework.security.providers.jaas; +package org.springframework.security.authentication.jaas; -import org.springframework.security.Authentication; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,7 +32,7 @@ import javax.security.auth.spi.LoginModule; /** * An implementation of {@link LoginModule} that uses a Spring Security {@link - * org.springframework.security.context.SecurityContext SecurityContext} to provide authentication. + * org.springframework.security.core.context.SecurityContext SecurityContext} to provide authentication. *
* This LoginModule provides opposite functionality to the {@link JaasAuthenticationProvider} API, and should not
* really be used in conjunction with it.
diff --git a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
similarity index 89%
rename from core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationEvent.java
rename to core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
index d1608ed0d4..c97a14e84d 100644
--- a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers.jaas.event;
+package org.springframework.security.authentication.jaas.event;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
import org.springframework.context.ApplicationEvent;
/**
- * Parent class for events fired by the {@link org.springframework.security.providers.jaas.JaasAuthenticationProvider
+ * Parent class for events fired by the {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider
* JaasAuthenticationProvider}.
*
* @author Ray Krueger
diff --git a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationFailedEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationFailedEvent.java
rename to core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
index aafca30686..85c9133dac 100644
--- a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationFailedEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.providers.jaas.event;
+package org.springframework.security.authentication.jaas.event;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
similarity index 81%
rename from core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationSuccessEvent.java
rename to core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
index 77a92d90ba..521f6ac066 100644
--- a/core/src/main/java/org/springframework/security/providers/jaas/event/JaasAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
@@ -13,13 +13,13 @@
* limitations under the License.
*/
-package org.springframework.security.providers.jaas.event;
+package org.springframework.security.authentication.jaas.event;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
/**
- * Fired by the {@link org.springframework.security.providers.jaas.JaasAuthenticationProvider JaasAuthenticationProvider}
+ * Fired by the {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider JaasAuthenticationProvider}
* after successfully logging the user into the LoginContext, handling all callbacks, and calling all
* AuthorityGranters.
*
diff --git a/core/src/main/java/org/springframework/security/providers/jaas/event/package.html b/core/src/main/java/org/springframework/security/authentication/jaas/event/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/jaas/event/package.html
rename to core/src/main/java/org/springframework/security/authentication/jaas/event/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/jaas/package.html b/core/src/main/java/org/springframework/security/authentication/jaas/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/jaas/package.html
rename to core/src/main/java/org/springframework/security/authentication/jaas/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/package.html b/core/src/main/java/org/springframework/security/authentication/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/package.html
rename to core/src/main/java/org/springframework/security/authentication/package.html
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
index d92a30caa1..74492f05bc 100644
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
@@ -1,14 +1,14 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.authentication.preauth;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.Ordered;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.providers.AccountStatusUserDetailsChecker;
-import org.springframework.security.providers.AuthenticationProvider;
+import org.springframework.security.authentication.AccountStatusUserDetailsChecker;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
import org.springframework.security.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.UserDetailsChecker;
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationToken.java
similarity index 78%
rename from core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationToken.java
rename to core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationToken.java
index 8f04fb9e48..f9b5bb9499 100755
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationToken.java
@@ -1,14 +1,14 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.authentication.preauth;
import java.util.Arrays;
import java.util.List;
-import org.springframework.security.providers.AbstractAuthenticationToken;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
/**
- * {@link org.springframework.security.Authentication} implementation for pre-authenticated
+ * {@link org.springframework.security.core.Authentication} implementation for pre-authenticated
* authentication.
*
* @author Ruud Senden
@@ -21,7 +21,7 @@ public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationT
/**
* Constructor used for an authentication request. The {@link
- * org.springframework.security.Authentication#isAuthenticated()} will return
+ * org.springframework.security.core.Authentication#isAuthenticated()} will return
* false.
*
* @TODO Should we have only a single credentials parameter here? For
@@ -50,7 +50,7 @@ public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationT
/**
* Constructor used for an authentication response. The {@link
- * org.springframework.security.Authentication#isAuthenticated()} will return
+ * org.springframework.security.core.Authentication#isAuthenticated()} will return
* true.
*
* @param aPrincipal
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
similarity index 86%
rename from core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
rename to core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
index 0d6c54017d..68c7f3f61e 100755
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
@@ -1,14 +1,14 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.authentication.preauth;
import java.util.List;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthoritiesContainer;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.User;
-import org.springframework.security.GrantedAuthoritiesContainer;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.Authentication;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationException.java
rename to core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
index 6148cfaba1..ec31bc440c 100644
--- a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.providers.rcp;
+package org.springframework.security.authentication.rcp;
-import org.springframework.security.SpringSecurityException;
+import org.springframework.security.core.SpringSecurityException;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManager.java
rename to core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
index 4f999ee4fc..62d25685ac 100644
--- a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.providers.rcp;
+package org.springframework.security.authentication.rcp;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
/**
diff --git a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImpl.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
similarity index 87%
rename from core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImpl.java
rename to core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
index f77ff295cd..c4f865a70c 100644
--- a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
@@ -13,15 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security.providers.rcp;
+package org.springframework.security.authentication.rcp;
import java.util.List;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.AuthenticationManager;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.beans.factory.InitializingBean;
diff --git a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
similarity index 89%
rename from core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationProvider.java
rename to core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
index c9821b4608..8d75d87afa 100644
--- a/core/src/main/java/org/springframework/security/providers/rcp/RemoteAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
@@ -13,16 +13,16 @@
* limitations under the License.
*/
-package org.springframework.security.providers.rcp;
+package org.springframework.security.authentication.rcp;
import java.util.Arrays;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.providers.AuthenticationProvider;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.beans.factory.InitializingBean;
diff --git a/core/src/main/java/org/springframework/security/providers/rcp/package.html b/core/src/main/java/org/springframework/security/authentication/rcp/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/providers/rcp/package.html
rename to core/src/main/java/org/springframework/security/authentication/rcp/package.html
diff --git a/core/src/main/java/org/springframework/security/Authentication.java b/core/src/main/java/org/springframework/security/core/Authentication.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/Authentication.java
rename to core/src/main/java/org/springframework/security/core/Authentication.java
index c691e3d025..61d4afbb61 100644
--- a/core/src/main/java/org/springframework/security/Authentication.java
+++ b/core/src/main/java/org/springframework/security/core/Authentication.java
@@ -13,14 +13,15 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
import java.io.Serializable;
import java.security.Principal;
import java.util.List;
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.core.context.SecurityContextHolder;
/**
diff --git a/core/src/main/java/org/springframework/security/AuthenticationException.java b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/AuthenticationException.java
rename to core/src/main/java/org/springframework/security/core/AuthenticationException.java
index 43c2e338bd..7cafee34cc 100644
--- a/core/src/main/java/org/springframework/security/AuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
@@ -13,7 +13,8 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
+
/**
* Abstract superclass for all exceptions related to an {@link Authentication} object being invalid for whatever
@@ -63,7 +64,7 @@ public abstract class AuthenticationException extends SpringSecurityException {
return authentication;
}
- void setAuthentication(Authentication authentication) {
+ public void setAuthentication(Authentication authentication) {
this.authentication = authentication;
}
@@ -76,7 +77,7 @@ public abstract class AuthenticationException extends SpringSecurityException {
return extraInformation;
}
- void clearExtraInformation() {
+ public void clearExtraInformation() {
this.extraInformation = null;
}
}
diff --git a/core/src/main/java/org/springframework/security/util/AuthorityUtils.java b/core/src/main/java/org/springframework/security/core/AuthorityUtils.java
similarity index 91%
rename from core/src/main/java/org/springframework/security/util/AuthorityUtils.java
rename to core/src/main/java/org/springframework/security/core/AuthorityUtils.java
index 233226e41a..df872f8887 100644
--- a/core/src/main/java/org/springframework/security/util/AuthorityUtils.java
+++ b/core/src/main/java/org/springframework/security/core/AuthorityUtils.java
@@ -1,9 +1,6 @@
-package org.springframework.security.util;
+package org.springframework.security.core;
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
diff --git a/core/src/main/java/org/springframework/security/GrantedAuthoritiesContainer.java b/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java
similarity index 91%
rename from core/src/main/java/org/springframework/security/GrantedAuthoritiesContainer.java
rename to core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java
index 18bda0be28..e6627e2d74 100644
--- a/core/src/main/java/org/springframework/security/GrantedAuthoritiesContainer.java
+++ b/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java
@@ -1,4 +1,4 @@
-package org.springframework.security;
+package org.springframework.security.core;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/org/springframework/security/GrantedAuthoritiesContainerImpl.java b/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/GrantedAuthoritiesContainerImpl.java
rename to core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java
index bfda178cac..f4410c7a0e 100644
--- a/core/src/main/java/org/springframework/security/GrantedAuthoritiesContainerImpl.java
+++ b/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.security;
+package org.springframework.security.core;
import java.util.Collections;
import java.util.List;
diff --git a/core/src/main/java/org/springframework/security/GrantedAuthority.java b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/GrantedAuthority.java
rename to core/src/main/java/org/springframework/security/core/GrantedAuthority.java
index 79591071ba..7277265e39 100644
--- a/core/src/main/java/org/springframework/security/GrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
import java.io.Serializable;
diff --git a/core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java b/core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java
rename to core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java
index f688287f40..d6708a48c9 100644
--- a/core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java
+++ b/core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
import java.io.Serializable;
diff --git a/core/src/main/java/org/springframework/security/MutableGrantedAuthoritiesContainer.java b/core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java
similarity index 92%
rename from core/src/main/java/org/springframework/security/MutableGrantedAuthoritiesContainer.java
rename to core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java
index d6427fce51..302d245eb7 100644
--- a/core/src/main/java/org/springframework/security/MutableGrantedAuthoritiesContainer.java
+++ b/core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java
@@ -1,4 +1,4 @@
-package org.springframework.security;
+package org.springframework.security.core;
import java.util.List;
diff --git a/core/src/main/java/org/springframework/security/event/SessionCreationEvent.java b/core/src/main/java/org/springframework/security/core/SessionCreationEvent.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/event/SessionCreationEvent.java
rename to core/src/main/java/org/springframework/security/core/SessionCreationEvent.java
index 5cdbd586cc..17af32b3fe 100644
--- a/core/src/main/java/org/springframework/security/event/SessionCreationEvent.java
+++ b/core/src/main/java/org/springframework/security/core/SessionCreationEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.security.event;
+package org.springframework.security.core;
import org.springframework.context.ApplicationEvent;
diff --git a/core/src/main/java/org/springframework/security/event/SessionDestroyedEvent.java b/core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java
similarity index 86%
rename from core/src/main/java/org/springframework/security/event/SessionDestroyedEvent.java
rename to core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java
index 4bad7e7c27..4857cfbf52 100644
--- a/core/src/main/java/org/springframework/security/event/SessionDestroyedEvent.java
+++ b/core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java
@@ -1,7 +1,7 @@
-package org.springframework.security.event;
+package org.springframework.security.core;
import org.springframework.context.ApplicationEvent;
-import org.springframework.security.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContext;
/**
* Generic "session termination" event which indicates that a session (potentially
diff --git a/core/src/main/java/org/springframework/security/SpringSecurityException.java b/core/src/main/java/org/springframework/security/core/SpringSecurityException.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/SpringSecurityException.java
rename to core/src/main/java/org/springframework/security/core/SpringSecurityException.java
index 175144a0ff..c7dcf90b6a 100644
--- a/core/src/main/java/org/springframework/security/SpringSecurityException.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
import org.springframework.core.NestedRuntimeException;
diff --git a/core/src/main/java/org/springframework/security/SpringSecurityMessageSource.java b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/SpringSecurityMessageSource.java
rename to core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
index 962064ddd7..a721d7d44b 100644
--- a/core/src/main/java/org/springframework/security/SpringSecurityMessageSource.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security;
+package org.springframework.security.core;
import org.springframework.context.support.MessageSourceAccessor;
import org.springframework.context.support.ResourceBundleMessageSource;
diff --git a/core/src/main/java/org/springframework/security/context/GlobalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/context/GlobalSecurityContextHolderStrategy.java
rename to core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
index 96311c34de..74f43dbf99 100644
--- a/core/src/main/java/org/springframework/security/context/GlobalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/security/context/InheritableThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
similarity index 87%
rename from core/src/main/java/org/springframework/security/context/InheritableThreadLocalSecurityContextHolderStrategy.java
rename to core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
index 4a7926acf3..3a769f2cd7 100644
--- a/core/src/main/java/org/springframework/security/context/InheritableThreadLocalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
@@ -13,20 +13,20 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
import org.springframework.util.Assert;
/**
* An InheritableThreadLocal-based implementation of {@link
- * org.springframework.security.context.SecurityContextHolderStrategy}.
+ * org.springframework.security.core.context.SecurityContextHolderStrategy}.
*
* @author Ben Alex
* @version $Id$
*
* @see java.lang.ThreadLocal
- * @see org.springframework.security.context.web.SecurityContextPersistenceFilter
+ * @see org.springframework.security.core.context.web.SecurityContextPersistenceFilter
*/
public class InheritableThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy {
//~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/context/SecurityContext.java b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java
similarity index 93%
rename from core/src/main/java/org/springframework/security/context/SecurityContext.java
rename to core/src/main/java/org/springframework/security/core/context/SecurityContext.java
index 4c860f5476..ac5546bacb 100644
--- a/core/src/main/java/org/springframework/security/context/SecurityContext.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
import java.io.Serializable;
diff --git a/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/context/SecurityContextHolder.java
rename to core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
index 4ea2697173..b69482d834 100644
--- a/core/src/main/java/org/springframework/security/context/SecurityContextHolder.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
import org.springframework.util.ReflectionUtils;
@@ -24,14 +24,14 @@ import java.lang.reflect.Constructor;
* Associates a given {@link SecurityContext} with the current execution thread.
*
* This class provides a series of static methods that delegate to an instance of
- * {@link org.springframework.security.context.SecurityContextHolderStrategy}. The purpose of the class is to provide a
+ * {@link org.springframework.security.core.context.SecurityContextHolderStrategy}. The purpose of the class is to provide a
* convenient way to specify the strategy that should be used for a given JVM.
* This is a JVM-wide setting, since everything in this class is static to facilitate ease of use in
* calling code.
*
* To specify which strategy should be used, you must provide a mode setting. A mode setting is one of the
* three valid MODE_ settings defined as static final fields, or a fully qualified classname
- * to a concrete implementation of {@link org.springframework.security.context.SecurityContextHolderStrategy} that
+ * to a concrete implementation of {@link org.springframework.security.core.context.SecurityContextHolderStrategy} that
* provides a public no-argument constructor.
*
* There are two ways to specify the desired strategy mode String. The first is to specify it via
@@ -43,7 +43,7 @@ import java.lang.reflect.Constructor;
* @author Ben Alex
* @version $Id$
*
- * @see org.springframework.security.context.web.HttpSessionContextIntegrationFilter
+ * @see org.springframework.security.core.context.web.HttpSessionContextIntegrationFilter
*/
public class SecurityContextHolder {
//~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/context/SecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
similarity index 94%
rename from core/src/main/java/org/springframework/security/context/SecurityContextHolderStrategy.java
rename to core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
index 6ac1110a52..4a127d6a11 100644
--- a/core/src/main/java/org/springframework/security/context/SecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
/**
* A strategy for storing security context information against a thread.
diff --git a/core/src/main/java/org/springframework/security/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
similarity index 95%
rename from core/src/main/java/org/springframework/security/context/SecurityContextImpl.java
rename to core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
index 28f9140088..14efc9390b 100644
--- a/core/src/main/java/org/springframework/security/context/SecurityContextImpl.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
@@ -13,9 +13,9 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
-import org.springframework.security.Authentication;
+import org.springframework.security.core.Authentication;
/**
diff --git a/core/src/main/java/org/springframework/security/context/ThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
similarity index 90%
rename from core/src/main/java/org/springframework/security/context/ThreadLocalSecurityContextHolderStrategy.java
rename to core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
index 00a72a8950..a5e36e8ece 100644
--- a/core/src/main/java/org/springframework/security/context/ThreadLocalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.springframework.security.context;
+package org.springframework.security.core.context;
import org.springframework.util.Assert;
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
* @version $Id$
*
* @see java.lang.ThreadLocal
- * @see org.springframework.security.context.web.SecurityContextPersistenceFilter
+ * @see org.springframework.security.core.context.web.SecurityContextPersistenceFilter
*/
public class ThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy {
//~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/context/package.html b/core/src/main/java/org/springframework/security/core/context/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/context/package.html
rename to core/src/main/java/org/springframework/security/core/context/package.html
diff --git a/core/src/main/java/org/springframework/security/token/DefaultToken.java b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/token/DefaultToken.java
rename to core/src/main/java/org/springframework/security/core/token/DefaultToken.java
index 80bd53424a..c7c05086b9 100644
--- a/core/src/main/java/org/springframework/security/token/DefaultToken.java
+++ b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
@@ -1,4 +1,4 @@
-package org.springframework.security.token;
+package org.springframework.security.core.token;
import java.util.Date;
diff --git a/core/src/main/java/org/springframework/security/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
similarity index 99%
rename from core/src/main/java/org/springframework/security/token/KeyBasedPersistenceTokenService.java
rename to core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
index b7c997446a..4ad4939a1c 100644
--- a/core/src/main/java/org/springframework/security/token/KeyBasedPersistenceTokenService.java
+++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
@@ -1,4 +1,4 @@
-package org.springframework.security.token;
+package org.springframework.security.core.token;
import java.io.UnsupportedEncodingException;
import java.security.SecureRandom;
diff --git a/core/src/main/java/org/springframework/security/token/SecureRandomFactoryBean.java b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/token/SecureRandomFactoryBean.java
rename to core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
index 43428698d1..a0884e77d5 100644
--- a/core/src/main/java/org/springframework/security/token/SecureRandomFactoryBean.java
+++ b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
@@ -1,4 +1,4 @@
-package org.springframework.security.token;
+package org.springframework.security.core.token;
import java.io.InputStream;
import java.security.SecureRandom;
diff --git a/core/src/main/java/org/springframework/security/token/Token.java b/core/src/main/java/org/springframework/security/core/token/Token.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/token/Token.java
rename to core/src/main/java/org/springframework/security/core/token/Token.java
index 65f8971c8d..94d64ee433 100644
--- a/core/src/main/java/org/springframework/security/token/Token.java
+++ b/core/src/main/java/org/springframework/security/core/token/Token.java
@@ -1,4 +1,4 @@
-package org.springframework.security.token;
+package org.springframework.security.core.token;
/**
diff --git a/core/src/main/java/org/springframework/security/token/TokenService.java b/core/src/main/java/org/springframework/security/core/token/TokenService.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/token/TokenService.java
rename to core/src/main/java/org/springframework/security/core/token/TokenService.java
index 660a16360a..63c50ac6c4 100644
--- a/core/src/main/java/org/springframework/security/token/TokenService.java
+++ b/core/src/main/java/org/springframework/security/core/token/TokenService.java
@@ -1,4 +1,4 @@
-package org.springframework.security.token;
+package org.springframework.security.core.token;
/**
diff --git a/core/src/main/java/org/springframework/security/event/authentication/package.html b/core/src/main/java/org/springframework/security/event/authentication/package.html
deleted file mode 100644
index 9a83ae1d92..0000000000
--- a/core/src/main/java/org/springframework/security/event/authentication/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
The ProviderManager automatically publishes
-events to the application context. These events are received by all
-registered Spring ApplicationListeners.
User objects for the DaoAuthenticationProvider.
-
-
diff --git a/core/src/main/java/org/springframework/security/provisioning/GroupManager.java b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
index 712d6829a7..1cf5f68337 100644
--- a/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
@@ -2,7 +2,7 @@ package org.springframework.security.provisioning;
import java.util.List;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
/**
* Allows management of groups of authorities and their members.
diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
index 9f6f3c8e71..5420d7f43f 100644
--- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
@@ -1,14 +1,14 @@
package org.springframework.security.provisioning;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationException;
-import org.springframework.security.AuthenticationManager;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.util.AuthorityUtils;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.userdetails.UserCache;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.cache.NullUserCache;
diff --git a/core/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/core/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
index 6390729572..8ea173c97c 100644
--- a/core/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
+++ b/core/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
@@ -15,10 +15,8 @@
package org.springframework.security.remoting.httpinvoker;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationCredentialsNotFoundException;
-
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
@@ -65,12 +63,8 @@ public class AuthenticationSimpleHttpInvokerRequestExecutor extends SimpleHttpIn
* @param contentLength the length of the content to send
*
* @throws IOException if thrown by HttpURLConnection methods
- * @throws AuthenticationCredentialsNotFoundException if the SecurityContextHolder does not contain a
- * valid Authentication with both its principal and credentials not
- * null
*/
- protected void prepareConnection(HttpURLConnection con, int contentLength)
- throws IOException, AuthenticationCredentialsNotFoundException {
+ protected void prepareConnection(HttpURLConnection con, int contentLength) throws IOException {
super.prepareConnection(con, contentLength);
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
diff --git a/core/src/main/java/org/springframework/security/remoting/httpinvoker/package.html b/core/src/main/java/org/springframework/security/remoting/httpinvoker/package.html
index a40609253c..444c29f0bc 100644
--- a/core/src/main/java/org/springframework/security/remoting/httpinvoker/package.html
+++ b/core/src/main/java/org/springframework/security/remoting/httpinvoker/package.html
@@ -14,7 +14,7 @@ in the ContextHolder via BASIC authentication.
<property name="httpInvokerRequestExecutor"><ref bean="httpInvokerRequestExecutor"/></property>