From 757dce294ac8f4da56cd5b43abd102277761c3b2 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 21 Aug 2007 03:06:26 +0000
Subject: [PATCH] update to 2.0 schema

---
 .../src/main/webapp/WEB-INF/config/web-application-config.xml | 4 ++--
 .../booking-jsf/src/main/webapp/flow/main/main.xml            | 1 +
 .../booking-jsf/src/main/webapp/intro.xhtml                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
index 558e831a..329ad166 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -6,9 +6,9 @@
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.1.xsd">
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
 
-	<import resource="application-config.xml"/>
+	<import resource="application-layer-config.xml"/>
 	
 	<flow:enable-scopes/>
 
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml
index 58608590..90209170 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml
@@ -7,6 +7,7 @@
 	<var name="searchCriteria" class="org.springframework.webflow.samples.booking.web.SearchCriteria" scope="flow" />
 	
 	<start-actions>
+		<action method="initCurrentUser" bean="mainActions" />
 		<action method="findCurrentUserBookings" bean="mainActions" />
 	</start-actions>
 	
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
index b5e10588..2125ea6d 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml
@@ -51,7 +51,7 @@
 					<li>Client-side validation with ExtJs</li> 
 				</ul>
 				<p align="right">
-					<a href="controller.spring?_flowId=main-flow">Start your hotel booking experience</a>
+					<a href="controller.spring?_flowId=main">Start your hotel booking experience</a>
 				</p>
 			</div>
 		</div>