From b297a8a6a88c9eca0decc6a0538fbbd423d6fe37 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Wed, 27 Feb 2008 17:04:41 +0000
Subject: [PATCH]

---
 .../booking-jsf/.springBeans                  | 21 -------------------
 .../booking-jsf/.springWebflow                | 12 +++++------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/spring-webflow-samples/booking-jsf/.springBeans b/spring-webflow-samples/booking-jsf/.springBeans
index 27043fc3..5d292705 100755
--- a/spring-webflow-samples/booking-jsf/.springBeans
+++ b/spring-webflow-samples/booking-jsf/.springBeans
@@ -10,26 +10,5 @@
 		<config>src/main/webapp/WEB-INF/web-application-config.xml</config>
 	</configs>
 	<configSets>
-		<configSet>
-			<name><![CDATA[webapp-config]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[booking]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[main]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-			</configs>
-		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-webflow-samples/booking-jsf/.springWebflow b/spring-webflow-samples/booking-jsf/.springWebflow
index 737a5617..a855adb0 100755
--- a/spring-webflow-samples/booking-jsf/.springWebflow
+++ b/spring-webflow-samples/booking-jsf/.springWebflow
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <webflow-project-description>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
 	<configs>
 		<config>
-			<file>src/main/webapp/flow/booking/booking.xml</file>
-			<name><![CDATA[booking]]></name>
-			<beans-config><![CDATA[1:BeansModel|2:swf-booking-jsf|4:booking]]></beans-config>
+			<file>src/main/webapp/WEB-INF/flows/main/main-flow.xml</file>
+			<name><![CDATA[main-flow]]></name>
 		</config>
 		<config>
-			<file>src/main/webapp/flow/main/main.xml</file>
-			<name><![CDATA[main]]></name>
-			<beans-config><![CDATA[1:BeansModel|2:swf-booking-jsf|4:main]]></beans-config>
+			<file>src/main/webapp/WEB-INF/flows/booking/booking-flow.xml</file>
+			<name><![CDATA[booking-flow]]></name>
 		</config>
 	</configs>
 </webflow-project-description>