From f3c5c4c1a889910b218b710dd22d69b02b5228a5 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 29 Oct 2007 23:51:48 +0000
Subject: [PATCH] clearer exp syntax

---
 .../booking-jsf/src/main/webapp/flow/booking/booking.xml   | 4 ++--
 .../booking-jsf/src/main/webapp/flow/main/main.xml         | 4 ++--
 .../booking-jsf/src/main/webapp/template.xhtml             | 2 +-
 .../main/webapp/WEB-INF/config/web-application-config.xml  | 7 -------
 .../booking-mvc/src/main/webapp/flow/booking/booking.xml   | 4 ++--
 .../booking-mvc/src/main/webapp/flow/main/main.xml         | 4 ++--
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
index cb9d0219..7c380e2e 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
@@ -13,7 +13,7 @@
 	<attribute name="persistenceContext" value="true" />
 	
 	<input-mapper>
-		<input-attribute name="id" scope="flow" />
+		<input-attribute name="#{id}" scope="flow" />
 	</input-mapper>
 
 	<start-state idref="displayHotel"/>
@@ -22,7 +22,7 @@
 		<render-actions>
 			<bean-action method="findHotelById" bean="bookingService">
 				<method-arguments>
-					<argument expression="id" />
+					<argument expression="#{id}" />
 				</method-arguments>
 				<method-result name="hotel" scope="flow" />
 			</bean-action>		
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 cdc2b8cd..df430c84 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
@@ -29,7 +29,7 @@
 	<subflow-state id="bookHotel" flow="booking">
 		<attribute-mapper>
 			<input-mapper>
-				<mapping source="requestParameters.hotelId" target="id" from="string" to="long" />
+				<mapping source="#{requestParameters.hotelId}" target="#{id}" from="string" to="long" />
 			</input-mapper>
 		</attribute-mapper>
 		<transition on="bookingAuthorized" to="reloadCurrentUserBookings" />
@@ -39,7 +39,7 @@
 	<action-state id="cancelBooking">
 		<bean-action method="cancelBooking" bean="bookingService">
 			<method-arguments>
-				<argument expression="requestParameters.bookingId" parameter-type="long"/>
+				<argument expression="${requestParameters.bookingId}" parameter-type="long"/>
 			</method-arguments>
 		</bean-action>
 		<transition on="success" to="reloadCurrentUserBookings" />
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml
index dca90d88..2a65a76f 100644
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml
@@ -22,7 +22,7 @@
 		<div id="welcome">
 			<div class="left">Spring Faces: Hotel Booking Sample Application</div>
 			<div class="right">
-	            Welcome #{user.name}
+	            Welcome, #{user.name}
 			</div>
 		</div>
 		<div id="branding" class="spring">
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 9e6b1981..31325703 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
@@ -28,13 +28,6 @@
 	</web:flow-registry>
 
 	<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 >
-					<bean class="org.jboss.el.ExpressionFactoryImpl"/>
-				</constructor-arg>
-			</bean>
-		</property>
 		<property name="viewFactoryCreator">
 			<bean class="org.springframework.webflow.mvc.MvcViewFactoryCreator"/>
 		</property>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/flow/booking/booking.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/flow/booking/booking.xml
index b209baac..d33e0d09 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/flow/booking/booking.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/flow/booking/booking.xml
@@ -13,7 +13,7 @@
 	<attribute name="persistenceContext" value="true" />
 	
 	<input-mapper>
-		<input-attribute name="id" scope="flow" />
+		<input-attribute name="${id}" scope="flow" />
 	</input-mapper>
 
 	<start-state idref="displayHotel"/>
@@ -22,7 +22,7 @@
 		<render-actions>
 			<bean-action method="findHotelById" bean="bookingService">
 				<method-arguments>
-					<argument expression="id" />
+					<argument expression="${id}" />
 				</method-arguments>
 				<method-result name="hotel" scope="flow" />
 			</bean-action>		
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/flow/main/main.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/flow/main/main.xml
index b0dbba02..f1155008 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/flow/main/main.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/flow/main/main.xml
@@ -29,7 +29,7 @@
 	<subflow-state id="bookHotel" flow="booking">
 		<attribute-mapper>
 			<input-mapper>
-				<mapping source="requestParameters.hotelId" target="id" from="string" to="long" />
+				<mapping source="${requestParameters.hotelId}" target="${id}" from="string" to="long" />
 			</input-mapper>
 		</attribute-mapper>
 		<transition on="bookingAuthorized" to="reloadCurrentUserBookings" />
@@ -39,7 +39,7 @@
 	<action-state id="cancelBooking">
 		<bean-action method="cancelBooking" bean="bookingService">
 			<method-arguments>
-				<argument expression="requestParameters.bookingId" parameter-type="long"/>
+				<argument expression="${requestParameters.bookingId}" parameter-type="long"/>
 			</method-arguments>
 		</bean-action>
 		<transition on="success" to="reloadCurrentUserBookings" />