From 7ce9759804df58be7025b36e0fc62ce3c6e4de92 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 10 Jul 2008 08:22:08 +0000
Subject: [PATCH] simplified flow impl

---
 .../webflow/samples/booking/JpaBookingService.java            | 4 +++-
 .../src/main/webapp/WEB-INF/flows/booking/booking.xml         | 4 +---
 .../webflow/samples/booking/JpaBookingService.java            | 4 +++-
 .../src/main/webapp/WEB-INF/hotels/booking/booking.xml        | 4 +---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
index 52993c7a..e5a19ed4 100755
--- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
+++ b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
@@ -57,7 +57,9 @@ public class JpaBookingService implements BookingService {
     public Booking createBooking(Long hotelId, String username) {
 	Hotel hotel = em.find(Hotel.class, hotelId);
 	User user = findUser(username);
-	return new Booking(hotel, user);
+	Booking booking = new Booking(hotel, user);
+	em.persist(booking);
+	return booking;
     }
 
     // read-write transactional methods
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml
index 96611268..296e8b1a 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml
@@ -19,9 +19,7 @@
 	</view-state>
 	
 	<view-state id="reviewBooking">
-		<transition on="confirm" to="bookingConfirmed">
-			<evaluate expression="persistenceContext.persist(booking)" />
-		</transition>
+		<transition on="confirm" to="bookingConfirmed" />
 		<transition on="revise" to="enterBookingDetails" />
 		<transition on="cancel" to="bookingCancelled" />
 	</view-state>
diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
index bef7c72b..b14a3fd0 100755
--- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
+++ b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
@@ -56,7 +56,9 @@ public class JpaBookingService implements BookingService {
     public Booking createBooking(Long hotelId, String username) {
 	Hotel hotel = em.find(Hotel.class, hotelId);
 	User user = findUser(username);
-	return new Booking(hotel, user);
+	Booking booking = new Booking(hotel, user);
+	em.persist(booking);
+	return booking;
     }
 
     @Transactional
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml
index e74e6327..04a2c8d3 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml
@@ -19,9 +19,7 @@
 	</view-state>
 	
 	<view-state id="reviewBooking" model="booking">
-		<transition on="confirm" to="bookingConfirmed">
-			<evaluate expression="persistenceContext.persist(booking)" />
-		</transition>
+		<transition on="confirm" to="bookingConfirmed" />
 		<transition on="revise" to="enterBookingDetails" />
 		<transition on="cancel" to="cancel" />
 	</view-state>