Refactored AuthenticationUserDetailsService to userdetails package as it isn't preauth specific

core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java

@@ -26,8 +26,8 @@ import org.springframework.security.ui.AbstractProcessingFilter;
 import org.springframework.security.ui.AuthenticationEntryPoint;
 import org.springframework.security.ui.basicauth.BasicProcessingFilter;
 import org.springframework.security.ui.rememberme.RememberMeServices;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.util.FilterChainProxy;
-import org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper;
 import org.springframework.util.Assert;
 
 /**

core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java

@@ -3,8 +3,8 @@ package org.springframework.security.config;
 import org.springframework.security.ui.preauth.PreAuthenticatedProcessingFilterEntryPoint;
 import org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter;
 import org.springframework.security.ui.preauth.x509.SubjectDnX509PrincipalExtractor;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider;
-import org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.config.BeanDefinition;

core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java

@@ -4,6 +4,7 @@ import org.springframework.security.providers.AuthenticationProvider;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.BadCredentialsException;
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;
 import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;

core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java

@@ -1,5 +1,6 @@
 package org.springframework.security.providers.preauth;
 
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.GrantedAuthoritiesContainer;

core/src/main/java/org/springframework/security/providers/preauth/AuthenticationUserDetailsService.java → core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java

@@ -1,7 +1,5 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.userdetails;
 
-import org.springframework.security.userdetails.UsernameNotFoundException;
-import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.Authentication;
 
 

core/src/main/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapper.java → core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java

@@ -1,8 +1,5 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.userdetails;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.Authentication;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;

core/src/test/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProviderTests.java

@@ -1,6 +1,7 @@
 package org.springframework.security.providers.preauth;
 
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UsernameNotFoundException;

core/src/test/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapperTests.java

@@ -1,6 +1,7 @@
 package org.springframework.security.providers.preauth;
 
 import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.userdetails.UserDetailsService;
 import org.springframework.security.userdetails.User;

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

@@ -72,7 +72,7 @@
     <bean id="portletAuthProvider" class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
         <sec:custom-authentication-provider/>
         <property name="preAuthenticatedUserDetailsService">
-            <bean class="org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper">
+            <bean class="org.springframework.security.userdetails.UserDetailsByNameServiceWrapper">
                 <property name="userDetailsService" ref="userDetailsService"/>
             </bean>
         </property>