From 5730d46905e5d1810b59fff0e3f558d6a78efd9c Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Thu, 6 Mar 2008 21:58:23 +0000
Subject: [PATCH] Update view states to more closely match booking-faces. 
 Implemented new view selection by convention.

---
 .../webapp/WEB-INF/flows/booking/booking.xml     |  6 +++---
 .../{bookingForm.jsp => enterBookingDetails.jsp} |  0
 .../{confirmBooking.jsp => reviewBooking.jsp}    |  0
 .../src/main/webapp/WEB-INF/flows/main/main.xml  | 16 ++++++++--------
 .../main/{hotelDetails.jsp => reviewHotel.jsp}   |  0
 .../src/main/webapp/WEB-INF/logout-success.jsp   |  1 +
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/{bookingForm.jsp => enterBookingDetails.jsp} (100%)
 rename spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/{confirmBooking.jsp => reviewBooking.jsp} (100%)
 rename spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/{hotelDetails.jsp => reviewHotel.jsp} (100%)

diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
index dfadb96f..0ecc8fb0 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml
@@ -15,17 +15,17 @@
 		<evaluate expression="${hotel.createBooking(bookingService.findUser(currentUser.name))}" result="${flowScope.booking}" />
 	</on-start>
 	
-	<view-state id="enterBookingDetails" view="bookingForm.jsp">
+	<view-state id="enterBookingDetails">
 		<on-render>
 			<evaluate expression="${bookingActions.setupForm}"/>
 		</on-render>
-		<transition on="proceed" to="confirmBooking">
+		<transition on="proceed" to="reviewBooking">
 			<evaluate expression="${bookingActions.bindAndValidate}" />
 		</transition>
 		<transition on="cancel" to="cancel" />
 	</view-state>
 	
-	<view-state id="confirmBooking" view="confirmBooking.jsp">
+	<view-state id="reviewBooking">
 		<on-render>
 			<evaluate expression="${bookingActions.setupForm}"/>
 		</on-render>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/bookingForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/bookingForm.jsp
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/confirmBooking.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/confirmBooking.jsp
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
index 47e77980..6e940126 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/main.xml
@@ -6,14 +6,14 @@
 	
 	<var name="searchCriteria" class="org.springframework.webflow.samples.booking.SearchCriteria"  />
 	
-	<view-state id="displayMain" view="main.jsp">
+	<view-state id="main">
 		<on-render>
 			<evaluate expression="${bookingService.findBookings(currentUser.name)}" result="${requestScope.bookings}" />
 		</on-render>
 		<transition on="findHotels" to="findHotels">
 			<evaluate expression="${mainActions.bindAndValidate}" />
 		</transition>
-		<transition on="selectHotel" to="displayHotel">
+		<transition on="selectHotel" to="reviewHotel">
 			<set name="${requestScope.id}" value="${requestParameters.hotelId}" type="long" />
 			<evaluate expression="${bookingService.findHotelById(id)}" result="${flowScope.hotel}" />
 		</transition>
@@ -22,23 +22,23 @@
 	
 	<action-state id="findHotels">
 		<evaluate expression="${bookingService.findHotels(searchCriteria)}" result="${flowScope.hotels}" />
-		<transition on="success" to="displayMain" />
+		<transition on="success" to="main" />
 	</action-state>
 	
-	<view-state id="displayHotel" view="hotelDetails.jsp">
+	<view-state id="reviewHotel">
 		<transition on="book" to="bookHotel" />
-		<transition on="cancel" to="cancel" />
+		<transition on="cancel" to="main" />
 	</view-state>
 	
 	<subflow-state id="bookHotel" subflow="booking">
 		<input name="${id}" value="${flowScope.hotel.id}" />
-		<transition on="bookingAuthorized" to="displayMain" />
-		<transition on="cancel" to="displayMain" />
+		<transition on="bookingAuthorized" to="main" />
+		<transition on="cancel" to="main" />
 	</subflow-state>
 	
 	<action-state id="cancelBooking">
 		<evaluate expression="${bookingService.cancelBooking(requestParameters.bookingId)}" />
-		<transition on="success" to="displayMain" />
+		<transition on="success" to="main" />
 	</action-state>
 
 </flow>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/hotelDetails.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/hotelDetails.jsp
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
index 51b095af..ed7ed422 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
@@ -9,6 +9,7 @@
 <div class="section">
 	<h1>Logout</h1>
 	<p>You have successfully logged out.</p>
+	<p><a href="<c:url value="/spring/main" />" />Continue</a></p>
 </div>