From 18b0fde44aabb9b8cca8c930a1ac782f27c8b5ea Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Thu, 27 Mar 2008 15:27:14 +0000
Subject: [PATCH] Clean up.

---
 .../main/webapp/WEB-INF/faces-config.pageflow |  4 +-
 .../src/main/webapp/WEB-INF/faces-config.xml  | 44 +++++++++++++------
 .../src/main/webapp/main/reviewHotel.xhtml    |  7 ++-
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow b/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
index fb45bbcd..b18dfd6c 100644
--- a/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
+++ b/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pageflow:Pageflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf12064681529860" configfile="/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml">
   <nodes xsi:type="pageflow:PFPage" name="*" id="pf12064726747627" outlinks="pf120647423764116 pf120647433267418 pf12065417489470 pf12065437582792 pf12065438084374 pf12065438433186 pf12065713044628 pf12065730907119" path="*"/>
-  <nodes xsi:type="pageflow:PFPage" name="main/reviewHotels.xhtml" id="pf120647423764117" referenceLink="//@navigationRule.0/@navigationCase.2/@toViewId|" inlinks="pf120647423764116" path="/main/reviewHotels.xhtml"/>
+  <nodes xsi:type="pageflow:PFPage" name="main/reviewHotels.xhtml" id="pf120647423764117" referenceLink="//@navigationRule.0/@navigationCase.1/@toViewId|" inlinks="pf120647423764116" path="/main/reviewHotels.xhtml"/>
   <nodes xsi:type="pageflow:PFPage" name="main/enterSearchCriteria.xhtml" id="pf120647433267419" referenceLink="//@navigationRule.0/@navigationCase.6/@toViewId|" inlinks="pf120647433267418 pf12065437582792 pf12065730907119" path="/main/enterSearchCriteria.xhtml"/>
   <nodes xsi:type="pageflow:PFPage" name="main/reviewHotel.xhtml" id="pf12065417489561" referenceLink="//@navigationRule.0/@navigationCase.2/@toViewId|" inlinks="pf12065417489470" path="/main/reviewHotel.xhtml"/>
-  <nodes xsi:type="pageflow:PFPage" name="booking/reviewBooking.xhtml" id="pf12065438084375" referenceLink="//@navigationRule.0/@navigationCase.5/@toViewId|" inlinks="pf12065438084374" path="/booking/reviewBooking.xhtml"/>
+  <nodes xsi:type="pageflow:PFPage" name="booking/reviewBooking.xhtml" id="pf12065438084375" referenceLink="//@navigationRule.0/@navigationCase.7/@toViewId|" inlinks="pf12065438084374" path="/booking/reviewBooking.xhtml"/>
   <nodes xsi:type="pageflow:PFPage" name="booking/enterBookingDetails.xhtml" id="pf12065438433197" referenceLink="//@navigationRule.0/@navigationCase.4/@toViewId|" inlinks="pf12065438433186 pf12065713044628" path="/booking/enterBookingDetails.xhtml"/>
   <links id="pf120647423764116" target="pf120647423764117" source="pf12064726747627" outcome="reviewHotels"/>
   <links id="pf120647433267418" target="pf120647433267419" source="pf12064726747627" outcome="changeSearch"/>
diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml
index 6d4df42b..4fb12bd8 100644
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml
@@ -55,45 +55,61 @@
 	</managed-bean>
 	
 	<navigation-rule>
-	
+		<from-view-id>/main/reviewHotels.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>changeSearch</from-outcome>
 			<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>select</from-outcome>
+			<to-view-id>/main/reviewHotel.xhtml</to-view-id>
+		</navigation-case>
+	 </navigation-rule>
+	 
+	 <navigation-rule>
 		
+		<from-view-id>/main/enterSearchCriteria.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>reviewHotels</from-outcome>
 			<to-view-id>/main/reviewHotels.xhtml</to-view-id>
 		</navigation-case>
 		
-		<navigation-case>
-			<from-outcome>select</from-outcome>
-			<to-view-id>/main/reviewHotel.xhtml</to-view-id>
-		</navigation-case>
+	</navigation-rule>
+	
+	<navigation-rule>
 		
+		<from-view-id>/main/reviewHotel.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>book</from-outcome>
 			<to-view-id>/booking/enterBookingDetails.xhtml</to-view-id>
 		</navigation-case>
 		
+	</navigation-rule>
+	
+	<navigation-rule>
+		<from-view-id>/booking/enterBookingDetails.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>reviewBooking</from-outcome>
+			<to-view-id>/booking/reviewBooking.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	
+	<navigation-rule>
+		<from-view-id>/booking/reviewBooking.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>revise</from-outcome>
 			<to-view-id>/booking/enterBookingDetails.xhtml</to-view-id>
 		</navigation-case>
-		
-		<navigation-case>
-			<from-outcome>cancel</from-outcome>
-			<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
-		</navigation-case>
-		
 		<navigation-case>
 			<from-outcome>confirm</from-outcome>
 			<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
 		</navigation-case>
-		
+	</navigation-rule>
+	
+	<navigation-rule>
 		<navigation-case>
-			<from-outcome>reviewBooking</from-outcome>
-			<to-view-id>/booking/reviewBooking.xhtml</to-view-id>
+			<from-outcome>cancel</from-outcome>
+			<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	
diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml
index 5928e67a..43bb951c 100644
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml
@@ -2,8 +2,7 @@
 <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:f="http://java.sun.com/jsf/core"	  			
 				template="/WEB-INF/layouts/standard.xhtml">
 
 <ui:define name="content">
@@ -47,8 +46,8 @@
 <div class="section">
 	<h:form id="hotel">
 	<fieldset class="buttonGroup">
-		<h:commandButton id="book" ajaxEnabled="false" action="book" value="Book Hotel"/>&#160;
-		<h:commandButton id="cancel" ajaxEnabled="false" action="cancel" value="Back to Search"/>
+		<h:commandButton id="book" action="book" value="Book Hotel"/>&#160;
+		<h:commandButton id="cancel" action="cancel" value="Back to Search"/>
 	</fieldset>
 	<h:inputText id="hotelId" value="#{hotelController.hotelId}" style="visibility:hidden"/>
 	</h:form>