From 80cd7f4accc1e7e8c5a4c83fae1b21d9cb128141 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 23 Apr 2008 13:13:56 +0000
Subject: [PATCH] Removed accidental commit of tutorial context file

---
 .../WEB-INF/applicationContext-security-ns.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
index 2574b3f2da..4989f3957e 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
@@ -18,24 +18,18 @@
 		-->
 	</global-method-security>
 
-    <http>
-        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR" requires-channel="https"/>
-        <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" requires-channel="https"/>
+    <http auto-config="true">
+        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
+        <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
 		<!-- Disable web URI authorization, as we're using <global-method-security> and have @Secured the services layer instead
         <intercept-url pattern="/listAccounts.html" access="IS_AUTHENTICATED_REMEMBERED" />
         <intercept-url pattern="/post.html" access="ROLE_TELLER" />
         -->
         <intercept-url pattern="/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
 <!--
-    Uncomment to enable X509 client authentication support -->
-        <x509 />
-        <anonymous />
-        <logout /> 
-<!--         
-        <port-mappings>
-            <port-mapping http="8080" https="8443"/>
-        </port-mappings>
- -->
+    Uncomment to enable X509 client authentication support
+        <x509 /> 
+-->
 
         <!-- All of this is unnecessary if auto-config="true"
         <form-login />