From 2fc4abfaed36ff2e0f08c5357a315f133d95c09f Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 12 Dec 2011 15:36:24 -0500
Subject: [PATCH] refactored test code for compatibility with Spring Security
 3.1

updated pom
---
 build.gradle                                  |  2 +-
 spring-integration-security/pom.xml           | 40 +++++++++----------
 .../security/MockAuthenticationManager.java   | 23 +++++------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4326895804..d02253a16c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ configure(javaprojects) {
     springDataMongoVersion = '1.0.0.RC1'
     springDataRedisVersion = '1.0.0.RC1'
     springGemfireVersion = '1.1.0.RC1'
-    springSecurityVersion = '3.0.6.RELEASE'
+    springSecurityVersion = '3.1.0.RELEASE'
     springWsVersion = '2.0.3.RELEASE'
 
     sourceSets {
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index efd3ff5004..e5c87fc38b 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -88,6 +88,12 @@
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
@@ -96,8 +102,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>3.0.6.RELEASE</version>
+      <artifactId>spring-security-config</artifactId>
+      <version>3.1.0.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -106,12 +112,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.6.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -136,18 +136,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-config</artifactId>
-      <version>3.0.6.RELEASE</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-support</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
@@ -172,6 +160,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>3.1.0.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>spring-support</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/MockAuthenticationManager.java b/spring-integration-security/src/test/java/org/springframework/integration/security/MockAuthenticationManager.java
index 252ddb5ce0..a8638faf27 100644
--- a/spring-integration-security/src/test/java/org/springframework/integration/security/MockAuthenticationManager.java
+++ b/spring-integration-security/src/test/java/org/springframework/integration/security/MockAuthenticationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,32 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.security;
 
-import org.springframework.security.authentication.AbstractAuthenticationManager;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
 /**
  * @author Oleg Zhurakousky
+ * @author Mark Fisher
  * @since 2.0
  */
-public class MockAuthenticationManager extends AbstractAuthenticationManager {
-	private boolean grantAccess;
-	
+public class MockAuthenticationManager implements AuthenticationManager {
+
+	private final boolean grantAccess;
+
 	public MockAuthenticationManager(boolean grantAccess){
 		this.grantAccess = grantAccess;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.security.authentication.AbstractAuthenticationManager#doAuthentication(org.springframework.security.core.Authentication)
-	 */
-	@Override
-	protected Authentication doAuthentication(Authentication authentication)
-			throws AuthenticationException {
-		if (grantAccess){
+	public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+		if (this.grantAccess) {
 			authentication.setAuthenticated(true);
 		}
 		return authentication;
 	}
+
 }