From 3b68951ca31705f6e3e3aed27a1b8d04bb732412 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 5 Jun 2008 20:47:16 +0000
Subject: [PATCH] 2.0.2 security

---
 spring-webflow-samples/booking-faces/ivy.xml  |  2 +-
 .../webapp/WEB-INF/config/security-config.xml | 21 +++----------------
 spring-webflow-samples/booking-mvc/ivy.xml    |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index 66c465f7..bf85d443 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -42,7 +42,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.2.A" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->jsf12"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
index 3754a790..58b563da 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
@@ -6,36 +6,21 @@
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
            http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security-2.0.1.xsd">
+           http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
 
 	<!-- Configure Spring Security -->
 	<security:http auto-config="true" >
-        
+
 		<!-- Restrict URLs based on role -->
 		<security:intercept-url pattern="/spring/login*" access="ROLE_ANONYMOUS" />
 		<security:intercept-url pattern="/spring/logoutSuccess*" access="ROLE_ANONYMOUS" />
 		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
 		
 		<!-- Override default login and logout pages -->
-		<security:form-login login-page="/spring/login" />
+		<security:form-login login-page="/spring/login" login-processing-url="/spring/loginProcess" default-target-url="/spring/main" />        
 		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
 	</security:http>
     
-    <security:authentication-manager alias="authenticationManager"/>
-    
-    <bean id="authFilter" class="org.springframework.security.ui.webapp.AuthenticationProcessingFilter">
-        <property name="authenticationManager" ref="authenticationManager"/>
-        <property name="authenticationFailureUrl" value="/spring/login?login_error=1"/>
-        <property name="defaultTargetUrl" value="/spring/main"/>
-        <property name="filterProcessesUrl" value="/spring/loginProcess"/>
-        <property name="targetUrlResolver">
-            <bean class="org.springframework.security.ui.TargetUrlResolverImpl">
-                <property name="justUseSavedRequestOnGet" value="false"/>
-            </bean>       
-        </property>
-        <security:custom-filter position="AUTHENTICATION_PROCESSING_FILTER" />        
-    </bean>
-	
 	<!--
 		Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc)
 		
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index da3e2ceb..a8cd37f5 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -46,7 +46,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="compile->compile"/>
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.2.A" conf="compile->compile"/>
 		<dependency org="org.springframework.security" name="org.springframework.security.taglibs" rev="2.0.0.A" conf="compile->compile"/>
  		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->compile"/>
   		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>