From 48ad3e984b814b9b99d45ebd6fcb9efde84880f8 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 24 Apr 2008 06:09:56 +0000
Subject: [PATCH] login polish

---
 .../src/main/webapp/WEB-INF/config/security-config.xml      | 6 +++---
 .../booking-faces/src/main/webapp/WEB-INF/login.xhtml       | 2 +-
 .../src/main/webapp/WEB-INF/config/security-config.xml      | 6 +++---
 .../booking-mvc/src/main/webapp/WEB-INF/login.jsp           | 2 +-
 .../booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp   | 2 +-
 .../booking-mvc/src/main/webapp/WEB-INF/views.xml           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
index e5a7a7c8..b788277f 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
@@ -12,12 +12,12 @@
 	<security:http auto-config="true">
 		<!-- Restrict URLs based on role -->
 		<security:intercept-url pattern="/spring/login*" access="ROLE_ANONYMOUS" />
-		<security:intercept-url pattern="/spring/logout-success*" access="ROLE_ANONYMOUS" />
+		<security:intercept-url pattern="/spring/logoutSuccess*" access="ROLE_ANONYMOUS" />
 		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
 		
 		<!-- Override default login and logout pages -->
-		<security:form-login login-page="/spring/login" login-url="/spring/login-process" default-target-url="/spring/main" authentication-failure-url="/spring/login?login_error=1" />
-		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logout-success" />
+		<security:form-login login-page="/spring/login" login-url="/spring/loginProcess" default-target-url="/spring/main" authentication-failure-url="/spring/login?login_error=1" />
+		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
 	</security:http>
 	
 	<!--
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml
index 68eff875..3b836d0d 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml
@@ -26,7 +26,7 @@
 </div>
 
 <div class="section">
-	<form name="f" action="${request.contextPath}/spring/login-process" method="post">
+	<form name="f" action="${request.contextPath}/spring/loginProcess" method="post">
 		<fieldset>
 			<div class="field">
 				<div class="label">User:</div>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
index 06cb682e..23377934 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
@@ -12,12 +12,12 @@
 	<security:http auto-config="true">
 		<!-- Restrict URLs based on role -->
 		<security:intercept-url pattern="/spring/login*" access="ROLE_ANONYMOUS" />
-		<security:intercept-url pattern="/spring/logout-success*" access="ROLE_ANONYMOUS" />
+		<security:intercept-url pattern="/spring/logoutSuccess*" access="ROLE_ANONYMOUS" />
 		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
 		
 		<!-- Override default login and logout pages -->
-		<security:form-login login-page="/spring/login" login-url="/spring/login-process" default-target-url="/spring/hotels/index" authentication-failure-url="/spring/login?login_error=1" />
-		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logout-success" />
+		<security:form-login login-page="/spring/login" login-url="/spring/loginProcess" default-target-url="/spring/hotels/index" authentication-failure-url="/spring/login?login_error=1" />
+		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" />
 	</security:http>
 	
 	<!--
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
index d91da35e..1c1d4e37 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
@@ -24,7 +24,7 @@
 </div>
 
 <div class="section">
-	<form name="f" action="<c:url value="/spring/login-process" />" method="post">
+	<form name="f" action="<c:url value="/spring/loginProcess" />" method="post">
 		<fieldset>
 			<div class="field">
 				<div class="label"><label for="j_username">User:</label></div>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
index b0023b66..ae9a9a83 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
@@ -3,5 +3,5 @@
 <div class="section">
 	<h1>Logout</h1>
 	<p>You have successfully logged out.</p>
-	<p><a href="<c:url value="/" />">Continue</a></p>
+	<p><a href="<c:url value="hotels/index" />">Continue</a></p>
 </div>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
index be48bc1f..96200a15 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -13,7 +13,7 @@
 		<put-attribute name="body" value="/WEB-INF/login.jsp" />
 	</definition>
 	
-	<definition name="logout-success" extends="standardLayout">
+	<definition name="logoutSuccess" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/logoutSuccess.jsp" />
 	</definition>