From bf7d691c4537c4fca72e2b27b1c6a56601fa9a76 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 11 Oct 2009 15:24:42 +0000
Subject: [PATCH] Update and fix tests

---
 .../resources/filter-chain-performance-app-context.xml    | 4 ++--
 itest/context/src/test/resources/sec-933-app-context.xml  | 6 +++---
 itest/context/src/test/resources/sec-936-app-context.xml  | 4 ++--
 itest/pom.xml                                             | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/itest/context/src/test/resources/filter-chain-performance-app-context.xml b/itest/context/src/test/resources/filter-chain-performance-app-context.xml
index 3f3715e339..fe882ec464 100644
--- a/itest/context/src/test/resources/filter-chain-performance-app-context.xml
+++ b/itest/context/src/test/resources/filter-chain-performance-app-context.xml
@@ -8,7 +8,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:sec="http://www.springframework.org/schema/security"
     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.5.xsd
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
                         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
     <bean id="fcpMinimalStack" class="org.springframework.security.web.FilterChainProxy">
@@ -50,6 +50,7 @@
 
     <bean id="preAuthFilter" class="org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter">
         <property name="authenticationManager" ref="authenticationManager"/>
+        <property name="exceptionIfHeaderMissing" value="false" />
     </bean>
 
     <bean id="scharf" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter" />
@@ -69,7 +70,6 @@
     <bean id="etf" class="org.springframework.security.web.access.ExceptionTranslationFilter">
         <property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
     </bean>
-
 
     <bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
         <property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
diff --git a/itest/context/src/test/resources/sec-933-app-context.xml b/itest/context/src/test/resources/sec-933-app-context.xml
index e89a9d6cae..da52fd9558 100755
--- a/itest/context/src/test/resources/sec-933-app-context.xml
+++ b/itest/context/src/test/resources/sec-933-app-context.xml
@@ -4,9 +4,9 @@
     xmlns:tx="http://www.springframework.org/schema/tx"
     xmlns:security="http://www.springframework.org/schema/security"
     xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
 
diff --git a/itest/context/src/test/resources/sec-936-app-context.xml b/itest/context/src/test/resources/sec-936-app-context.xml
index 1e05c252bf..0f47ca815c 100755
--- a/itest/context/src/test/resources/sec-936-app-context.xml
+++ b/itest/context/src/test/resources/sec-936-app-context.xml
@@ -3,8 +3,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:security="http://www.springframework.org/schema/security"
     xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
     http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
     <security:authentication-manager alias="authenticationManager">
diff --git a/itest/pom.xml b/itest/pom.xml
index fc1ad5ccce..c87c91a146 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -33,16 +33,16 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
             <version>${project.version}</version>
-        </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-core</artifactId>
-            <version>1.0.2</version>
+            <version>1.5.5</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-server-jndi</artifactId>
-            <version>1.0.2</version>
+            <version>1.5.5</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>