Update view states to more closely match booking-faces. Implemented new view selection by convention.

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>

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>

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>