SEC-1132: Created core and authentication packages within core module.

samples/contacts/src/main/java/sample/contact/ClientApplication.java

@@ -15,11 +15,11 @@
 
 package sample.contact;
 
-import org.springframework.security.Authentication;
 
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 

samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java

@@ -14,7 +14,6 @@
  */
 package sample.contact;
 
-import org.springframework.security.Authentication;
 
 import org.springframework.security.acls.AccessControlEntry;
 import org.springframework.security.acls.MutableAcl;
@@ -27,7 +26,8 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
 import org.springframework.security.acls.sid.PrincipalSid;
 import org.springframework.security.acls.sid.Sid;
 
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.transaction.annotation.Transactional;

samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java

@@ -20,7 +20,6 @@ import javax.sql.DataSource;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.Authentication;
 import org.springframework.security.acls.MutableAcl;
 import org.springframework.security.acls.MutableAclService;
 import org.springframework.security.acls.Permission;
@@ -29,9 +28,10 @@ import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.objectidentity.ObjectIdentity;
 import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
 import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.util.AuthorityUtils;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;

samples/contacts/src/main/java/sample/contact/SecureIndexController.java

@@ -17,11 +17,11 @@ package sample.contact;
 
 import org.springframework.beans.factory.InitializingBean;
 
-import org.springframework.security.Authentication;
 import org.springframework.security.access.expression.PermissionEvaluator;
 import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
 import org.springframework.web.servlet.ModelAndView;

samples/contacts/src/main/resources/applicationContext-common-authorization.xml

@@ -32,13 +32,13 @@
         <bean class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
             <constructor-arg>
             <list>
-                <bean class="org.springframework.security.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
-                <bean class="org.springframework.security.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
-                <bean class="org.springframework.security.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
             </list>

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

@@ -38,7 +38,7 @@
     </authentication-provider>
 
     <!-- Automatically receives AuthenticationEvent messages -->
-    <b:bean id="loggerListener" class="org.springframework.security.event.authentication.LoggerListener"/>
+    <b:bean id="loggerListener" class="org.springframework.security.authentication.event.LoggerListener"/>
 
     <!-- Filter used to switch the user context. Note: the switch and exit url must be secured
         based on the role granted the ability to 'switch' to another user -->

samples/contacts/src/main/webapp/accessDenied.jsp

@@ -1,5 +1,5 @@
-<%@ page import="org.springframework.security.context.SecurityContextHolder" %>
-<%@ page import="org.springframework.security.Authentication" %>
+<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %>
+<%@ page import="org.springframework.security.core.Authentication" %>
 <%@ page import="org.springframework.security.ui.AccessDeniedHandlerImpl" %>
 
 <h1>Sorry, access is denied</h1>

samples/contacts/src/main/webapp/exitUser.jsp

@@ -1,9 +1,9 @@
 <%@ taglib prefix='c' uri='http://java.sun.com/jstl/core' %>
 
-<%@ page import="org.springframework.security.context.SecurityContextHolder" %>
-<%@ page import="org.springframework.security.Authentication" %>
+<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %>
+<%@ page import="org.springframework.security.core.Authentication" %>
 <%@ page import="org.springframework.security.ui.AbstractProcessingFilter" %>
-<%@ page import="org.springframework.security.AuthenticationException" %>
+<%@ page import="org.springframework.security.core.AuthenticationException" %>
 
 <html>
   <head>

samples/contacts/src/main/webapp/login.jsp

@@ -1,7 +1,7 @@
 <%@ taglib prefix='c' uri='http://java.sun.com/jstl/core_rt' %>
 <%@ page import="org.springframework.security.ui.AbstractProcessingFilter" %>
 <%@ page import="org.springframework.security.ui.webapp.AuthenticationProcessingFilter" %>
-<%@ page import="org.springframework.security.AuthenticationException" %>
+<%@ page import="org.springframework.security.core.AuthenticationException" %>
 
 <html>
   <head>

samples/contacts/src/main/webapp/secure/debug.jsp

@@ -1,6 +1,6 @@
-<%@ page import="org.springframework.security.context.SecurityContextHolder" %>
-<%@ page import="org.springframework.security.Authentication" %>
-<%@ page import="org.springframework.security.GrantedAuthority" %>
+<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %>
+<%@ page import="org.springframework.security.core.Authentication" %>
+<%@ page import="org.springframework.security.core.GrantedAuthority" %>
 
 <html>
 <head>

samples/contacts/src/main/webapp/switchUser.jsp

@@ -1,6 +1,6 @@
 <%@ taglib prefix='c' uri='http://java.sun.com/jstl/core' %>
 <%@ page import="org.springframework.security.ui.AbstractProcessingFilter" %>
-<%@ page import="org.springframework.security.AuthenticationException" %>
+<%@ page import="org.springframework.security.core.AuthenticationException" %>
 
 <html>
   <head>

samples/contacts/src/test/java/sample/contact/GetAllContactsTests.java

@@ -23,11 +23,11 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.Authentication;
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;