From 0cf745b85fdf3e6c4c1ce342344b8f59bdfa9fc5 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 22 Apr 2008 21:59:40 +0000
Subject: [PATCH] Updated clean plugin to 2.2

---
 pom.xml                                        |  2 +-
 .../WEB-INF/applicationContext-security-ns.xml | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e2c9407e0..91c0f6feed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
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 4989f3957e..2574b3f2da 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,18 +18,24 @@
 		-->
 	</global-method-security>
 
-    <http auto-config="true">
-        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
-        <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
+    <http>
+        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR" requires-channel="https"/>
+        <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" requires-channel="https"/>
 		<!-- 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 /> 
--->
+    Uncomment to enable X509 client authentication support -->
+        <x509 />
+        <anonymous />
+        <logout /> 
+<!--         
+        <port-mappings>
+            <port-mapping http="8080" https="8443"/>
+        </port-mappings>
+ -->
 
         <!-- All of this is unnecessary if auto-config="true"
         <form-login />