From 4694d3a32da39021f9b0068da6898499160c7a2a Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Fri, 25 Apr 2008 04:13:45 +0000
Subject: [PATCH] sample updates based on recent changes of persistenceContext
 and mvc view factory creator

---
 .../src/main/webapp/WEB-INF/flows/booking/booking.xml           | 2 +-
 .../src/main/webapp/WEB-INF/config/webflow-config.xml           | 2 +-
 .../src/main/webapp/WEB-INF/config/webmvc-config.xml            | 2 +-
 .../src/main/webapp/WEB-INF/hotels/booking/booking.xml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 f2fe7e0e..96611268 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
@@ -20,7 +20,7 @@
 	
 	<view-state id="reviewBooking">
 		<transition on="confirm" to="bookingConfirmed">
-			<evaluate expression="entityManager.persist(booking)" />
+			<evaluate expression="persistenceContext.persist(booking)" />
 		</transition>
 		<transition on="revise" to="enterBookingDetails" />
 		<transition on="cancel" to="bookingCancelled" />
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
index e1e78671..c57cbfdc 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -25,7 +25,7 @@
 	<webflow:flow-builder-services id="flowBuilderServices" view-factory-creator="mvcViewFactoryCreator"/>
 	
 	<!-- Configures Web Flow to use Tiles to create views for rendering; Tiles allows for applying consistent layouts to your views -->
-	<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.view.MvcViewFactoryCreator"> 
+	<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator"> 
 		<property name="viewResolvers" ref="tilesViewResolver"/> 
 	</bean>
 	
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 6d7932f4..4a9bdcc5 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -46,7 +46,7 @@
 	
 	<!-- Resolves views by delegating to the Tiles layout system; a view name to resolve is treated as the name of a tiles definition -->
 	<bean id="tilesViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.js.ajax.view.TilesAjaxView"/>
+		<property name="viewClass" value="org.springframework.js.ajax.tiles2.AjaxTilesView"/>
 	</bean>
 
 	<!-- Enables annotated POJO @Controllers -->
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 4eb507f1..e74e6327 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
@@ -20,7 +20,7 @@
 	
 	<view-state id="reviewBooking" model="booking">
 		<transition on="confirm" to="bookingConfirmed">
-			<evaluate expression="entityManager.persist(booking)" />
+			<evaluate expression="persistenceContext.persist(booking)" />
 		</transition>
 		<transition on="revise" to="enterBookingDetails" />
 		<transition on="cancel" to="cancel" />