From 4f6b4e4bfd2e312c9d0ebc228af4b45a9c9658f2 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 15 May 2008 12:48:13 +0000
Subject: [PATCH] Make sample login pages use c:out for data output

---
 samples/contacts/src/main/webapp/login.jsp     |  6 +++---
 samples/openid/src/main/webapp/openidlogin.jsp |  5 +++--
 samples/tutorial/src/main/webapp/login.jsp     | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/samples/contacts/src/main/webapp/login.jsp b/samples/contacts/src/main/webapp/login.jsp
index 8a9ca679a2..ceded0bf91 100644
--- a/samples/contacts/src/main/webapp/login.jsp
+++ b/samples/contacts/src/main/webapp/login.jsp
@@ -27,14 +27,14 @@
          --%>
     <c:if test="${not empty param.login_error}">
       <font color="red">
-        Your login attempt was not successful, try again.<BR><BR>
-        Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+        Your login attempt was not successful, try again.<br/><br/>
+        Reason: <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>.
       </font>
     </c:if>
 
     <form name="f" action="<c:url value='j_spring_security_check'/>" method="POST">
       <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>User:</td><td><input type='text' name='j_username' value='<c:if test="${not empty param.login_error}"><c:out value="${SPRING_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="_spring_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>
 
diff --git a/samples/openid/src/main/webapp/openidlogin.jsp b/samples/openid/src/main/webapp/openidlogin.jsp
index 71c4c5615c..819caad698 100644
--- a/samples/openid/src/main/webapp/openidlogin.jsp
+++ b/samples/openid/src/main/webapp/openidlogin.jsp
@@ -17,13 +17,14 @@
     <c:if test="${not empty param.login_error}">
       <font color="red">
         Your login attempt was not successful, try again.<br/><br/>
-        Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+        Reason: <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>.
       </font>
     </c:if>
 
+
     <form name="f" action="<c:url value='j_spring_openid_security_check'/>" method="POST">
       <table>
-        <tr><td>OpenID Identity:</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>OpenID Identity:</td><td><input type='text' name='j_username' value='<c:if test="${not empty param.login_error}"><c:out value="${SPRING_SECURITY_LAST_USERNAME}"/></c:if>'/></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/login.jsp b/samples/tutorial/src/main/webapp/login.jsp
index d752d3975e..644d4081b3 100644
--- a/samples/tutorial/src/main/webapp/login.jsp
+++ b/samples/tutorial/src/main/webapp/login.jsp
@@ -24,16 +24,16 @@
     <%-- this form-login-page form is also used as the
          form-error-page to ask for a login again.
          --%>
-	<% if (session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY) != null) { %>
+    <c:if test="${not empty param.login_error}">
       <font color="red">
-        Your login attempt was not successful, try again.<BR><BR>
-        Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+        Your login attempt was not successful, try again.<br/><br/>
+        Reason: <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>.
       </font>
-    <% } %>
+    </c:if>
 
     <form name="f" action="<c:url value='j_spring_security_check'/>" method="POST">
       <table>
-        <tr><td>User:</td><td><input type='text' name='j_username' <% if (session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) != null) { %>value='<%= session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>'<% } %>></td></tr>
+        <tr><td>User:</td><td><input type='text' name='j_username' value='<c:if test="${not empty param.login_error}"><c:out value="${SPRING_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="_spring_security_remember_me"></td><td>Don't ask for my password for two weeks</td></tr>