From 7aa28ea74269aea3e9fce48592603a71e29d2829 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Mon, 3 Dec 2007 06:31:03 +0000
Subject: [PATCH] SEC-614: Use DelegatingFilterProxy instead of
 FilterToBeanProxy.

---
 samples/contacts/src/main/webapp/WEB-INF/web.xml | 14 +++++---------
 samples/tutorial/src/main/webapp/WEB-INF/web.xml | 10 +++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/samples/contacts/src/main/webapp/WEB-INF/web.xml b/samples/contacts/src/main/webapp/WEB-INF/web.xml
index 7f9d88b18c..fd82d4a83a 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/web.xml
@@ -45,17 +45,13 @@
 	</context-param>
 
 
-   <filter>
-        <filter-name>Spring Security Filter Chain Proxy</filter-name>
-        <filter-class>org.springframework.security.util.FilterToBeanProxy</filter-class>
-        <init-param>
-            <param-name>targetClass</param-name>
-            <param-value>org.springframework.security.util.FilterChainProxy</param-value>
-        </init-param>
-   </filter>
+    <filter>
+        <filter-name>filterChainProxy</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
 
     <filter-mapping>
-      <filter-name>Spring Security Filter Chain Proxy</filter-name>
+      <filter-name>filterChainProxy</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
 
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
index 3c3618fc66..854ab51cf0 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/web.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
@@ -25,16 +25,12 @@
 	</context-param>
 
     <filter>
-        <filter-name>Spring Security Filter Chain Proxy</filter-name>
-        <filter-class>org.springframework.security.util.FilterToBeanProxy</filter-class>
-        <init-param>
-            <param-name>targetClass</param-name>
-            <param-value>org.springframework.security.util.FilterChainProxy</param-value>
-        </init-param>
+        <filter-name>_filterChainProxy</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     </filter>
 
     <filter-mapping>
-      <filter-name>Spring Security Filter Chain Proxy</filter-name>
+      <filter-name>_filterChainProxy</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>