From d9634bcb3958299ba986af414544534e037d26bc Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Fri, 11 Jul 2008 10:56:57 +0000
Subject: [PATCH] SEC-920: Update preauth sample to make use of internal
 authentication manager http://jira.springframework.org/browse/SEC-920.
 Updated context file to use <custom-authentication-provider>.

---
 .../WEB-INF/applicationContext-security.xml     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
index 49acf3b2e9..049bc3d5a2 100644
--- a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -18,18 +18,13 @@
         </sec:filter-chain-map>
     </bean>
 
-    <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
-        <property name="providers">
-        <list>
-            <ref local="preAuthenticatedAuthenticationProvider"/>
-        </list>
-        </property>
-    </bean>
-
     <bean id="sif" class="org.springframework.security.context.HttpSessionContextIntegrationFilter"/>
-
-    <bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
-        <property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
+
+    <sec:authentication-manager alias="authenticationManager" />
+
+    <bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
+        <sec:custom-authentication-provider />
+        <property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
     </bean>
 
     <bean id="preAuthenticatedUserDetailsService"