SEC-1132: Move authoritymapping to core as it is actually used in loading authorities for a use, not in making access decisions.
This commit is contained in:
+3
-3
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
+4
-4
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user