From fca5617750ccb0ea66fc5aec0f06e5a7a1e9b30f Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Tue, 26 Feb 2008 23:03:31 +0000
Subject: [PATCH]

---
 .../webapp/flow/booking/booking-beans.xml     |  10 --
 .../src/main/webapp/flow/booking/booking.xml  |  63 --------
 .../webapp/flow/booking/bookingForm.xhtml     | 134 ------------------
 .../webapp/flow/booking/confirmBooking.xhtml  |  69 ---------
 .../main/webapp/flow/main/displayHotels.xhtml |  57 --------
 .../main/webapp/flow/main/hotelDetails.xhtml  |  56 --------
 .../src/main/webapp/flow/main/main-beans.xml  |  12 --
 .../src/main/webapp/flow/main/main.xhtml      |  87 ------------
 .../src/main/webapp/flow/main/main.xml        | 104 --------------
 9 files changed, 592 deletions(-)
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking-beans.xml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/confirmBooking.xhtml
 delete mode 100644 spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/displayHotels.xhtml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/hotelDetails.xhtml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main-beans.xml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xhtml
 delete mode 100755 spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking-beans.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking-beans.xml
deleted file mode 100755
index 141de522..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking-beans.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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">
-
-	<bean id="bookingActions" class="org.springframework.webflow.samples.booking.flow.booking.BookingActions"/>	
-
-</beans>
\ No newline at end of file
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
deleted file mode 100755
index 1e2d0e00..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
-
-	<attribute name="description" value="The flow that handles the process of booking a hotel for a user"/>
-
-	<!-- 
-		Indicates this flow requires a persistence context
-		One will be created automatically when this flow starts; all data access will use it automatically
-	-->
-	<attribute name="persistenceContext" value="true" />
-	
-	<var name="bookingOptions" class="org.springframework.webflow.samples.booking.flow.booking.BookingOptions"/>
-	
-	<input-mapper>
-		<input-attribute name="#{id}" scope="flow" />
-	</input-mapper>
-
-	<start-state idref="loadHotel"/>
-	
-	<action-state id="loadHotel">
-		<bean-action method="findHotelById" bean="bookingService">
-			<method-arguments>
-				<argument expression="#{id}" />
-			</method-arguments>
-			<method-result name="hotel" scope="flow" />
-		</bean-action>	
-		<transition on="success" to="createBooking"/>	
-	</action-state>
-	
-	<action-state id="createBooking">
-		<action method="createBooking" bean="bookingActions"/>
-		<transition on="success" to="enterBookingDetails" />
-	</action-state>
-	
-	<view-state id="enterBookingDetails" view="bookingForm.xhtml">
-		<transition on="proceed" to="confirmBooking">
-			<action method="validateBooking" bean="bookingActions" />
-		</transition>
-		<transition on="cancel" to="cancel" />
-	</view-state>
-	
-	<view-state id="confirmBooking" view="confirmBooking.xhtml">
-		<transition on="confirm" to="bookingAuthorized" />
-		<transition on="revise" to="enterBookingDetails" />
-		<transition on="cancel" to="cancel" />
-	</view-state>
-	
-	<end-state id="cancel">
-		<!-- Indicates any changes to managed persistent entities should NOT be committed to the database -->
-		<attribute name="commit" value="false" type="boolean" />
-	</end-state>
-	
-	<end-state id="bookingAuthorized">
-		<!-- Indicates changes to managed persistent entities should be committed to the database at this point -->
-		<attribute name="commit" value="true" type="boolean" />
-	</end-state>
-	
-	<import resource="booking-beans.xml"/>
-	
-</flow>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
deleted file mode 100755
index d3523b55..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:sf="http://www.springframework.org/tags/faces"
-                xmlns:sfe="http://www.springframework.org/tags/faces-ext"
-				template="/template.xhtml">
-
-<ui:define name="content">
-
-<div class="section">
-	<h2>Book Hotel</h2>
-	<h:form id="booking">
-	<h:messages errorClass="errors" />
-	<fieldset>
-		<div class="field">
-			<div class="label">Name:</div>
-			<div class="output">#{hotel.name}</div>
-		</div>
-		<div class="field">
-			<div class="label">Address:</div>
-			<div class="output">#{hotel.address}</div>
-		</div>
-		<div class="field">
-			<div class="label">City, State:</div>
-			<div class="output">#{hotel.city}, #{hotel.state}</div>
-		</div>
-		<div class="field">
-			<div class="label">Zip:</div>
-			<div class="output">#{hotel.zip}</div>
-		</div>
-		<div class="field">
-			<div class="label">Country:</div>
-			<div class="output">#{hotel.country}</div>
-		</div>
-        <div class="field">
-            <div class="label">Nightly rate:</div>
-            <div class="output">
-                <h:outputText value="#{hotel.price}">
-                    <f:convertNumber type="currency" currencySymbol="$"/>
-                </h:outputText>
-            </div>
-        </div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="checkinDate">Check In Date:</h:outputLabel>
-			</div>
-			<div class="input">
-				<sf:clientDateValidator required="true" >
-		        	<h:inputText id="checkinDate" value="#{booking.checkinDate}" required="true">
-	                	<f:convertDateTime pattern="yyyy-MM-dd" timeZone="EST"/>
-	                </h:inputText>
-               	</sf:clientDateValidator>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel>
-			</div>
-			<div class="input">
-				<sf:clientDateValidator required="true">
-					<h:inputText id="checkoutDate" value="#{booking.checkoutDate}" required="true">
-						<f:convertDateTime pattern="yyyy-MM-dd" timeZone="EST"/>
-					</h:inputText>
-				</sf:clientDateValidator>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="beds">Room Preference:</h:outputLabel>
-			</div>
-			<div class="input">
-				<h:selectOneMenu id="beds" value="#{booking.beds}">
-					<f:selectItems value="#{bookingOptions.bedOptions}"/>
-				</h:selectOneMenu>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="smoking">Smoking Preference:</h:outputLabel>
-			</div>
-			<div id="radio" class="input">
-				<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection">
-					<f:selectItems value="#{bookingOptions.smokingOptions}"/>
-				</h:selectOneRadio>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="creditCard">Credit Card #:</h:outputLabel>
-			</div>
-			<div class="input">
-				<sf:clientTextValidator required="true" regExp="[0-9]{16}" invalidMessage="A 16-digit credit card number is required.">
-					<h:inputText id="creditCard" value="#{booking.creditCard}" required="true"/>
-				</sf:clientTextValidator>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel>
-			</div>
-			<div class="input">
-				<sf:clientTextValidator required="true">
-					<h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"/>
-				</sf:clientTextValidator>
-			</div>
-		</div>
-		<div class="field">
-			<div class="label">
-				<h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel>
-			</div>
-			<div class="input">
-				<h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}">
-					<f:selectItems value="#{bookingOptions.creditCardExpMonths}" />
-				</h:selectOneMenu>
-				<h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}">
-					<f:selectItems value="#{bookingOptions.creditCardExpYears}"/>
-				</h:selectOneMenu>
-			</div>
-		</div>
-
-			<div class="buttonGroup">
-				<sf:validateAllOnClick>
-					<h:commandButton id="proceed" action="proceed" value="Proceed"/>
-				</sf:validateAllOnClick>
-				<h:commandButton id="cancel" immediate="true" value="Cancel" action="cancel"/>
-			</div>
-	</fieldset>
-	</h:form>
-</div>
-
-</ui:define>
-</ui:composition>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/confirmBooking.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/confirmBooking.xhtml
deleted file mode 100755
index a6d8b04c..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/confirmBooking.xhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="http://java.sun.com/jsf/core"
-				template="/template.xhtml">
-
-<ui:define name="content">
-
-<div class="section">
-	<h1>Confirm Hotel Booking</h1> 
-</div>
-
-<div class="section">
-	<h:form id="confirm">
-	<fieldset>
-		<div class="field">
-			<div class="label">Name:</div>
-			<div class="output">#{hotel.name}</div>
-		</div>
-		<div class="field">
-			<div class="label">Address:</div>
-			<div class="output">#{hotel.address}</div>
-		</div>
-		<div class="field">
-			<div class="label">City, State:</div>
-			<div class="output">#{hotel.city}, #{hotel.state}</div>
-		</div>
-		<div class="field">
-			<div class="label">Zip:</div>
-			<div class="output">#{hotel.zip}</div>
-		</div>
-		<div class="field">
-			<div class="label">Country:</div>
-			<div class="output">#{hotel.country}</div>
-		</div>
-        <div class="field">
-            <div class="label">Total payment:</div>
-            <div class="output">
-                <h:outputText value="#{booking.total}">
-                    <f:convertNumber type="currency" 
-                                     currencySymbol="$"/>
-                </h:outputText>
-            </div>
-        </div>
-		<div class="field">
-			<div class="label">Check In Date:</div>
-			<div class="output"><h:outputText value="#{booking.checkinDate}"/></div>
-		</div>
-		<div class="field">
-			<div class="label">Check Out Date:</div>
-			<div class="output"><h:outputText value="#{booking.checkoutDate}"/></div>
-		</div>
-		<div class="field">
-			<div class="label">Credit Card #:</div>
-			<div class="output">#{booking.creditCard}</div>
-		</div>
-		<div class="buttonGroup">
-			<h:commandButton id="confirm" value="Confirm" action="confirm"/>&#160;
-    		<h:commandButton id="revise" value="Revise" action="revise"/>&#160;
-    		<h:commandButton id="cancel" value="Cancel" action="cancel"/>
-		</div>
-
-	</fieldset>
-	</h:form>
-</div>
-
-</ui:define>
-</ui:composition>
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/displayHotels.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/displayHotels.xhtml
deleted file mode 100644
index 3deb7ec0..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/displayHotels.xhtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="http://java.sun.com/jsf/core"
-	  			xmlns:sf="http://www.springframework.org/tags/faces"
-				template="/template.xhtml">
-
-<ui:define name="content">
-<h:form id="displayHotelsForm">
-	<div class="section">
-			<sf:commandLink ajaxEnabled="false" value="Return to Main" action="changeSearch"/>
-			<h2>Hotel Results</h2>
-			<p>
-				<b>Search Criteria:</b> #{searchCriteria}<br/>
-				<sf:commandLink value="Edit Criteria" action="changeSearch"/>
-			</p>
-			<ui:fragment id="searchResultsFragment">
-				<div id="searchResults">
-					<h:outputText id="noHotelsTxt" value="No Hotels Found" rendered="#{hotels.rowCount==0}"/>
-					<h:dataTable id="hotels" styleClass="summary" value="#{hotels}" var="hotel" rendered="#{hotels.rowCount > 0}">
-						<h:column>
-							<f:facet name="header">Name</f:facet>
-							#{hotel.name}
-						</h:column>
-						<h:column>
-							<f:facet name="header">Address</f:facet>
-							#{hotel.address}
-						</h:column>
-						<h:column>
-							<f:facet name="header">City, State</f:facet>
-							#{hotel.city}, #{hotel.state}, #{hotel.country}
-						</h:column> 
-						<h:column>
-							<f:facet name="header">Zip</f:facet>
-							#{hotel.zip}
-						</h:column>
-						<h:column>
-							<f:facet name="header">Action</f:facet>
-							<!-- @TODO - THIS LINK DOES NOT WORK ON MYFACES 1.2.0 WHEN AJAX IS ENABLED BECAUSE THEY HAVE NOT IMPLEMENTED UIData.invokeOnComponent -->
-							<sf:commandLink id="viewHotelLink" value="View Hotel" action="selectHotel"/>
-						</h:column>
-					</h:dataTable>
-					<div class="next">
-						<sf:commandLink id="nextPageLink" value="More Results" action="next"
-							rendered="#{not empty hotels and hotels.rowCount == searchCriteria.pageSize}"/>
-					</div>
-					<div class="prev">
-						<sf:commandLink id="prevPageLink" value="Previous results" action="previous" 
-							rendered="#{searchCriteria.page > 0}"/>
-					</div>
-				</div>
-			</ui:fragment>
-	</div>
-</h:form>
-</ui:define>
-</ui:composition>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/hotelDetails.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/hotelDetails.xhtml
deleted file mode 100755
index 1f5228e2..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/hotelDetails.xhtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="http://java.sun.com/jsf/core"
-				template="/template.xhtml">
-
-<ui:define name="content">
-
-<div class="section">
-	<h2>View Hotel</h2>
-	<div class="field">
-		<div class="label">Name:</div>
-		<div class="output">#{hotel.name}</div>
-	</div>
-	<div class="field">
-		<div class="label">Address:</div>
-		<div class="output">#{hotel.address}</div>
-	</div>
-	<div class="field">
-		<div class="label">City:</div>
-		<div class="output">#{hotel.city}</div>
-	</div>
-	<div class="field">
-		<div class="label">State:</div>
-		<div class="output">#{hotel.state}</div>
-	</div>
-	<div class="field">
-		<div class="label">Zip:</div>
-		<div class="output">#{hotel.zip}</div>
-	</div>
-	<div class="field">
-		<div class="label">Country:</div>
-		<div class="output">#{hotel.country}</div>
-	</div>
-    <div class="field">
-        <div class="label">Nightly rate:</div>
-        <div class="output">
-            <h:outputText value="#{hotel.price}">
-                <f:convertNumber type="currency" currencySymbol="$"/>
-            </h:outputText>
-        </div>
-    </div>
-</div>
-
-<div class="section">
-	<h:form id="hotel">
-	<fieldset class="buttonGroup">
-		<h:commandButton id="book" action="book" value="Book Hotel"/>
-		<h:commandButton id="cancel" action="cancel" value="Back to Search"/>
-	</fieldset>
-	</h:form>
-</div>
-</ui:define>
-
-</ui:composition>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main-beans.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main-beans.xml
deleted file mode 100755
index c7bcf493..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main-beans.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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">
-
-	<bean id="mainActions" class="org.springframework.webflow.samples.booking.flow.main.MainActions">
-		<constructor-arg ref="bookingService" />
-	</bean>
-	
-</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xhtml
deleted file mode 100755
index 6ecb6e9c..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-	  			xmlns:h="http://java.sun.com/jsf/html"
-	  			xmlns:f="http://java.sun.com/jsf/core"
-	  			xmlns:sf="http://www.springframework.org/tags/faces"
-				template="/template.xhtml">
-
-<ui:define name="content">
-	<ui:fragment id="hotelSearchFragment">
-		<div id="hotelSearch" class="section">
-		    <span class="errors">
-		       <h:messages globalOnly="true"/>
-		    </span>
-			<h2>Search Hotels</h2>
-
-					<h:form id="mainForm">
-						<br/>
-						<br/>
-						<fieldset>
-							<div class="searchGroup">
-								<div class="searchField">
-								<sf:clientTextValidator promptMessage="Search hotels by name, address, city or zip.">
-									<h:inputText id="searchString" value="#{flowScope.searchCriteria.searchString}" style="width: 165px; height: 15px;"/>
-								</sf:clientTextValidator>
-								</div>
-								<div class="searchSize">
-								   	<h:outputLabel for="pageSize">Maximum results:</h:outputLabel>
-								   	<h:selectOneMenu value="#{flowScope.searchCriteria.pageSize}" id="pageSize">
-										<f:selectItem itemLabel="5" itemValue="5"/>
-									    <f:selectItem itemLabel="10" itemValue="10"/>
-									    <f:selectItem itemLabel="20" itemValue="20"/>
-									</h:selectOneMenu>  
-						   		</div>
-								<div class="searchButton">
-									<sf:commandButton id="findHotels" value="Find Hotels" processIds="*" actionListener="#{searchCriteria.findHotelsListener}" action="findHotels"/>
-								</div>
-							</div>
-					    </fieldset>
-					</h:form>
-			  
-		</div>
-	</ui:fragment>
-
-	<ui:fragment id="bookingsSection">
-		<div class="section">
-			<h:form id="bookingsForm">
-				<h2>Current Hotel Bookings</h2>
-				
-				<h:outputText value="No Bookings Found" rendered="#{bookings.rowCount == 0}"/>
-				<h:dataTable id="bookings" styleClass="summary" value="#{bookings}" var="booking" rendered="#{bookings.rowCount > 0}">
-					<h:column>
-						<f:facet name="header">Name</f:facet>
-						#{booking.hotel.name}
-					</h:column>
-					<h:column>
-						<f:facet name="header">Address</f:facet>
-						#{booking.hotel.address}
-					</h:column>
-					<h:column>
-						<f:facet name="header">City, State</f:facet>
-						#{booking.hotel.city}, #{booking.hotel.state}
-					</h:column>
-			        <h:column>
-			            <f:facet name="header">Check in date</f:facet>
-			            <h:outputText value="#{booking.checkinDate}"/>
-			        </h:column>
-			        <h:column>
-			            <f:facet name="header">Check out date</f:facet>
-			            <h:outputText value="#{booking.checkoutDate}"/>
-			        </h:column>
-					<h:column>
-						<f:facet name="header">Confirmation number</f:facet>
-						#{booking.id}
-					</h:column>
-					<h:column>
-						<f:facet name="header">Action</f:facet>
-						<!-- @TODO - THIS LINK DOES NOT WORK ON MYFACES 1.2.0 WHEN AJAX IS ENABLED BECAUSE THEY HAVE NOT IMPLEMENTED UIData.invokeOnComponent -->			
-						<sf:commandLink id="cancel" value="Cancel" ajaxEnabled="false" processIds="bookingsSection" action="cancelBooking"/>
-					</h:column>
-				</h:dataTable>
-			</h:form>
-		</div>
-	</ui:fragment>
-</ui:define>
-
-</ui:composition>
\ No newline at end of file
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
deleted file mode 100755
index 76718c1c..00000000
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/main/main.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
-	
-	<attribute name="description" value="The main flow of the application that handles searching for hotels to book"/>
-	
-	<var name="searchCriteria" class="org.springframework.webflow.samples.booking.flow.main.SearchCriteria" scope="flow" />
-	
-	<start-actions>
-		<action method="initCurrentUser" bean="mainActions" />
-		<bean-action bean="bookingService" method="findBookings">
-			<method-arguments>
-				<argument expression="#{user.username}"/>
-			</method-arguments>
-			<method-result name="#{flowScope.bookings}" type="selectOneDataModel"/>
-		</bean-action>
-		<!-- <evaluate-action expression="#{bookingService.findBookings(user.username)}" result="#{flowScope.bookings}" 
-			type="selectOneDataModel"/> -->
-	</start-actions>
-	
-	<start-state idref="displayMain"/>
-	
-	<view-state id="displayMain" view="main.xhtml">
-		<transition on="findHotels" to="findHotels" />
-		<transition on="cancelBooking" to="cancelBooking" />
-	</view-state>
-	
-	<view-state id="findHotels" view="displayHotels.xhtml">
-		<render-actions>
-			<bean-action bean="bookingService" method="findHotels">
-				<method-arguments>
-					<argument expression="#{searchCriteria.searchString}"/>
-					<argument expression="#{searchCriteria.pageSize}"/>
-					<argument expression="#{searchCriteria.page}"/>
-				</method-arguments>
-				<method-result name="#{flowScope.hotels}" type="selectOneDataModel"/>
-			</bean-action>
-			<!-- <evaluate-action expression="#{bookingService.findHotels(searchCriteria.searchString, searchCriteria.pageSize, searchCriteria.page)}"
-				result="#{flowScope.hotels}" type="selectOneDataModel"/> -->
-		</render-actions>
-		<transition on="previous" to="findHotels">
-			<evaluate-action expression="#{searchCriteria.prevPage()}"/>
-			<set attribute="#{flashScope.renderIds}" value="searchResultsFragment"/>
-		</transition>
-		<transition on="next" to="findHotels">
-			<evaluate-action expression="#{searchCriteria.nextPage()}"/>
-			<set attribute="#{flashScope.renderIds}" value="searchResultsFragment"/>
-		</transition>
-		<transition on="selectHotel" to="displayHotel"/>
-		<transition on="changeSearch" to="editSearchPopup"/>
-	</view-state>
-	
-	<view-state id="editSearchPopup" view="main.xhtml">
-		<attribute name="modal" value="true" type="java.lang.Boolean"/>
-		<entry-actions>
-			<set attribute="#{flashScope.renderIds}" value="hotelSearchFragment"/>
-		</entry-actions>
-		<transition on="findHotels" to="findHotels" />
-	</view-state>
-	
-	<view-state id="displayHotel" view="hotelDetails.xhtml">
-		<render-actions>
-			<set attribute="#{hotel}" value="#{hotels.selectedRow}" scope="request"/>
-		</render-actions>
-		<transition on="book" to="bookHotel" />
-		<transition on="cancel" to="displayMain" />
-	</view-state>
-	
-	<subflow-state id="bookHotel" flow="booking">
-		<attribute-mapper>
-			<input-mapper>
-				<mapping source="#{hotels.selectedRow.id}" target="#{id}"/>
-			</input-mapper>
-		</attribute-mapper>
-		<transition on="bookingAuthorized" to="reloadCurrentUserBookings" />
-		<transition on="cancel" to="displayMain" />
-	</subflow-state>
-	
-	<action-state id="cancelBooking">
-		<bean-action method="cancelBooking" bean="bookingService">
-			<method-arguments>
-				<argument expression="#{bookings.selectedRow.id}" parameter-type="long"/>
-			</method-arguments>
-		</bean-action>
-		<transition on="success" to="reloadCurrentUserBookings" />
-	</action-state>
-	
-	<action-state id="reloadCurrentUserBookings">
-		<bean-action bean="bookingService" method="findBookings">
-			<method-arguments>
-				<argument expression="#{user.username}"/>
-			</method-arguments>
-			<method-result name="#{flowScope.bookings}" type="selectOneDataModel"/>
-		</bean-action>
-		<!-- <evaluate-action expression="#{bookingService.findBookings(user.username)}" result="#{flowScope.bookings}" 
-			type="selectOneDataModel"/> -->
-		<transition on="success" to="displayMain" />
-	</action-state>
-	
-	<import resource="main-beans.xml"/>
-
-</flow>
\ No newline at end of file