craigmcc 01/07/26 12:42:44 Modified: webapps/examples/WEB-INF web.xml webapps/examples/jsp/security/protected index.jsp Added: webapps/examples/jsp/security/protected error.jsp login.jsp Removed: webapps/examples/jsp/security/login error.jsp login.jsp Log: Modify the example application to place the form login and error pages inside the protected area (because that case is required to work, we might as well use it in our examples). Revision Changes Path 1.17 +2 -2 jakarta-tomcat-4.0/webapps/examples/WEB-INF/web.xml Index: web.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/web.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- web.xml 2001/07/24 00:26:55 1.16 +++ web.xml 2001/07/26 19:42:44 1.17 @@ -196,8 +196,8 @@ <auth-method>FORM</auth-method> <realm-name>Example Form-Based Authentication Area</realm-name> <form-login-config> - <form-login-page>/jsp/security/login/login.jsp</form-login-page> - <form-error-page>/jsp/security/login/error.jsp</form-error-page> + <form-login-page>/jsp/security/protected/login.jsp</form-login-page> + <form-error-page>/jsp/security/protected/error.jsp</form-error-page> </form-login-config> </login-config> 1.3 +4 -3 jakarta-tomcat-4.0/webapps/examples/jsp/security/protected/index.jsp Index: index.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/security/protected/index.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.jsp 2001/03/26 20:50:47 1.2 +++ index.jsp 2001/07/26 19:42:44 1.3 @@ -1,6 +1,6 @@ <html> <head> -<title>Protected Area Page</title> +<title>Protected Page for Examples</title> </head> <body bgcolor="white"> @@ -9,11 +9,12 @@ <% if (request.getUserPrincipal() != null) { %> - Your user principal name is <b><%= request.getUserPrincipal().getName() %></b><br><br> + Your user principal name is + <b><%= request.getUserPrincipal().getName() %></b><br><br> <% } else { %> - No user principal could be identified. + No user principal could be identified.<br><br> <% } %> 1.1 jakarta-tomcat-4.0/webapps/examples/jsp/security/protected/error.jsp Index: error.jsp =================================================================== <html> <head> <title>Error Page For Examples</title> </head> <body bgcolor="white"> Invalid username and/or password, please try <a href="login.jsp">again</a>. </body> </html> 1.1 jakarta-tomcat-4.0/webapps/examples/jsp/security/protected/login.jsp Index: login.jsp =================================================================== <html> <head> <title>Login Page for Examples</title> <body bgcolor="white"> <form method="POST" action="j_security_check" > <table border="0" cellspacing="5"> <tr> <th align="right">Username:</th> <td align="left"><input type="text" name="j_username"></td> </tr> <tr> <th align="right">Password:</th> <td align="left"><input type="password" name="j_password"></td> </tr> <tr> <td align="right"><input type="submit" value="Log In"></td> <td align="left"><input type="reset"></td> </tr> </table> </form> </body> </html>