From bd740a91a2b0a262a7d2b533d2bc73cb61c60199 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 16 Oct 2007 13:52:01 +0000
Subject: [PATCH] Corrected remember-me parameter name in samples and log file
 name in tutorial sample (was "contacts.log").

---
 samples/contacts/src/main/webapp/acegilogin.jsp                 | 2 +-
 .../tutorial/src/main/webapp/WEB-INF/classes/log4j.properties   | 2 +-
 samples/tutorial/src/main/webapp/acegilogin.jsp                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/contacts/src/main/webapp/acegilogin.jsp b/samples/contacts/src/main/webapp/acegilogin.jsp
index be868dba3e..7a5c7d3c6c 100644
--- a/samples/contacts/src/main/webapp/acegilogin.jsp
+++ b/samples/contacts/src/main/webapp/acegilogin.jsp
@@ -36,7 +36,7 @@
       <table>
         <tr><td>User:</td><td><input type='text' name='j_username' <c:if test="${not empty param.login_error}">value='<%= session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>'</c:if>></td></tr>
         <tr><td>Password:</td><td><input type='password' name='j_password'></td></tr>
-        <tr><td><input type="checkbox" name="_acegi_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>
+        <tr><td><input type="checkbox" name="_spring_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>
 
         <tr><td colspan='2'><input name="submit" type="submit"></td></tr>
         <tr><td colspan='2'><input name="reset" type="reset"></td></tr>
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/classes/log4j.properties b/samples/tutorial/src/main/webapp/WEB-INF/classes/log4j.properties
index b8862a273b..47d8eadac5 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/samples/tutorial/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -10,7 +10,7 @@ log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
 
 # Rolling log file output...
 log4j.appender.fileout=org.apache.log4j.RollingFileAppender
-log4j.appender.fileout.File=contacts.log
+log4j.appender.fileout.File=spring-security-tutorial.log
 #log4j.appender.fileout.File=${webapp.root}/WEB-INF/log4j.log
 log4j.appender.fileout.MaxFileSize=1024KB
 log4j.appender.fileout.MaxBackupIndex=1
diff --git a/samples/tutorial/src/main/webapp/acegilogin.jsp b/samples/tutorial/src/main/webapp/acegilogin.jsp
index d4c12eb1ff..1d0c1383c0 100644
--- a/samples/tutorial/src/main/webapp/acegilogin.jsp
+++ b/samples/tutorial/src/main/webapp/acegilogin.jsp
@@ -33,7 +33,7 @@
       <table>
         <tr><td>User:</td><td><input type='text' name='j_username' <c:if test="${not empty param.login_error}">value='<c:out value="${ACEGI_SECURITY_LAST_USERNAME}"/>'</c:if>></td></tr>
         <tr><td>Password:</td><td><input type='password' name='j_password'></td></tr>
-        <tr><td><input type="checkbox" name="_acegi_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>
+        <tr><td><input type="checkbox" name="_spring_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>
 
         <tr><td colspan='2'><input name="submit" type="submit"></td></tr>
         <tr><td colspan='2'><input name="reset" type="reset"></td></tr>