From 68364f06a2ccee1d4242a601efe01faa7426db42 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 29 Jul 2009 16:05:47 +0000
Subject: [PATCH] Minor itest updates

---
 .../src/main/webapp/WEB-INF/http-security.xml  |  2 +-
 .../main/webapp/WEB-INF/in-memory-provider.xml | 18 +++++++++---------
 .../AbstractWebServerIntegrationTests.java     |  9 ++++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/itest/web/src/main/webapp/WEB-INF/http-security.xml b/itest/web/src/main/webapp/WEB-INF/http-security.xml
index 6b4f094c21..530414d37c 100644
--- a/itest/web/src/main/webapp/WEB-INF/http-security.xml
+++ b/itest/web/src/main/webapp/WEB-INF/http-security.xml
@@ -4,7 +4,7 @@
     xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
     <!--
        Http App Context to test form login, remember-me and concurrent session control.
diff --git a/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml b/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml
index 1038f4d764..f4e5c98041 100644
--- a/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml
+++ b/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml
@@ -4,14 +4,14 @@
     xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-	<authentication-provider>
-		<user-service>
-			<user name="miles" password="milespassword" authorities="ROLE_USER,ROLE_JAZZ,ROLE_TRUMPETER"/>
-			<user name="johnc" password="johncspassword" authorities="ROLE_USER,ROLE_JAZZ,ROLE_SAXOPHONIST"/>			
-			<user name="jimi" password="jimispassword" authorities="ROLE_USER,ROLE_ROCK,ROLE_GUITARIST"/>
-		</user-service>
-	</authentication-provider>
+  <authentication-provider>
+    <user-service>
+      <user name="miles" password="milespassword" authorities="ROLE_USER,ROLE_JAZZ,ROLE_TRUMPETER"/>
+      <user name="johnc" password="johncspassword" authorities="ROLE_USER,ROLE_JAZZ,ROLE_SAXOPHONIST"/>
+      <user name="jimi" password="jimispassword" authorities="ROLE_USER,ROLE_ROCK,ROLE_GUITARIST"/>
+    </user-service>
+  </authentication-provider>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java b/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
index 33ed9bb99d..5294ae8e1e 100644
--- a/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
+++ b/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
@@ -17,6 +17,11 @@ import org.testng.annotations.*;
 import com.meterware.httpunit.WebConversation;
 
 /**
+ * Base class which allows the application to be started with a particular Spring application
+ * context. Subclasses override the <tt>getContextConfigLocations</tt> method to return
+ * a list of context file names which is passed to the <tt>ContextLoaderListener</tt> when
+ * starting up the webapp.
+ *
  * @author Luke Taylor
  * @version $Id$
  */
@@ -51,7 +56,7 @@ public abstract class AbstractWebServerIntegrationTests {
     }
 
     @SuppressWarnings("unchecked")
-    protected WebAppContext createWebContext() {
+    private WebAppContext createWebContext() {
         WebAppContext webCtx = new WebAppContext("src/main/webapp", getContextPath());
 
         if (StringUtils.hasText(getContextConfigLocations())) {
@@ -117,8 +122,6 @@ public abstract class AbstractWebServerIntegrationTests {
         tester.assertTextPresent(text);
     }
 
-
-
     // Security-specific utility methods
 
     protected void login(String username, String password) {