SEC-1125: Further refactoring of web packages following creation of web module. Fixing samples.

openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
 
 import org.springframework.security.AuthenticationException;
 

openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java

@@ -12,13 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.ui.openid.consumers;
-
-import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
-import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
-
-import org.springframework.security.ui.openid.OpenIDConsumer;
-import org.springframework.security.ui.openid.OpenIDConsumerException;
+package org.springframework.security.openid;
 
 import org.openid4java.association.AssociationException;
 

openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.openid;
+package org.springframework.security.openid;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -28,12 +28,9 @@ import javax.servlet.http.HttpSession;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationServiceException;
-import org.springframework.security.providers.openid.OpenIDAuthenticationProvider;
-import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
-import org.springframework.security.ui.AbstractProcessingFilter;
-import org.springframework.security.ui.FilterChainOrder;
-import org.springframework.security.ui.openid.consumers.OpenID4JavaConsumer;
-import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
+import org.springframework.security.web.FilterChainOrder;
+import org.springframework.security.web.authentication.AbstractProcessingFilter;
+import org.springframework.security.web.authentication.AuthenticationProcessingFilter;
 import org.springframework.util.StringUtils;
 
 

openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.Authentication;

openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
 
 import java.io.ObjectStreamException;
 import java.io.Serializable;

openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
 
 import java.util.ArrayList;
 import java.util.List;

openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java

@@ -12,9 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.ui.openid;
+package org.springframework.security.openid;
 
-import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
 import javax.servlet.http.HttpServletRequest;
 

openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.ui.openid;
+package org.springframework.security.openid;
 
 /**
  * Thrown by an OpenIDConsumer if it cannot process a request

openid/src/main/java/org/springframework/security/providers/openid/package.html

@@ -1,6 +0,0 @@
-<html>
-<body>
-An authentication provider that can process <a href="http://openid.net">OpenID</a> 
-Authentication Tokens as created by implementations of the OpenIDConsumer interface.
-</body>
-</html>

openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html

@@ -1,5 +0,0 @@
-<html>
-<body>
-Implementations of the OpenIDConsumer interface using 3rd party libraries.
-</body>
-</html>

openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.ui.openid.consumers;
+package org.springframework.security.openid;
 
-import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
-import org.springframework.security.ui.openid.OpenIDConsumer;
-import org.springframework.security.ui.openid.OpenIDConsumerException;
+import org.springframework.security.openid.OpenIDAuthenticationToken;
+import org.springframework.security.openid.OpenIDConsumer;
+import org.springframework.security.openid.OpenIDConsumerException;
 
 import javax.servlet.http.HttpServletRequest;
 

openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilterTests.java

@@ -1,4 +1,4 @@
-package org.springframework.security.ui.openid;
+package org.springframework.security.openid;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -13,8 +13,9 @@ import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.MockAuthenticationManager;
-import org.springframework.security.ui.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.ui.openid.consumers.MockOpenIDConsumer;
+import org.springframework.security.openid.OpenIDAuthenticationProcessingFilter;
+import org.springframework.security.openid.OpenIDConsumerException;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
 public class OpenIDAuthenticationProcessingFilterTests {
 

openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
 
 import junit.framework.TestCase;
 import org.springframework.security.Authentication;
@@ -23,6 +23,10 @@ import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.User;
+import org.springframework.security.openid.AuthenticationCancelledException;
+import org.springframework.security.openid.OpenIDAuthenticationProvider;
+import org.springframework.security.openid.OpenIDAuthenticationStatus;
+import org.springframework.security.openid.OpenIDAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.userdetails.UserDetailsService;
 

openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationTokenTests.java

@@ -12,7 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.openid;
+package org.springframework.security.openid;
+
+import org.springframework.security.openid.OpenIDAuthenticationStatus;
+import org.springframework.security.openid.OpenIDAuthenticationToken;
 
 import junit.framework.TestCase;