From 116844873e3e82995c805c993e9a9e425df73831 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sun, 18 Nov 2007 14:12:28 +0000
Subject: [PATCH]

---
 .../config/application-layer-config.xml       |  4 ++--
 .../WEB-INF/config/web-application-config.xml | 14 +++++--------
 .../config/application-layer-config.xml       |  4 ++--
 .../WEB-INF/config/web-application-config.xml | 20 +++++++------------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/application-layer-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/application-layer-config.xml
index d24018ac..caa231ac 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/application-layer-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/application-layer-config.xml
@@ -4,9 +4,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+       http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
 	<!-- The central service of this application that can query hotels and bookings, as well as cancel bookings -->
 	<bean id="bookingService" class="org.springframework.webflow.samples.booking.app.JpaBookingService" />
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 f3a308c6..ddbc4c75 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
@@ -4,9 +4,9 @@
        xmlns:web="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.5.xsd">
 
 	<!-- Imports the "application-layer" definining business logic and data access services -->
 	<import resource="application-layer-config.xml"/>
@@ -26,7 +26,7 @@
 	<bean id="flowBuilderServices" class="org.springframework.webflow.engine.builder.support.FlowBuilderServices">
 		<property name="expressionParser">
 			<bean class="org.springframework.webflow.core.expression.el.WebFlowELExpressionParser">
-				<constructor-arg >
+				<constructor-arg>
 					<bean class="org.jboss.el.ExpressionFactoryImpl"/>
 				</constructor-arg>
 			</bean>
@@ -38,12 +38,8 @@
 	
 	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
 	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
-		<constructor-arg>
-			<ref bean="entityManagerFactory"/>
-		</constructor-arg>
-		<constructor-arg>
-			<ref bean="transactionManager"/>
-		</constructor-arg>
+		<constructor-arg ref="entityManagerFactory" />
+		<constructor-arg ref="transactionManager" />
 	</bean>
 		
 </beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
index d24018ac..caa231ac 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
@@ -4,9 +4,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+       http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
 	<!-- The central service of this application that can query hotels and bookings, as well as cancel bookings -->
 	<bean id="bookingService" class="org.springframework.webflow.samples.booking.app.JpaBookingService" />
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
index ac44ad53..b65f8676 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -4,9 +4,9 @@
        xmlns:web="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
            http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.5.xsd">
 
 	<!-- Imports the "application-layer" definining business logic and data access services -->
 	<import resource="application-layer-config.xml"/>
@@ -15,11 +15,9 @@
 		<property name="mappings">
 			<value>
 				/intro=urlFilenameController
-				/main=flowController
-				/resources/*/**=flowController
-				/executions/*/**=flowController
 			</value>
 		</property>
+		<property name="defaultHandler" ref="flowController" />
 	</bean>
 		
 	<bean id="flowController" class="org.springframework.webflow.mvc.FlowController">
@@ -40,18 +38,14 @@
 
 	<bean id="flowBuilderServices" class="org.springframework.webflow.engine.builder.support.FlowBuilderServices">
 		<property name="viewFactoryCreator">
-			<bean class="org.springframework.webflow.mvc.MvcViewFactoryCreator"/>
+			<bean class="org.springframework.webflow.mvc.MvcViewFactoryCreator" />
 		</property>
 	</bean>
 	
 	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
 	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
-		<constructor-arg>
-			<ref bean="entityManagerFactory"/>
-		</constructor-arg>
-		<constructor-arg>
-			<ref bean="transactionManager"/>
-		</constructor-arg>
+		<constructor-arg ref="entityManagerFactory" />
+		<constructor-arg ref="transactionManager" />
 	</bean>
 
 	<!-- Handles requests to render view templates directly: maps the requested path to a logical view name resolved by the resolver below -->
@@ -59,7 +53,7 @@
 
 	<!-- Maps logical view names selected by the url filename controller to .jsp view templates within the root webapp directory -->	
 	<bean id="internalJspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/"/>
+		<property name="prefix" value="/" />
 		<property name="suffix" value=".jsp" />
 	</bean>