From e7e7b95ec475234113bdd5941895a72a35fbd710 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 8 Mar 2008 06:25:51 +0000
Subject: [PATCH] synced with faces

---
 .../src/main/webapp/WEB-INF/flows/booking/booking.xml     | 8 ++++----
 .../src/main/webapp/WEB-INF/flows/main/main.xml           | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

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 c86703de..50eb5268 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
@@ -29,15 +29,15 @@
 		<on-render>
 			<evaluate expression="bookingActions.setupForm"/>
 		</on-render>
-		<transition on="confirm" to="bookingAuthorized">
+		<transition on="confirm" to="bookingConfirmed">
 			<evaluate expression="entityManager.persist(booking)" />
 		</transition>
 		<transition on="revise" to="enterBookingDetails" />
 		<transition on="cancel" to="cancel" />
 	</view-state>
 	
+	<end-state id="bookingConfirmed" commit="true" />
+
 	<end-state id="cancel"/>
-	
-	<end-state id="bookingAuthorized" commit="true" />
-	
+		
 </flow>
\ No newline at end of file
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 1f33f14d..1b266a5a 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
@@ -32,7 +32,7 @@
 	
 	<subflow-state id="bookHotel" subflow="booking">
 		<input name="id" value="flowScope.hotel.id" />
-		<transition on="bookingAuthorized" to="main" />
+		<transition on="bookingConfirmed" to="finish" />
 		<transition on="cancel" to="main" />
 	</subflow-state>
 	
@@ -40,5 +40,7 @@
 		<evaluate expression="bookingService.cancelBooking(requestParameters.bookingId)" />
 		<transition on="success" to="main" />
 	</action-state>
+	
+	<end-state id="finish"/>
 
 </flow>
\ No newline at end of file