SEC-1132: Moved access-control/authorization specific code to org.sf.security.access package. Created provisioning package for user management classes to remove cyclical deps. Some other moving of classes to remove code tangles. Restructuring of portlet module under org.sf.security.portlet

portlet/src/main/java/org/springframework/security/portlet/PortletAuthenticationDetails.java

@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.io.Serializable;
 import java.util.Map;

portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java

@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.util.Arrays;
 import java.util.Collections;

portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java

@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.util.ArrayList;
 import java.util.Collection;

portlet/src/main/java/org/springframework/security/portlet/PortletProcessingInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.io.IOException;
 import java.security.Principal;

portlet/src/main/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.context;
+package org.springframework.security.portlet;
 
 import java.lang.reflect.Method;
 
@@ -27,6 +27,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.portlet.HandlerInterceptor;
 import org.springframework.web.portlet.ModelAndView;
+import org.springframework.security.context.SecurityContext;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextImpl;
 import org.springframework.security.web.context.SecurityContextPersistenceFilter;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 
@@ -62,7 +65,7 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
  * <code>true</code> (setting it to <code>false</code> will cause a startup-time error).</p>
 
  * <p>This interceptor <b>must</b> be executed <b>before</p> any authentication processing mechanisms. These
- * mechanisms (specifically {@link org.springframework.security.ui.portlet.PortletProcessingInterceptor}) expect the
+ * mechanisms (specifically {@link org.springframework.security.portlet.PortletProcessingInterceptor}) expect the
  * <code>SecurityContextHolder</code> to contain a valid <code>SecurityContext</code> by the time they execute.</p>
  *
  * <p>An important nuance to this interceptor is that (by default) the <code>SecurityContext</code> is stored

portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import static org.junit.Assert.*;
 
@@ -36,9 +36,9 @@ import org.springframework.security.AuthenticationManager;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.web.authentication.AbstractProcessingFilter;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.portlet.PortletProcessingInterceptor;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.portlet.PortletTestUtils;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.util.AuthorityUtils;

portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.context;
+package org.springframework.security.portlet;
 
 import javax.portlet.PortletSession;
 
@@ -22,7 +22,10 @@ import junit.framework.TestCase;
 
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.providers.portlet.PortletTestUtils;
+import org.springframework.security.context.SecurityContext;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextImpl;
+import org.springframework.security.portlet.PortletSessionContextIntegrationInterceptor;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.mock.web.portlet.MockActionRequest;

portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.portlet;
+package org.springframework.security.portlet;
 
 import javax.portlet.PortletRequest;
 
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.portlet.PortletAuthenticationDetails;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
-import org.springframework.security.ui.portlet.PortletAuthenticationDetails;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.mock.web.portlet.MockActionRequest;