SEC-1132: Move authoritymapping to core as it is actually used in loading authorities for a use, not in making access decisions.

core/src/main/java/org/springframework/security/core/Authentication.java

@@ -30,7 +30,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * <p>
  * Once the request has been authenticated, the <tt>Authentication</tt> will usually be stored in a thread-local
  * <tt>SecurityContext</tt> managed by the {@link SecurityContextHolder} by the authentication mechanism which is
- * being used. An explicit authentication can be achieved, without using one of Spring Security's authentication 
+ * being used. An explicit authentication can be achieved, without using one of Spring Security's authentication
  * mechanisms,  by creating an <tt>Authentication</tt> instance and using the code:
  *
  * <pre>
@@ -38,7 +38,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * </pre>
  * Note that unless the <tt>Authentication</tt> has the <tt>authenticated</tt> property set to <tt>true</tt>, it will
  * still be authenticated by any security interceptor (for method or web invocations) which encounters it.
- *
+ * <p>
  * In most cases, the framework transparently takes care of managing the security context and authentication objects
  * for you.
  *

core/src/main/java/org/springframework/security/access/authoritymapping/Attributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authoritymapping/Attributes2GrantedAuthoritiesMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.util.Collection;
 import java.util.List;

core/src/main/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -144,7 +144,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements Attributes2G
 
     /**
      *
-     * @see org.springframework.security.access.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
+     * @see org.springframework.security.core.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
      */
     public Set<String> getMappableAttributes() {
         return mappableAttributes;

core/src/main/java/org/springframework/security/access/authoritymapping/MappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authoritymapping/MappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.util.Set;
 

core/src/main/java/org/springframework/security/access/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthorityImpl;

core/src/main/java/org/springframework/security/access/authoritymapping/SimpleMappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authoritymapping/SimpleMappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ public class SimpleMappableAttributesRetriever implements MappableAttributesRetr
     /*
      * (non-Javadoc)
      *
-     * @see org.springframework.security.access.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
+     * @see org.springframework.security.core.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
      */
     public Set<String> getMappableAttributes() {
         return mappableAttributes;

core/src/main/java/org/springframework/security/access/authoritymapping/XmlMappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authoritymapping/XmlMappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

core/src/test/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java → core/src/test/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import static org.junit.Assert.*;
 
@@ -11,10 +11,10 @@ import java.util.List;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Test;
-import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.access.authoritymapping.MapBasedAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.MapBasedAttributes2GrantedAuthoritiesMapper;
 
 /**
  *

core/src/test/java/org/springframework/security/access/authoritymapping/SimpleMappableRolesRetrieverTests.java → core/src/test/java/org/springframework/security/core/authoritymapping/SimpleMappableRolesRetrieverTests.java

@@ -1,9 +1,10 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.util.Set;
 
 import junit.framework.TestCase;
 
+import org.springframework.security.core.authoritymapping.SimpleMappableAttributesRetriever;
 import org.springframework.util.StringUtils;
 
 /**

core/src/test/java/org/springframework/security/access/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java → core/src/test/java/org/springframework/security/core/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java

@@ -1,7 +1,7 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
-import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

core/src/test/java/org/springframework/security/access/authoritymapping/XmlMappableRolesRetrieverTests.java → core/src/test/java/org/springframework/security/core/authoritymapping/XmlMappableRolesRetrieverTests.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.authoritymapping;
+package org.springframework.security.core.authoritymapping;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -7,7 +7,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 
-import org.springframework.security.access.authoritymapping.XmlMappableAttributesRetriever;
+import org.springframework.security.core.authoritymapping.XmlMappableAttributesRetriever;
 
 import junit.framework.TestCase;
 

core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java

@@ -18,8 +18,6 @@ package org.springframework.security.core.context;
 import junit.framework.TestCase;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
 
 /**

core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java

@@ -20,7 +20,6 @@ import junit.framework.TestCase;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextImpl;
 
 

samples/portlet/src/main/resources/portlet/securityContextPortlet.xml

@@ -36,7 +36,7 @@
         <property name="authenticationDetailsSource">
             <bean class="org.springframework.security.portlet.PortletPreAuthenticatedAuthenticationDetailsSource">
                 <property name="mappableRolesRetriever">
-                    <bean class="org.springframework.security.access.authoritymapping.SimpleMappableAttributesRetriever">
+                    <bean class="org.springframework.security.core.authoritymapping.SimpleMappableAttributesRetriever">
                         <property name="mappableAttributes">
                             <set>
                                 <value>tomcat</value>

samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -52,7 +52,7 @@
         <property name="userRoles2GrantedAuthoritiesMapper" ref="j2eeUserRoles2GrantedAuthoritiesMapper"/>
     </bean>
 
-    <bean id="j2eeUserRoles2GrantedAuthoritiesMapper" class="org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper">
+    <bean id="j2eeUserRoles2GrantedAuthoritiesMapper" class="org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper">
         <property name="convertAttributeToUpperCase" value="true"/>
     </bean>
 

web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java

@@ -6,12 +6,12 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.access.authoritymapping.MappableAttributesRetriever;
-import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.authentication.AuthenticationDetailsSourceImpl;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.MutableGrantedAuthoritiesContainer;
+import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.MappableAttributesRetriever;
+import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.util.Assert;
 
 /**

web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java

@@ -1,7 +1,7 @@
 package org.springframework.security.web.authentication.preauth.j2ee;
 
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails;
-import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 
 import java.util.ArrayList;
 import java.util.Collection;

web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java

@@ -2,7 +2,7 @@ package org.springframework.security.web.authentication.preauth.j2ee;
 
 import java.io.InputStream;
 
-import org.springframework.security.access.authoritymapping.XmlMappableAttributesRetriever;
+import org.springframework.security.core.authoritymapping.XmlMappableAttributesRetriever;
 
 /**
  * <p>

web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java

@@ -6,11 +6,11 @@ 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.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.authentication.AuthenticationDetailsSourceImpl;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.MutableGrantedAuthoritiesContainer;
+import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesAuthenticationDetails;
 import org.springframework.util.Assert;
 

web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java

@@ -10,11 +10,11 @@ import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
-import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.access.authoritymapping.MappableAttributesRetriever;
-import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
-import org.springframework.security.access.authoritymapping.SimpleMappableAttributesRetriever;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.MappableAttributesRetriever;
+import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.core.authoritymapping.SimpleMappableAttributesRetriever;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails;
 import org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource;