From c7f182309f95bab7e3a86566baac216fbae72fb6 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 12 Apr 2008 17:17:46 +0000
Subject: [PATCH] Removed excess config from tutorial sample file

---
 .../applicationContext-security-ns.xml        | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 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 7d13a6379c..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
@@ -12,10 +12,10 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-	<global-method-security secured-annotations="enabled">
-		<!-- AspectJ pointcut expression that locates our "post" method and applies security that way
-		<protect-pointcut expression="execution(* bigbank.*Service.post*(..))" access="ROLE_TELLER"/>
-		-->
+	<global-method-security secured-annotations="enabled">
+		<!-- AspectJ pointcut expression that locates our "post" method and applies security that way
+		<protect-pointcut expression="execution(* bigbank.*Service.post*(..))" access="ROLE_TELLER"/>
+		-->
 	</global-method-security>
 
     <http auto-config="true">
@@ -28,7 +28,8 @@
         <intercept-url pattern="/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
 <!--
     Uncomment to enable X509 client authentication support
-        <x509 /> -->
+        <x509 /> 
+-->
 
         <!-- All of this is unnecessary if auto-config="true"
         <form-login />
@@ -37,32 +38,16 @@
         <logout />
         <remember-me /> -->
 
-        <!--
+        <!-- Uncomment to limit the number of sessions a user can have
         <concurrent-session-control max-sessions="1" exception-if-maximum-exceeded="true"/>
-		-->
-		
+		-->		
     </http>
-
-<!--
-    Uncomment to add X509 support as an external filter definition (an alternative to the <x509 /> element).
 
-    <beans:bean id="x509Filter" class="org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter" autowire="byType">
-        <custom-filter after="X509_FILTER"/>
-    </beans:bean>
-
-    <beans:bean id="preauthProvider" class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider" >
-        <custom-authentication-provider />
-        <beans:property name="preAuthenticatedUserDetailsService">
-            <beans:bean class="org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper" autowire="byType"/>
-        </beans:property>
-    </beans:bean>
--->
-
     <!--
     Usernames/Passwords are
         rod/koala
         dianne/emu
-        scott/wombat
+        scott/wombat
         peter/opal
     -->
     <authentication-provider>
@@ -71,7 +56,7 @@
             <user name="rod" password="a564de63c2d0da68cf47586ee05984d7" authorities="ROLE_SUPERVISOR, ROLE_USER, ROLE_TELLER" />
 	        <user name="dianne" password="65d15fe9156f9c4bbffd98085992a44e" authorities="ROLE_USER,ROLE_TELLER" />
             <user name="scott" password="2b58af6dddbd072ed27ffc86725d7d3a" authorities="ROLE_USER" />
-            <user name="peter" password="22b5c9accc6e1ba628cedc63a72d57f8" authorities="ROLE_USER" />
+            <user name="peter" password="22b5c9accc6e1ba628cedc63a72d57f8" authorities="ROLE_USER" />
 	    </user-service>
 	</authentication-provider>