From 9a02b9862e71dcbe5b6ac7be93bf134181105dba Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 23 Mar 2008 23:03:28 +0000
Subject: [PATCH] Fixed preauth sample configuration to match recent changes in
 naming in core code.

---
 .../webapp/WEB-INF/applicationContext-security.xml   | 12 +++---------
 1 file changed, 3 insertions(+), 9 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 cbd4407be7..145adc2318 100644
--- a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -53,12 +53,8 @@
 	</bean>
 
     <bean id="authenticationDetailsSource" class="org.springframework.security.ui.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource">
-        <property name="j2eeMappableRolesRetriever">
-        <ref local="j2eeMappableRolesRetriever"/>
-        </property>
-        <property name="j2eeUserRoles2GrantedAuthoritiesMapper">
-        <ref local="j2eeUserRoles2GrantedAuthoritiesMapper"/>
-        </property>
+        <property name="mappableRolesRetriever" ref="j2eeMappableRolesRetriever"/>
+        <property name="userRoles2GrantedAuthoritiesMapper" ref="j2eeUserRoles2GrantedAuthoritiesMapper"/>
     </bean>
 
 	<bean id="j2eeUserRoles2GrantedAuthoritiesMapper" class="org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper">
@@ -79,9 +75,7 @@
     <bean id="servletContext" class="org.springframework.web.context.support.ServletContextFactoryBean"/>
 
     <bean id="etf" class="org.springframework.security.ui.ExceptionTranslationFilter">
-        <property name="authenticationEntryPoint">
-            <ref local="preAuthenticatedProcessingFilterEntryPoint"/>
-        </property>
+        <property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
     </bean>
 
 	<bean id="httpRequestAccessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">