Committing plain JSF+Spring sample

2008-03-27 13:34:14 +00:00
parent 6380f210a0
commit 494c0ae237
63 changed files with 3209 additions and 0 deletions
--- a/spring-webflow-samples/jsf-booking/.classpath
+++ b/spring-webflow-samples/jsf-booking/.classpath
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="var" path="IVY_CACHE/com.sun.facelets/jsf-facelets/jsf-facelets-1.1.14.jar" sourcepath="IVY_CACHE/com.sun.facelets/jsf-facelets/jsf-facelets-sources-1.1.14.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/edu.oswego.cs/concurrent/concurrent-1.3.4.jar" sourcepath="IVY_CACHE/edu.oswego.cs/concurrent/concurrent-sources-1.3.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.persistence/persistence-api/persistence-api-1.0.0.jar" sourcepath="IVY_CACHE/javax.persistence/persistence-api/persistence-api-sources-1.0.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/jstl/jstl-1.1.2.jar" sourcepath="IVY_CACHE/javax.servlet/jstl/jstl-1.1.2-sources.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/javax.transaction/jta/jta-1.1.0.jar" sourcepath="IVY_CACHE/javax.transaction/jta/jta-sources-1.1.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-2.1.3.jar" sourcepath="IVY_CACHE/net.sf.cglib/cglib_nodep/cglib_nodep-sources-2.1.3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.antlr/antlr/antlr-2.7.6.jar" sourcepath="IVY_CACHE/org.antlr/antlr/antlr-sources-2.7.6.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-1.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-1.7.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-beanutils/commons-beanutils-sources-1.7.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache/commons-codec/commons-codec-1.3.jar" sourcepath="/IVY_CACHE/org.apache/commons-codec/commons-codec-sources-1.3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-collections/commons-collections-3.2.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-collections/commons-collections-sources-3.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-digester/commons-digester-1.8.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-digester/commons-digester-sources-1.8.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/commons-discovery/commons-discovery-0.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/commons-discovery/commons-discovery-sources-0.4.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.logging/log4j/log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.logging/log4j/log4j-sources-1.2.15.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.myfaces.core/myfaces-api/myfaces-api-1.2.2.jar" sourcepath="IVY_CACHE/org.apache.myfaces.core/myfaces-api/myfaces-api-sources-1.2.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.myfaces.core/myfaces-impl/myfaces-impl-1.2.2.jar" sourcepath="IVY_CACHE/org.apache.myfaces.core/myfaces-impl/myfaces-impl-sources-1.2.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/standard/standard-1.1.2.jar" sourcepath="IVY_CACHE/org.apache.taglibs/standard/standard-sources-1.1.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.dom4j/dom4j/dom4j-1.6.1.jar" sourcepath="IVY_CACHE/org.dom4j/dom4j/dom4j-sources-1.6.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate/hibernate-3.2.5.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate/hibernate-sources-3.2.5.ga.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-commons-annotations/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-commons-annotations/hibernate-commons-annotations-sources-3.3.0.ga.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-annotations/hibernate-annotations-3.3.0.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-annotations/hibernate-annotations-sources-3.3.0.ga.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/hibernate-entitymanager/hibernate-entitymanager-3.3.1.ga.jar" sourcepath="IVY_CACHE/org.hibernate/hibernate-entitymanager/hibernate-entitymanager-sources-3.3.1.ga.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-1.8.0.9.jar" sourcepath="IVY_CACHE/org.hsqldb/hsqldb/hsqldb-sources-1.8.0.9.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss/javassist/javassist-3.3.ga.jar" sourcepath="IVY_CACHE/org.jboss/javassist/javassist-sources-3.3.ga.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss/jboss-common-core/jboss-common-core-2.0.4.GA.jar" sourcepath="IVY_CACHE/org.jboss/jboss-common-core/jboss-common-core-sources-2.0.4.GA.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-2.0.0.GA.jar" sourcepath="IVY_CACHE/org.jboss.seam/jboss-el/jboss-el-sources-2.0.0.GA.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-aop/spring-aop-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-jdbc/spring-jdbc-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-orm/spring-orm-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-orm/spring-orm-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-tx/spring-tx-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-tx/spring-tx-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-web/spring-web-2.5.2.jar" sourcepath="IVY_CACHE/org.springframework/spring-web/spring-web-sources-2.5.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
--- 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
@@ -0,0 +1,17 @@
+<?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/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/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"/>
+  <links id="pf12065417489470" target="pf12065417489561" source="pf12064726747627" outcome="select"/>
+  <links id="pf12065437582792" target="pf120647433267419" source="pf12064726747627" outcome="cancel"/>
+  <links id="pf12065438084374" target="pf12065438084375" source="pf12064726747627" outcome="reviewBooking"/>
+  <links id="pf12065438433186" target="pf12065438433197" source="pf12064726747627" outcome="book"/>
+  <links id="pf12065713044628" target="pf12065438433197" source="pf12064726747627" outcome="revise"/>
+  <links id="pf12065730907119" target="pf120647433267419" source="pf12064726747627" outcome="confirm"/>
+</pageflow:Pageflow>
--- a/spring-webflow-samples/jsf-booking/.project
+++ b/spring-webflow-samples/jsf-booking/.project
@@ -0,0 +1,30 @@
+<projectDescription>
+  <name>jsf-booking</name>
+  <comment>Spring Web Flow Number Guess JSF Example</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.common.project.facet.core.builder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.springframework.ide.eclipse.core.springbuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.hibernate.eclipse.console.hibernateBuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.springframework.ide.eclipse.core.springnature</nature>
+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+    <nature>org.hibernate.eclipse.console.hibernateNature</nature>
+  </natures>
+</projectDescription>
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.ui.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,53 @@
+#Thu Aug 09 13:12:30 EDT 2007
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Spring Java Conventions
+formatter_settings_version=11
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jpt.core.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jpt.core.prefs
@@ -0,0 +1,5 @@
+#Thu Aug 09 13:12:30 EDT 2007
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jpt.core.discoverAnnotatedClasses=true
+org.eclipse.jpt.core.platform=generic
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jst.common.project.facet.core.prefs
@@ -0,0 +1,5 @@
+#Thu Aug 09 13:12:30 EDT 2007
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="jsf-booking">
+<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+<wb-resource deploy-path="/WEB-INF/lib" source-path="/lib/global"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+<property name="java-output-path" value="target/classes"/>
+<property name="context-root" value="/swf-booking-faces"/>
+</wb-module>
+</project-modules>
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="jst.java"/>
+  <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.java" version="5.0"/>
+  <installed facet="jst.jsf" version="1.1"/>
+</faceted-project>
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,7 @@
+#Thu Aug 09 13:12:30 EDT 2007
+DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
--- a/spring-webflow-samples/jsf-booking/.settings/org.hibernate.eclipse.console.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.hibernate.eclipse.console.prefs
@@ -0,0 +1,5 @@
+#Thu Aug 09 13:12:30 EDT 2007
+default.configuration=jsf-booking
+eclipse.preferences.version=1
+hibernate3.enabled=true
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
--- a/spring-webflow-samples/jsf-booking/.settings/org.springframework.ide.eclipse.core.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.springframework.ide.eclipse.core.prefs
@@ -0,0 +1,42 @@
+#Wed Feb 27 11:35:00 EST 2008
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
+org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=true
+org.springframework.ide.eclipse.core.enable.project.preferences=false
+org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
--- a/spring-webflow-samples/jsf-booking/.springBeans
+++ b/spring-webflow-samples/jsf-booking/.springBeans
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/main/webapp/WEB-INF/web-application-config.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
--- a/spring-webflow-samples/jsf-booking/build.xml
+++ b/spring-webflow-samples/jsf-booking/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="swf-booking-faces">
+
+	<property name="source.version" value="1.5"/>
+	<property name="ivy.cache.dir" value="${basedir}/../../ivy-cache"/>
+	<property name="integration.repo.dir" value="${basedir}/../../integration-repo"/>
+	<property file="${basedir}/../../build.properties"/>
+	<import file="${basedir}/../../spring-build/war/default.xml"/>
+
+</project>
--- a/spring-webflow-samples/jsf-booking/ivy.xml
+++ b/spring-webflow-samples/jsf-booking/ivy.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.webflow.samples" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Keith Donald"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}" type="war" ext="war"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<!-- global dependencies -->
+		<dependency org="org.apache.logging" name="log4j" rev="1.2.15" conf="compile->default"/>
+		<dependency org="org.apache.taglibs" name="standard" rev="1.1.2" conf="compile->default"/>
+		<dependency org="javax.servlet" name="jstl" rev="1.1.2" conf="compile->default"/>
+		<dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.14" conf="compile->default"/>
+		<dependency org="org.aopalliance" name="aopalliance" rev="1.0" conf="compile->default"/>
+		<dependency org="org.springframework.webflow" name="spring-faces" rev="latest.integration" conf="compile->jsf12"/>
+		<dependency org="org.springframework.webflow" name="spring-webflow" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-jdbc" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.0.m2" conf="compile->default"/>
+		<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/>
+		<dependency org="org.jboss.seam" name="jboss-el" rev="2.0.0.GA" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.5.ga" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.3.0.ga" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="compile->default"/>
+		<dependency org="net.sf.cglib" name="cglib_nodep" rev="2.1.3" conf="compile->default"/>
+		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
+		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
+		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile->default"/>
+
+		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
+		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
+		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
+
+		<!-- build-time only dependencies -->
+		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
+		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>
+
+		<!-- test-time only dependencies -->
+		<dependency org="org.junit" name="junit" rev="3.8.2" conf="test->default"/>
+		<dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="test->default"/>
+	</dependencies>
+
+</ivy-module>
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2004-2008 the original authorimport javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.faces.support;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * {@link PhaseListener} that logs the execution of the individual phases of the JSF lifecycle. Useful during JSF
+ * application development in order to detect unreported JSF errors that cause the lifecycle to short-circuit. Turn
+ * logging level to DEBUG to see its output.
+ * 
+ * @author Jeremy Grelle
+ */
+public class RequestLoggingPhaseListener implements PhaseListener {
+
+	private Log logger = LogFactory.getLog(RequestLoggingPhaseListener.class);
+
+	public void afterPhase(PhaseEvent event) {
+		// no-op
+	}
+
+	public void beforePhase(PhaseEvent event) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Entering JSF Phase: " + event.getPhaseId());
+		}
+	}
+
+	public PhaseId getPhaseId() {
+		return PhaseId.ANY_PHASE;
+	}
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Booking.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Booking.java
@@ -0,0 +1,179 @@
+package org.springframework.webflow.samples.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+/**
+ * A Hotel Booking made by a User.
+ */
+@Entity
+public class Booking implements Serializable {
+
+    private static final long serialVersionUID = 1171567558348174963L;
+
+    private Long id;
+
+    private User user;
+
+    private Hotel hotel;
+
+    private Date checkinDate;
+
+    private Date checkoutDate;
+
+    private String creditCard;
+
+    private String creditCardName;
+
+    private int creditCardExpiryMonth;
+
+    private int creditCardExpiryYear;
+
+    private boolean smoking;
+
+    private int beds;
+
+    public Booking() {
+    }
+
+    public Booking(Hotel hotel, User user) {
+	this.hotel = hotel;
+	this.user = user;
+	Calendar calendar = Calendar.getInstance();
+	setCheckinDate(calendar.getTime());
+	calendar.add(Calendar.DAY_OF_MONTH, 1);
+	setCheckoutDate(calendar.getTime());
+    }
+
+    @Transient
+    public BigDecimal getTotal() {
+	return hotel.getPrice().multiply(new BigDecimal(getNights()));
+    }
+
+    @Transient
+    public int getNights() {
+	return (int) (checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.TABLE)
+    public Long getId() {
+	return id;
+    }
+
+    public void setId(Long id) {
+	this.id = id;
+    }
+
+    @Basic
+    @Temporal(TemporalType.DATE)
+    public Date getCheckinDate() {
+	return checkinDate;
+    }
+
+    public void setCheckinDate(Date datetime) {
+	this.checkinDate = datetime;
+    }
+
+    @ManyToOne
+    public Hotel getHotel() {
+	return hotel;
+    }
+
+    public void setHotel(Hotel hotel) {
+	this.hotel = hotel;
+    }
+
+    @ManyToOne
+    public User getUser() {
+	return user;
+    }
+
+    public void setUser(User user) {
+	this.user = user;
+    }
+
+    @Basic
+    @Temporal(TemporalType.DATE)
+    public Date getCheckoutDate() {
+	return checkoutDate;
+    }
+
+    public void setCheckoutDate(Date checkoutDate) {
+	this.checkoutDate = checkoutDate;
+    }
+
+    public String getCreditCard() {
+	return creditCard;
+    }
+
+    public void setCreditCard(String creditCard) {
+	this.creditCard = creditCard;
+    }
+
+    @Transient
+    public String getDescription() {
+	DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
+	return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to "
+		+ df.format(getCheckoutDate());
+    }
+
+    public boolean isSmoking() {
+	return smoking;
+    }
+
+    public void setSmoking(boolean smoking) {
+	this.smoking = smoking;
+    }
+
+    public int getBeds() {
+	return beds;
+    }
+
+    public void setBeds(int beds) {
+	this.beds = beds;
+    }
+
+    public String getCreditCardName() {
+	return creditCardName;
+    }
+
+    public void setCreditCardName(String creditCardName) {
+	this.creditCardName = creditCardName;
+    }
+
+    public int getCreditCardExpiryMonth() {
+	return creditCardExpiryMonth;
+    }
+
+    public void setCreditCardExpiryMonth(int creditCardExpiryMonth) {
+	this.creditCardExpiryMonth = creditCardExpiryMonth;
+    }
+
+    public int getCreditCardExpiryYear() {
+	return creditCardExpiryYear;
+    }
+
+    public void setCreditCardExpiryYear(int creditCardExpiryYear) {
+	this.creditCardExpiryYear = creditCardExpiryYear;
+    }
+
+    @Override
+    public String toString() {
+	return "Booking(" + user + "," + hotel + ")";
+    }
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingController.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingController.java
@@ -0,0 +1,87 @@
+package org.springframework.webflow.samples.booking;
+
+import java.util.Calendar;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+public class BookingController {
+
+    private static final String REVIEW_BOOKING_OUTCOME = "reviewBooking";
+
+    private BookingService bookingService;
+
+    private Long hotelId;
+
+    private Hotel hotel = new Hotel();
+
+    private Booking booking = new Booking(hotel, new User());
+
+    private boolean initialized = false;
+
+    public String processBooking() {
+	FacesContext context = FacesContext.getCurrentInstance();
+	Calendar calendar = Calendar.getInstance();
+	calendar.add(Calendar.DAY_OF_MONTH, -1);
+	boolean valid = true;
+	if (booking.getCheckinDate().before(calendar.getTime())) {
+	    context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR,
+		    "Check in date must be a future date.", "Check in date must be a future date."));
+	    valid = false;
+	} else if (!booking.getCheckinDate().before(booking.getCheckoutDate())) {
+	    context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR,
+		    "Check out date must be later than check in date",
+		    "Check out date must be later than check in date"));
+	    valid = false;
+	}
+	if (valid) {
+	    return REVIEW_BOOKING_OUTCOME;
+	} else {
+	    return null;
+	}
+    }
+
+    public String confirm() {
+	bookingService.saveBooking(booking);
+	FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove("booking");
+	return "confirm";
+    }
+
+    public String cancel() {
+	FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove("booking");
+	return "cancel";
+    }
+
+    public Long getHotelId() {
+	return hotelId;
+    }
+
+    public void setHotelId(Long hotelId) {
+	if (hotelId != null && hotelId != 0 && !initialized) {
+	    booking = bookingService.createBooking(hotelId, "jeremy");
+	    FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put("booking", booking);
+	    initialized = true;
+	}
+	this.hotelId = hotelId;
+    }
+
+    public Hotel getHotel() {
+	return hotel;
+    }
+
+    public void setHotel(Hotel hotel) {
+	this.hotel = hotel;
+    }
+
+    public Booking getBooking() {
+	return booking;
+    }
+
+    public void setBooking(Booking booking) {
+	this.booking = booking;
+    }
+
+    public void setBookingService(BookingService bookingService) {
+	this.bookingService = bookingService;
+    }
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
@@ -0,0 +1,52 @@
+package org.springframework.webflow.samples.booking;
+
+import java.util.List;
+
+/**
+ * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel
+ * a booking.
+ */
+public interface BookingService {
+
+    /**
+     * Find bookings made by the given user
+     * @param username the user's name
+     * @return their bookings
+     */
+    public List<Booking> findBookings(String username);
+
+    /**
+     * Find hotels available for booking by some criteria.
+     * @param criteria the search criteria
+     * @return a list of hotels meeting the criteria
+     */
+    public List<Hotel> findHotels(SearchCriteria criteria);
+
+    /**
+     * Find hotels by their identifier.
+     * @param id the hotel id
+     * @return the hotel
+     */
+    public Hotel findHotelById(Long id);
+
+    /**
+     * Create a new, transient hotel booking instance for the given user.
+     * @param hotelId the hotelId
+     * @param userName the user name
+     * @return the new transient booking instance
+     */
+    public Booking createBooking(Long hotelId, String userName);
+
+    /**
+     * Cancel an existing booking.
+     * @param booking the booking to cancel
+     */
+    public void cancelBooking(Booking booking);
+
+    /**
+     * Save a new booking.
+     * @param booking the booking to save
+     */
+    public void saveBooking(Booking booking);
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
@@ -0,0 +1,110 @@
+package org.springframework.webflow.samples.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * A hotel where users may book stays.
+ */
+@Entity
+public class Hotel implements Serializable {
+
+    private static final long serialVersionUID = 4011346719502656269L;
+
+    private Long id;
+
+    private String name;
+
+    private String address;
+
+    private String city;
+
+    private String state;
+
+    private String zip;
+
+    private String country;
+
+    private BigDecimal price;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+	return id;
+    }
+
+    public void setId(Long id) {
+	this.id = id;
+    }
+
+    public String getName() {
+	return name;
+    }
+
+    public void setName(String name) {
+	this.name = name;
+    }
+
+    public String getAddress() {
+	return address;
+    }
+
+    public void setAddress(String address) {
+	this.address = address;
+    }
+
+    public String getCity() {
+	return city;
+    }
+
+    public void setCity(String city) {
+	this.city = city;
+    }
+
+    public String getZip() {
+	return zip;
+    }
+
+    public void setZip(String zip) {
+	this.zip = zip;
+    }
+
+    public String getState() {
+	return state;
+    }
+
+    public void setState(String state) {
+	this.state = state;
+    }
+
+    public String getCountry() {
+	return country;
+    }
+
+    public void setCountry(String country) {
+	this.country = country;
+    }
+
+    @Column(precision = 6, scale = 2)
+    public BigDecimal getPrice() {
+	return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+	this.price = price;
+    }
+
+    public Booking createBooking(User user) {
+	return new Booking(this, user);
+    }
+
+    @Override
+    public String toString() {
+	return "Hotel(" + name + "," + address + "," + city + "," + zip + ")";
+    }
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/HotelController.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/HotelController.java
@@ -0,0 +1,29 @@
+package org.springframework.webflow.samples.booking;
+
+public class HotelController {
+
+    private BookingService bookingService;
+
+    private Long hotelId;
+
+    private Hotel hotel;
+
+    public Hotel getHotel() {
+	if (hotel == null && hotelId != null) {
+	    hotel = bookingService.findHotelById(hotelId);
+	}
+	return hotel;
+    }
+
+    public void setBookingService(BookingService bookingService) {
+	this.bookingService = bookingService;
+    }
+
+    public void setHotelId(Long hotelId) {
+	this.hotelId = hotelId;
+    }
+
+    public Long getHotelId() {
+	return hotelId;
+    }
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
@@ -0,0 +1,92 @@
+package org.springframework.webflow.samples.booking;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+/**
+ * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls
+ * against the backing repository. The EntityManager reference is provided by the managing container (Spring)
+ * automatically.
+ */
+@Service("bookingService")
+@Repository
+public class JpaBookingService implements BookingService {
+
+    private EntityManager em;
+
+    @PersistenceContext
+    public void setEntityManager(EntityManager em) {
+	this.em = em;
+    }
+
+    @Transactional(readOnly = true)
+    @SuppressWarnings("unchecked")
+    public List<Booking> findBookings(String username) {
+	if (username != null) {
+	    return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate")
+		    .setParameter("username", username).getResultList();
+	} else {
+	    return null;
+	}
+    }
+
+    @Transactional(readOnly = true)
+    @SuppressWarnings("unchecked")
+    public List<Hotel> findHotels(SearchCriteria criteria) {
+	String pattern = getSearchPattern(criteria);
+	return em.createQuery(
+		"select h from Hotel h where lower(h.name) like " + pattern + " or lower(h.city) like " + pattern
+			+ " or lower(h.zip) like " + pattern + " or lower(h.address) like " + pattern).setMaxResults(
+		criteria.getPageSize()).setFirstResult(criteria.getPage() * criteria.getPageSize()).getResultList();
+    }
+
+    @Transactional(readOnly = true)
+    public Hotel findHotelById(Long id) {
+	return em.find(Hotel.class, id);
+    }
+
+    @Transactional(readOnly = true)
+    public Booking createBooking(Long hotelId, String username) {
+	Hotel hotel = em.find(Hotel.class, hotelId);
+	User user = findUser(username);
+	return new Booking(hotel, user);
+    }
+
+    // read-write transactional methods
+    @Transactional
+    public void cancelBooking(Booking booking) {
+	booking = em.find(Booking.class, booking.getId());
+	if (booking != null) {
+	    em.remove(booking);
+	}
+    }
+
+    // read-write transactional methods
+    @Transactional
+    public void saveBooking(Booking booking) {
+	em.persist(booking);
+    }
+
+    // helpers
+
+    private String getSearchPattern(SearchCriteria criteria) {
+	if (StringUtils.hasText(criteria.getSearchString())) {
+	    return "'%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%'";
+	} else {
+	    return "'%'";
+	}
+    }
+
+    private User findUser(String username) {
+	return (User) em.createQuery("select u from User u where u.username = :username").setParameter("username",
+		username).getSingleResult();
+    }
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java
@@ -0,0 +1,83 @@
+package org.springframework.webflow.samples.booking;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.model.SelectItem;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReferenceData {
+
+    private List<SelectItem> bedOptions;
+
+    private List<SelectItem> smokingOptions;
+
+    private List<SelectItem> creditCardExpMonths;
+
+    private List<SelectItem> creditCardExpYears;
+
+    private List<SelectItem> pageSizeOptions;
+
+    public List<SelectItem> getBedOptions() {
+	if (bedOptions == null) {
+	    bedOptions = new ArrayList<SelectItem>();
+	    bedOptions.add(new SelectItem(new Integer(1), "One king-size bed"));
+	    bedOptions.add(new SelectItem(new Integer(2), "Two double beds"));
+	    bedOptions.add(new SelectItem(new Integer(3), "Three beds"));
+	}
+	return bedOptions;
+    }
+
+    public List<SelectItem> getSmokingOptions() {
+	if (smokingOptions == null) {
+	    smokingOptions = new ArrayList<SelectItem>();
+	    smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking"));
+	    smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking"));
+	}
+	return smokingOptions;
+    }
+
+    public List<SelectItem> getCreditCardExpMonths() {
+	if (creditCardExpMonths == null) {
+	    creditCardExpMonths = new ArrayList<SelectItem>();
+	    creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(5), "May"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov"));
+	    creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec"));
+	}
+	return creditCardExpMonths;
+    }
+
+    public List<SelectItem> getCreditCardExpYears() {
+	if (creditCardExpYears == null) {
+	    creditCardExpYears = new ArrayList<SelectItem>();
+	    creditCardExpYears.add(new SelectItem(new Integer(2008), "2008"));
+	    creditCardExpYears.add(new SelectItem(new Integer(2009), "2009"));
+	    creditCardExpYears.add(new SelectItem(new Integer(2010), "2010"));
+	    creditCardExpYears.add(new SelectItem(new Integer(2010), "2011"));
+	    creditCardExpYears.add(new SelectItem(new Integer(2010), "2012"));
+	}
+	return creditCardExpYears;
+    }
+
+    public List<SelectItem> getPageSizeOptions() {
+	if (pageSizeOptions == null) {
+	    pageSizeOptions = new ArrayList<SelectItem>();
+	    pageSizeOptions.add(new SelectItem(new Integer(5), "5"));
+	    pageSizeOptions.add(new SelectItem(new Integer(10), "10"));
+	    pageSizeOptions.add(new SelectItem(new Integer(20), "20"));
+	}
+	return pageSizeOptions;
+    }
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchController.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchController.java
@@ -0,0 +1,65 @@
+package org.springframework.webflow.samples.booking;
+
+import java.util.List;
+
+import javax.faces.event.ActionEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+
+public class SearchController {
+
+    private BookingService bookingService;
+
+    private SearchCriteria searchCriteria = new SearchCriteria();
+
+    private DataModel hotels = null;
+
+    private DataModel bookings = null;
+
+    public String search() {
+	searchCriteria.resetPage();
+	executeSearch();
+	return "reviewHotels";
+    }
+
+    public void nextListener(ActionEvent event) {
+	searchCriteria.nextPage();
+	executeSearch();
+    }
+
+    public void prevListener(ActionEvent event) {
+	searchCriteria.previousPage();
+	executeSearch();
+    }
+
+    private void executeSearch() {
+	hotels = new ListDataModel();
+	hotels.setWrappedData(bookingService.findHotels(searchCriteria));
+    }
+
+    public SearchCriteria getSearchCriteria() {
+	return searchCriteria;
+    }
+
+    public void setBookingService(BookingService bookingService) {
+	this.bookingService = bookingService;
+    }
+
+    public DataModel getHotels() {
+	return hotels;
+    }
+
+    public DataModel getBookings() {
+	if (bookings == null) {
+	    bookings = new ListDataModel(bookingService.findBookings("jeremy"));
+	}
+	return bookings;
+    }
+
+    public void cancelBookingListener(ActionEvent event) {
+	Booking booking = (Booking) bookings.getRowData();
+	bookingService.cancelBooking(booking);
+	((List) bookings.getWrappedData()).remove(booking);
+    }
+
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
@@ -0,0 +1,66 @@
+package org.springframework.webflow.samples.booking;
+
+import java.io.Serializable;
+
+/**
+ * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search.
+ */
+public class SearchCriteria implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The user-provided search criteria for finding Hotels.
+     */
+    private String searchString = "";
+
+    /**
+     * The maximum page size of the Hotel result list
+     */
+    private int pageSize = 5;
+
+    /**
+     * The current page of the Hotel result list.
+     */
+    private int page;
+
+    public String getSearchString() {
+	return searchString;
+    }
+
+    public void setSearchString(String searchString) {
+	this.searchString = searchString;
+    }
+
+    public int getPageSize() {
+	return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+	this.pageSize = pageSize;
+    }
+
+    public int getPage() {
+	return page;
+    }
+
+    public void setPage(int page) {
+	this.page = page;
+    }
+
+    public void nextPage() {
+	page++;
+    }
+
+    public void previousPage() {
+	page--;
+    }
+
+    public void resetPage() {
+	page = 0;
+    }
+
+    public String toString() {
+	return "[Search Criteria searchString = '" + searchString + "'";
+    }
+}
--- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/User.java
+++ b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/User.java
@@ -0,0 +1,62 @@
+package org.springframework.webflow.samples.booking;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * A user who can book hotels.
+ */
+@Entity
+@Table(name = "Customer")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = -3652559447682574722L;
+
+    private String username;
+
+    private String password;
+
+    private String name;
+
+    public User() {
+    }
+
+    public User(String username, String password, String name) {
+	this.username = username;
+	this.password = password;
+	this.name = name;
+    }
+
+    @Id
+    public String getUsername() {
+	return username;
+    }
+
+    public void setUsername(String username) {
+	this.username = username;
+    }
+
+    public String getPassword() {
+	return password;
+    }
+
+    public void setPassword(String password) {
+	this.password = password;
+    }
+
+    public String getName() {
+	return name;
+    }
+
+    public void setName(String name) {
+	this.name = name;
+    }
+
+    @Override
+    public String toString() {
+	return "User(" + username + ")";
+    }
+}
--- a/spring-webflow-samples/jsf-booking/src/main/resources/META-INF/persistence.xml
+++ b/spring-webflow-samples/jsf-booking/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
+             version="1.0">
+   <persistence-unit name="bookingDatabase">
+      <provider>org.hibernate.ejb.HibernatePersistence</provider>
+      <class>org.springframework.webflow.samples.booking.User</class>
+      <class>org.springframework.webflow.samples.booking.Booking</class>
+      <class>org.springframework.webflow.samples.booking.Hotel</class>
+      <properties>
+      	 <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+      	 <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+         <property name="hibernate.show_sql" value="true"/>
+         <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+      </properties>
+   </persistence-unit>
+</persistence>
--- a/spring-webflow-samples/jsf-booking/src/main/resources/import.sql
+++ b/spring-webflow-samples/jsf-booking/src/main/resources/import.sql
@@ -0,0 +1,27 @@
+insert into Customer (username, name) values ('keith', 'Keith')
+insert into Customer (username, name) values ('erwin', 'Erwin')
+insert into Customer (username, name) values ('jeremy', 'Jeremy')
+insert into Customer (username, name) values ('scott', 'Scott')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade L<>opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meli<EFBFBD> White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA')
--- a/spring-webflow-samples/jsf-booking/src/main/resources/log4j.xml
+++ b/spring-webflow-samples/jsf-booking/src/main/resources/log4j.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+
+	<logger name="org.springframework.beans">
+		<level value="warn" />
+	</logger>
+	
+	<logger name="org.springframework.jdbc">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.transaction">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.orm">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.web">
+		<level value="debug" />
+	</logger>
+
+	<logger name="org.springframework.faces">
+		<level value="debug" />
+	</logger>
+	
+	<logger name="org.springframework.webflow">
+		<level value="debug" />
+	</logger>
+	
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/META-INF/MANIFEST.MF
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+# Enable web flow logging
+log4j.category.org.springframework.webflow=DEBUG
+log4j.category.org.springframework.faces=DEBUG
+log4j.category.org.springframework.binding=DEBUG
+log4j.category.org.springframework.transaction=DEBUG
--- 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
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+
+<faces-config>
+	<managed-bean>
+		<managed-bean-name>bookingController</managed-bean-name>
+		<managed-bean-class>org.springframework.webflow.samples.booking.BookingController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>searchController</managed-bean-name>
+		<managed-bean-class>org.springframework.webflow.samples.booking.SearchController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+		<managed-property>
+			<property-name>bookingService</property-name>
+			<value>#{bookingService}</value>
+		</managed-property>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>hotelController</managed-bean-name>
+		<managed-bean-class>org.springframework.webflow.samples.booking.HotelController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+		<managed-property>
+			<property-name>bookingService</property-name>
+			<value>#{bookingService}</value>
+		</managed-property>
+		<managed-property>
+			<property-name>hotelId</property-name>
+			<value>#{param.id}</value>
+		</managed-property>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>bookingController</managed-bean-name>
+		<managed-bean-class>org.springframework.webflow.samples.booking.BookingController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+		<managed-property>
+			<property-name>bookingService</property-name>
+			<value>#{bookingService}</value>
+		</managed-property>
+		<managed-property>
+			<property-name>hotelId</property-name>
+			<value>#{hotelController.hotelId}</value>
+		</managed-property>
+		<managed-property>
+			<property-name>booking</property-name>
+			<value>#{booking}</value>
+		</managed-property>
+	</managed-bean>
+	<managed-bean>
+		<managed-bean-name>searchCriteria</managed-bean-name>
+		<managed-bean-class>org.springframework.webflow.samples.booking.SearchCriteria</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+	
+	<navigation-rule>
+	
+		<navigation-case>
+			<from-outcome>changeSearch</from-outcome>
+			<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
+		</navigation-case>
+		
+		<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-case>
+			<from-outcome>book</from-outcome>
+			<to-view-id>/booking/enterBookingDetails.xhtml</to-view-id>
+		</navigation-case>
+		
+		<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-case>
+			<from-outcome>reviewBooking</from-outcome>
+			<to-view-id>/booking/reviewBooking.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	
+	<application>
+		<variable-resolver>org.springframework.web.jsf.SpringBeanVariableResolver</variable-resolver>
+		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>  
+	</application>
+	
+	<lifecycle>
+		<phase-listener>org.springframework.faces.support.RequestLoggingPhaseListener</phase-listener>
+	</lifecycle>
+</faces-config>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/layouts/standard.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/layouts/standard.xhtml
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:f="http://java.sun.com/jsf/core"
+	  xmlns:c="http://java.sun.com/jstl/core"
+	  xmlns:sf="http://www.springframework.org/tags/faces">
+<f:view contentType="text/html">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Spring Faces: Hotel Booking Sample Application</title>
+	
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/css-framework/css/tools.css" />
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/css-framework/css/typo.css" />
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/css-framework/css/forms.css" />
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/css-framework/css/layout-navtop-localleft.css" />
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/css-framework/css/layout.css" />
+	<link type="text/css" rel="stylesheet" href="${request.contextPath}/styles/booking.css" />
+	<ui:insert name="headIncludes"/>
+</head>
+<body class="tundra spring">
+<div id="page">
+	<div id="header" class="clearfix spring">
+		<div id="welcome">
+			<div class="left">Spring Travel: A Spring and JSF Reference Application</div>
+			<div class="right">
+				<c:if test="${currentUser.name != 'roleAnonymous'}">
+	            	Welcome, JSF Lover
+				</c:if>
+			</div>
+		</div>
+		<div id="branding" class="spring">
+			<a href="#{request.contextPath}"><img src="${request.contextPath}/images/header.jpg" alt="Spring Travel"/></a>
+		</div>
+	</div>
+	<div id="content" class="clearfix spring">
+		<div id="local" class="spring">
+			<a href="http://www.thespringexperience.com">
+				<img src="${request.contextPath}/images/diplomat.jpg" />
+			</a>
+			<a href="http://www.thespringexperience.com">
+				<img src="${request.contextPath}/images/tse.gif" />
+			</a>
+			<p>
+			</p>
+		</div>
+		<div id="main">
+			<ui:insert name="content"/>
+		</div>
+	</div>
+	<div id="footer" class="clearfix spring">
+		<a href="http://www.springframework.org"><img src="${request.contextPath}/images/powered-by-spring.png" /></a>
+	</div>
+</div>
+
+</body>
+</f:view>
+</html>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web-application-config.xml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web-application-config.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+           http://www.springframework.org/schema/tx
+           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+	<!-- Activates annotation-based bean configuration -->
+	<context:annotation-config />
+	
+	<!-- Scans for application @Components to deploy -->
+	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
+
+	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
+	<tx:annotation-driven />
+
+	<!-- Drives transactions using local JPA APIs -->
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+		
+	<!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data -->
+	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="jpaVendorAdapter">
+			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+		</property>
+	</bean>
+
+	<!-- Deploys a in-memory "booking" datasource populated -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:mem:booking" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+	</bean>
+	
+</beans>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			/WEB-INF/web-application-config.xml
+		</param-value>
+	</context-param>
+	
+	<!-- Use JSF view templates saved as *.xhtml, for use with Facelets -->
+	<context-param>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.xhtml</param-value>
+	</context-param>
+	
+	<!-- Enables special Facelets debug output during development -->
+  	<context-param>
+        <param-name>facelets.DEVELOPMENT</param-name>
+   		<param-value>true</param-value>
+  	</context-param>
+  	
+  	<!-- Causes Facelets to refresh templates during development -->
+  	<context-param>
+  		<param-name>facelets.REFRESH_PERIOD</param-name>
+  		<param-value>1</param-value>
+  	</context-param>
+	
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- Just here so the JSF implementation can initialize, *not* used at runtime -->
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<!-- Just here so the JSF implementation can initialize -->
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.faces</url-pattern>
+	</servlet-mapping>
+	
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+
+</web-app>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/enterBookingDetails.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/booking/enterBookingDetails.xhtml
@@ -0,0 +1,130 @@
+<!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="/WEB-INF/layouts/standard.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">#{bookingController.booking.hotel.name}</div>
+		</div>
+		<div class="field">
+			<div class="label">Address:</div>
+			<div class="output">#{bookingController.booking.hotel.address}</div>
+		</div>
+		<div class="field">
+			<div class="label">City, State:</div>
+			<div class="output">#{bookingController.booking.hotel.city}, #{bookingController.booking.hotel.state}</div>
+		</div>
+		<div class="field">
+			<div class="label">Zip:</div>
+			<div class="output">#{bookingController.booking.hotel.zip}</div>
+		</div>
+		<div class="field">
+			<div class="label">Country:</div>
+			<div class="output">#{bookingController.booking.hotel.country}</div>
+		</div>
+        <div class="field">
+            <div class="label">Nightly rate:</div>
+            <div class="output">
+                <h:outputText value="#{bookingController.booking.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="#{bookingController.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="#{bookingController.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="#{bookingController.booking.beds}">
+					<f:selectItems value="#{referenceData.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="#{bookingController.booking.smoking}" layout="pageDirection">
+					<f:selectItems value="#{referenceData.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="#{bookingController.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="#{bookingController.booking.creditCardName}" required="true"/>
+				</sf:clientTextValidator>
+			</div>
+		</div>
+		<div class="field">
+			<div class="label">
+				<h:outputLabel for="creditCardExpiryMonth">Expiration Date:</h:outputLabel>
+			</div>
+			<div class="input">
+				<h:selectOneMenu id="creditCardExpiryMonth" value="#{bookingController.booking.creditCardExpiryMonth}">
+					<f:selectItems value="#{referenceData.creditCardExpMonths}" />
+				</h:selectOneMenu>
+				<h:selectOneMenu id="creditCardExpiryYear" value="#{bookingController.booking.creditCardExpiryYear}">
+					<f:selectItems value="#{referenceData.creditCardExpYears}"/>
+				</h:selectOneMenu>
+			</div>
+		</div>
+		<div class="buttonGroup">
+			<h:commandButton id="proceed" action="#{bookingController.processBooking}" value="Proceed"/>&#160;
+			<h:commandButton id="cancel" immediate="true" value="Cancel" action="#{bookingController.cancel}"/>
+		</div>		
+	</fieldset>
+	</h:form>
+</div>
+
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/reviewBooking.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/booking/reviewBooking.xhtml
@@ -0,0 +1,76 @@
+<!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="/WEB-INF/layouts/standard.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">#{booking.hotel.name}</div>
+		</div>
+		<div class="field">
+			<div class="label">Address:</div>
+			<div class="output">#{booking.hotel.address}</div>
+		</div>
+		<div class="field">
+			<div class="label">City, State:</div>
+			<div class="output">#{booking.hotel.city}, #{booking.hotel.state}</div>
+		</div>
+		<div class="field">
+			<div class="label">Zip:</div>
+			<div class="output">#{booking.hotel.zip}</div>
+		</div>
+		<div class="field">
+			<div class="label">Country:</div>
+			<div class="output">#{booking.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}">
+					<f:convertDateTime dateStyle="short"/>
+				</h:outputText>
+			</div>
+		</div>
+		<div class="field">
+			<div class="label">Check Out Date:</div>
+			<div class="output">
+				<h:outputText value="#{booking.checkoutDate}">
+					<f:convertDateTime dateStyle="short"/>
+				</h:outputText>
+			</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="#{bookingController.confirm}"/>&#160;
+    		<h:commandButton id="revise" value="Revise" action="revise"/>&#160;
+    		<h:commandButton id="cancel" value="Cancel" action="#{bookingController.cancel}"/>
+		</div>
+	</fieldset>
+	</h:form>
+</div>
+
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/forms.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/forms.css
@@ -0,0 +1,100 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* FORM ELEMENTS */
+	form {
+		margin:0;
+		padding:0;
+	}
+	form div,
+	form p {
+		font-size: 1em;
+		margin: 0 0 1em 0;
+		padding: 0;
+	}
+	label {
+		font-weight: bold;
+	}
+	fieldset {
+		border: 1px solid #eee;
+		padding: 5px 10px;
+		margin: 0 0 1.5em 0;
+	}
+	fieldset legend {
+		color: #666;
+		font-size: 1.1em;
+		font-weight: bold;
+		margin: 0 0 0 0px;
+		padding: 0;
+		background-color: white;
+	}
+	* html fieldset legend {
+		margin: 0 0 10px -10px;
+	}
+	fieldset ul {
+		list-style: none;
+		margin: 0 0 1.5em 0;
+		padding: 0;
+	}
+	fieldset ul li {
+		list-style: none;
+		margin: 0 0 0.5em 0;
+		padding: 0;
+	}
+     
+	
+	input, select, textarea {
+		font-size:1em; 
+		font-family: arial, helvetica, verdana, sans-serif;
+        
+        margin: 0;
+		padding: 2px;
+	}
+	
+	input, select {
+		vertical-align:middle;
+	}
+	textarea {
+		width: 200px;
+		height: 8em;
+	}
+	
+	input.check {
+		border: none;
+		width: auto;
+		height: auto;
+		margin: 0;
+	}
+	input.radio {
+		border: none;
+		width: auto;
+		height: auto;
+		margin: 0;
+	}
+	input.file {
+		height: auto;
+		width: 250px;
+	}
+	input.readonly {
+		background-color: transparent;
+		border: none;
+	}
+	input.button {
+		width: 10em;
+		border:1px solid black;
+		background-color: #ddd;
+	}
+	input.image {
+		border: none;
+		width: auto;
+		height: auto; 
+	}
+	
+    form div.submit {
+		margin: 1em 0;
+	}
+    form div.submit input {
+		height: 2em;
+        width: 15em;
+	}
+/* END FORM ELEMENTS */
+		
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-1col.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-1col.css
@@ -0,0 +1,27 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-horizontal.css");
+ 
+/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */
+    div#content {
+        position: relative;
+        width: 701px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        width: 100%;
+    }
+    div#local {
+        display: none;
+    }
+    div#sub {
+        display: none;
+    }
+    div#nav {
+        display: none;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-1col.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-1col.css
@@ -0,0 +1,31 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-vertical.css");
+
+/* NAV BAR ON THE LEFT AND ONE COLUMN OF CONTENT */
+    div#content {
+        position: relative;
+        width: 780px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        float: right;
+        width: 560px;
+        display: inline;
+    }
+    div#local {
+        display: none;
+    }
+    div#sub {
+        display: none;
+    }
+    div#nav {
+        float: left;
+        width: 200px;
+        display: inline;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-2col.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-2col.css
@@ -0,0 +1,39 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-vertical.css");
+
+/* NAV BAR ON THE LEFT AND TWO COLUMNS OF CONTENT */
+    div#content {
+        position: relative;
+        width: 780px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        float: right;
+        width: 340px;
+        display: inline;
+        
+        margin-right: 220px;
+        margin-left: -220px;
+    }
+    div#local {
+        display: none;
+    }
+    div#sub {
+        float: right;
+        width: 200px;
+        display: inline;
+        
+        margin-right: -340px;
+        margin-left: 200px;
+    }
+    div#nav {
+        float: left;
+        width: 200px;
+        display: inline;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-1col.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-1col.css
@@ -0,0 +1,32 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-horizontal.css");
+ 
+/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */
+    div#content {
+        position: relative;
+        width: 701px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        width: 100%;
+    }
+    div#local {
+        width: 100%;
+    }
+    div#sub {
+        width: 100%;
+    }
+    div#nav {
+        position: absolute;
+        top: -15px;
+        left: 0;
+        width: 100%;
+        
+        text-align: left;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-3col.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-3col.css
@@ -0,0 +1,43 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-horizontal.css");
+ 
+/* NAV BAR AT THE TOP, LOCAL NAV ON THE LEFT AND TWO COLUMNS OF CONTENT */
+    div#content {
+        position: relative;
+        width: 701px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        float: left;
+        width: 300px;
+        display: inline;
+        
+        margin-right: -200px;
+        margin-left: 200px;
+    }
+    div#sub {
+        float: right;
+        width: 180px;
+        display: inline;
+    }
+    div#local {
+        float: left; 
+        width: 180px;
+        display: inline;
+        
+        margin-left: -300px;
+    }
+    div#nav {
+        position: absolute;
+        top: -15px;
+        left: 0;
+        width: 701px;
+        
+        text-align: left;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-localleft.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-localleft.css
@@ -0,0 +1,36 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-horizontal.css");
+
+/* NAV BAR AT THE TOP, LOCAL NAVIGATION ON THE LEFT AND ONE COLUMN OF CONTENT */
+    div#content {
+        position: relative;
+        width: 701px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        float: right;
+        width: 500px;
+        display: inline;
+    }
+    div#local {
+        float: left;
+        width: 200px;
+        display: inline;
+    }
+    div#sub {
+        display: none;
+    }
+    div#nav {
+        position: absolute;
+        top: -15px;
+        left: 0;
+        width: 100%;
+        
+        text-align: left;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-subright.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-subright.css
@@ -0,0 +1,36 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+@import url("nav-horizontal.css");
+ 
+/* NAV BAR AT THE TOP AND TWO COLUMNS OF CONTENT */
+    div#content {
+        position: relative;
+        width: 701px;
+        
+        margin: 0 auto 20px auto;
+        padding: 0;
+        
+        text-align: left;
+    }
+    div#main {
+        float: left;
+        width: 480px;
+        display: inline;
+    }
+    div#sub {
+        float: right;
+        width: 200px;
+        display: inline;
+    }
+    div#local {
+        display: none;
+    }
+    div#nav {
+        position: absolute;
+        top: -15px;
+        left: 0;
+        width: 100%;
+        
+        text-align: left;
+    }
+/* END CONTENT */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout.css
@@ -0,0 +1,125 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* SITE SPECIFIC LAYOUT */
+    body {
+        margin: 0;
+        padding: 0;
+        
+        background: white;
+              
+        text-align: center;
+    }
+    div#page {
+        width: 780px;
+        
+        margin:  0 auto;
+        padding: 0;
+        
+        background: white;
+        text-align: center;
+    }
+    
+    /* HEADER */
+        div#header {
+            margin: 0 0 5em 0;
+            padding: 40px 20px;
+            
+            color: white;
+            background: black;
+            
+            text-align: left;
+        }
+        div#branding {
+            float: left;
+            width: 40%;
+            
+            margin: 0;
+            padding: 10px 0 10px 20px;
+            
+            text-align: left;
+        }
+        div#search {
+            float: right;
+            width: 49%;
+            
+            margin: 0;
+            padding: 16px 20px 0 0;
+            
+            text-align: right;
+        }
+    /* END HEADER */
+    
+    
+    /* CONTENT */
+        div#content {
+            
+        }
+        
+        /* MAIN */
+            div#main {
+                
+            }
+        /* END MAIN */
+        
+        /* SUB */
+            div#sub {
+                
+            }
+        /* END SUB */
+        
+    /* END CONTENT */
+    
+    
+    /* FOOTER */
+        div#footer {
+            color: white;
+            background-color: black;
+        }
+        div#footer p {
+            font-size: 0.8em;
+            
+            margin: 0;
+            padding: 15px;
+        }
+    /* END FOOTER */
+/* END LAYOUT */
+
+
+
+
+/* UL.SUBNAV */
+    ul.subnav {
+        margin: 0;
+        padding: 0;
+        
+        font-size: 0.8em;
+        list-style: none;
+    }
+    ul.subnav li {
+        margin: 0 0 1em 0;
+        padding: 0;
+        list-style: none;
+    }
+    ul.subnav li a,
+    ul.subnav li a:link,
+    ul.subnav li a:visited,
+    ul.subnav li a:active {
+        text-decoration: none;
+        font-weight: bold;
+        color: black;
+    }
+    ul.subnav li a:hover {
+        text-decoration: underline;
+    }
+    ul.subnav li strong {
+        padding: 0 0 0 12px;
+        background: url("../i/subnav-highlight.gif") left top no-repeat transparent;
+    }
+    ul.subnav li strong a,
+    ul.subnav li strong a:link,
+    ul.subnav li strong a:visited,
+    ul.subnav li strong a:active {
+        color: white;
+        background-color: black;
+    }
+/* END UL.SUBNAV */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-horizontal.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-horizontal.css
@@ -0,0 +1,80 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* NAV */
+	div#nav {
+        font-size: 0.8em;
+    }
+    * html div#nav {
+        /* hide ie/mac \*/
+        height: 1%;
+        /* end hide */
+    }
+    div#nav div.wrapper {
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+    }
+    div#nav ul {
+        width: auto; 
+        width: 100%;
+                
+        margin: 0;
+        padding: 0;
+        
+        line-height: 1em;
+        list-style: none;
+    }
+    div#nav li {
+        float: left;
+        display: inline;
+   
+        list-style: none;
+        
+        margin: 0;
+        padding: 0;
+        
+        line-height: 1em;
+        border-right: 1px solid #aaa;
+    }
+    div#nav li.last {
+        border-right: none;
+    }
+    div#nav a,
+    div#nav a:link,
+    div#nav a:active,
+    div#nav a:visited {
+        display: inline-block;
+        /* hide from ie/mac \*/
+        display: block;
+        /* end hide */
+        font-weight: bold;
+        text-decoration: none;
+        
+        margin: 0;
+        padding: 5px 38px 5px 38px;
+        
+        color: black;
+        background: #ddd;
+    }
+    div#nav a:hover {
+        text-decoration: underline;
+    }
+    div#nav strong {
+        display: inline-block;
+        /* hide from ie/mac \*/
+        display: block;
+        /* end hide */
+        
+        color: white;
+        background: black;
+    }
+    div#nav strong a,
+    div#nav strong a:link,
+    div#nav strong a:active,
+    div#nav strong a:visited,
+    div#nav strong a:hover {
+       color: white;
+       background-color: black;
+    }
+/* END NAV */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-vertical.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-vertical.css
@@ -0,0 +1,79 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* NAV */
+	div#nav {
+        font-size: 0.8em;
+    }
+    * html div#nav {
+        /* hide ie/mac \*/
+        height: 1%;
+        /* end hide */
+    }
+    div#nav div.wrapper {
+        width: 100%;
+        
+        background: #ddd;
+    }
+    div#nav ul {
+        width: auto; 
+        width: 100%;
+                
+        margin: 0;
+        padding: 0;
+        
+        line-height: 1em;
+        list-style: none;
+    }
+    div#nav li {
+        display: block;
+   
+        list-style: none;
+        
+        margin: 0;
+        padding: 0;
+        
+        line-height: 1em;
+    }
+    * html div#nav li {
+        /* hide ie/mac \*/
+        height: 1%;
+        /* end hide */
+    }
+    div#nav li.last {
+        
+    }
+    div#nav a,
+    div#nav a:link,
+    div#nav a:active,
+    div#nav a:visited {
+        display: block;
+        
+        font-weight: bold;
+        text-decoration: none;
+        
+        margin: 0;
+        padding: 5px 10px 5px 10px;
+        
+        color: black;
+        background: white;
+    }
+    div#nav a:hover {   
+        color: white;
+        background: black;
+        text-decoration: underline;
+    }
+    div#nav strong {
+        display: block;
+        
+        color: white;
+        background: black;
+    }
+    div#nav strong a,
+    div#nav strong a:link,
+    div#nav strong a:active,
+    div#nav strong a:visited,
+    div#nav strong a:hover {
+       color: white;
+       background-color: black;
+    }
+/* END NAV */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/tools.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/tools.css
@@ -0,0 +1,68 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* clearing */
+	.stretch,
+	.clear {
+		clear:both; 
+		height:1px; 
+		margin:0; 
+		padding:0; 
+		font-size: 15px;
+		line-height: 1px;
+	}
+	.clearfix:after {
+		content: "."; 
+		display: block; 
+		height: 0; 
+		clear: both; 
+		visibility: hidden;
+	}
+	* html>body .clearfix {
+		display: inline-block; 
+		width: 100%;
+	}
+	
+	* html .clearfix {
+		/* Hides from IE-mac \*/
+		height: 1%;
+		/* End hide from IE-mac */
+	}
+/* end clearing */
+
+
+/* replace */
+	.replace {
+		display:block;
+		
+		background-repeat: no-repeat;
+		background-position: left top;
+		background-color:transparent;
+	}
+	/* tidy these up */
+	.replace * {
+		text-indent: -10000px;
+		display:block;
+		
+		background-repeat: no-repeat;
+		background-position: left top;
+		background-color:transparent;
+	}
+	.replace a {
+		text-indent:0;
+	}
+	.replace a span {
+		text-indent:-10000px;
+	}
+/* end replace */
+
+
+/* accessibility */
+     span.accesskey {
+     	text-decoration:none;
+     }
+     .accessibility {
+     	position: absolute;
+     	top: -999em;
+     	left: -999em;
+     }
+/* end accessibility */
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/typo.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/typo.css
@@ -0,0 +1,177 @@
+/* A CSS Framework by Mike Stenhouse of Content with Style */
+
+/* TYPOGRAPHY */
+	body {
+		text-align: left;
+		font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+		font-size: 76%;
+        line-height: 1em;
+		color: #333;
+	}
+	div {
+		font-size: 1em;
+	}
+	img {
+		border: 0;
+	}
+	
+/* LINKS */
+	a,
+	a:link 
+	a:active {
+		color: blue;
+		background-color: white;
+		text-decoration: underline;
+	}
+	a:visited {
+		color: purple;
+		background-color: transparent;
+	}
+	a:hover {
+        color: white;
+        background-color: black;
+		text-decoration: none;
+	}
+/* END LINKS */
+	
+/* HEADINGS */
+	h1 {
+		font-size: 2em;
+		line-height: 1.5em;
+		margin: 0 0 0.5em 0;
+		padding: 0;
+        color: black;
+	}
+	h2 {
+		font-size: 1.5em;
+        line-height: 1.5em;
+		margin: 0 0 0.5em 0;
+		padding: 0;
+        color: black;
+	}
+	h3 {
+		font-size: 1.3em;
+		line-height: 1.3em;
+		margin: 0 0 0.5em 0;
+		padding:0;
+        color: black;
+	}
+	h4 {
+		font-size: 1.2em;
+		line-height: 1.3em;
+		margin: 0 0 0.25em 0;
+		padding: 0;
+        color: black;
+	}
+	h5 {
+		font-size: 1.1em;
+		line-height: 1.3em;
+		margin: 0 0 0.25em 0;
+		padding: 0;
+        color: black;
+	}
+	h6 {
+		font-size: 1em;
+		line-height: 1.3em;
+		margin: 0 0 0.25em 0;
+		padding: 0;
+        color: black;
+	}
+/* END HEADINGS */
+
+/* TEXT */
+	p {
+		font-size: 1em;
+		margin: 0 0 1.5em 0;
+		padding: 0;
+		line-height:1.4em;
+	}
+	blockquote {
+		border-left:10px solid #ddd;
+		margin-left:10px;
+	}
+	pre {
+		font-family: monospace;
+		font-size: 1.0em;
+	}
+	strong, b {
+		font-weight: bold;
+	}
+	em, i {
+		font-style:italic;
+	}
+    code {
+        font-family: "Courier New", Courier, monospace;
+        font-size: 1em;
+        white-space: pre;
+    }
+/* END TEXT */
+	
+/* LISTS */
+	ul {
+        line-height:1.4em;
+		margin: 0 0 1.5em 0;
+		padding: 0;
+	}
+	ul li {
+		margin: 0 0 0.25em 30px;
+		padding: 0;
+	}
+	ol {
+		font-size: 1.0em;
+		line-height: 1.4em;
+		margin: 0 0 1.5em 0;
+		padding: 0;
+	}
+	ol li {
+		font-size: 1.0em;
+		margin: 0 0 0.25em 30px;
+		padding: 0;
+	}
+	dl {
+		margin: 0 0 1.5em 0;
+		padding: 0;
+		line-height: 1.4em;
+	}
+	dl dt {
+		font-weight: bold;
+		margin: 0.25em 0 0.25em 0;
+		padding: 0;
+	}
+	dl dd {
+		margin: 0 0 0 30px;
+		padding: 0;
+	}
+/* END LISTS */
+	
+	
+/* TABLE */
+	table {
+        font-size: 1em;
+		margin: 0 0 1.5em 0;
+        padding: 0;
+	}
+	table caption {
+		font-weight: bold;
+		margin: 0 0 0 0;
+		padding: 0 0 1.5em 0;
+	}
+	th {
+		font-weight: bold;
+		text-align: left;
+	}
+	td {
+		font-size: 1em;
+	}
+/* END TABLE */	
+	
+	hr {
+		display: none;
+	}
+	div.hr {
+		height: 1px;
+		margin: 1.5em 10px;
+		border-bottom: 1px dotted black;
+	}
+	
+/* END TYPOGRAPHY */	
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/bg.gif
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/bg.gif
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/btn.bg.gif
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/btn.bg.gif
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/diplomat.jpg
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/diplomat.jpg
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/header.jpg
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/header.jpg
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/input.bg.gif
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/input.bg.gif
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/powered-by-spring.png
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/powered-by-spring.png
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/th.bg.gif
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/th.bg.gif
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/images/tse.gif
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/images/tse.gif
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/index.html
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/index.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+  <meta http-equiv="Refresh" content="0; URL=intro.faces">
+</head>
+</html>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/intro.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/intro.xhtml
@@ -0,0 +1,38 @@
+<!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="/WEB-INF/layouts/standard.xhtml">
+
+<ui:define name="content">
+
+<div class="section">
+	<h1>Welcome to Spring Travel</h1>
+	<p>
+	 	This reference application illustrates <a href="http://www.springframework.org/faces">Spring Faces</a>,
+	 	a software library that integrates Spring and JavaServerFaces technology to power rich web applications.
+	</p>
+	<p>
+		The key features illustrated in this sample include:
+	</p>
+	<ul>
+		<li>A declarative navigation model enabling full browser button support and dynamic navigation rules</li>
+		<li>A fine-grained state management model, including support for ConversationScope and ViewScope</li>
+		<li>Modularization of web application functionality by domain use case, illustrating project structure best-practices</li>
+		<li>Managed persistence contexts with the Java Persistence API (JPA)</li>
+		<li>Unified Expression Language (EL) integration</li>
+		<li>Spring Security integration</li>
+		<li>Declarative page authoring with Facelets, including applying reusable page layouts</li>	
+		<li>A lightweight component library for Ajax and client-side validation that employs progressive enhancement techniques</li>
+		<li>Exception handling support across all layers of the application</li>
+		<li>Spring IDE tooling integration, with support for graphical flow modeling and visualization</li>
+	</ul>
+	<p align="right">
+		<a href="main/enterSearchCriteria.faces">Start your Spring Travel experience</a>
+	</p>
+</div>
+
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/enterSearchCriteria.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/main/enterSearchCriteria.xhtml
@@ -0,0 +1,77 @@
+<!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="/WEB-INF/layouts/standard.xhtml">
+
+<ui:define name="content">
+
+		<div id="hotelSearch" class="section">
+		    <span class="errors">
+		       <h:messages globalOnly="true" />
+		    </span>
+			<h2>Search Hotels</h2>
+			<h:form id="mainForm">
+				<fieldset>
+					<div class="searchGroup">
+						<div class="searchField">
+							<h:inputText id="searchString" value="#{searchController.searchCriteria.searchString}" style="width: 165px; height: 15px;" />
+						</div>
+						<div class="searchSize">
+						   	<h:outputLabel for="pageSize">Maximum results:</h:outputLabel>
+							<h:selectOneMenu id="pageSize" value="#{searchController.searchCriteria.pageSize}">
+								<f:selectItems value="#{referenceData.pageSizeOptions}" />
+							</h:selectOneMenu>
+				   		</div>
+						<div class="searchButton">
+							<h:commandButton id="findHotels" value="Find Hotels" action="#{searchController.search}"/>
+						</div>
+					</div>
+			    </fieldset>
+			</h:form>			  
+		</div>
+
+		<div id="bookingsSection" class="section">
+			<h:form id="bookingsForm">
+				<h2>Current Hotel Bookings</h2>				
+				<h:outputText value="No Bookings Found" rendered="#{searchController.bookings.rowCount == 0}"/>
+				<h:dataTable id="bookings" styleClass="summary" value="#{searchController.bookings}" var="booking" rendered="#{empty searchController.bookings or searchController.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}">
+			            	<f:convertDateTime dateStyle="short"/>
+						</h:outputText>
+			        </h:column>
+			        <h:column>
+			            <f:facet name="header">Check out date</f:facet>
+			            <h:outputText value="#{booking.checkoutDate}">
+			            	<f:convertDateTime dateStyle="short"/>
+						</h:outputText>
+			        </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>
+						<h:commandLink id="cancel" value="Cancel" actionListener="#{searchController.cancelBookingListener}" />
+					</h:column>
+				</h:dataTable>
+			</h:form>
+		</div>
+
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml
@@ -0,0 +1,58 @@
+<!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="/WEB-INF/layouts/standard.xhtml">
+
+<ui:define name="content">
+
+<div class="section">
+	<h2>View Hotel</h2>
+	<div class="field">
+		<div class="label">Name:</div>
+		<div class="output">#{hotelController.hotel.name}</div>
+	</div>
+	<div class="field">
+		<div class="label">Address:</div>
+		<div class="output">#{hotelController.hotel.address}</div>
+	</div>
+	<div class="field">
+		<div class="label">City:</div>
+		<div class="output">#{hotelController.hotel.city}</div>
+	</div>
+	<div class="field">
+		<div class="label">State:</div>
+		<div class="output">#{hotelController.hotel.state}</div>
+	</div>
+	<div class="field">
+		<div class="label">Zip:</div>
+		<div class="output">#{hotelController.hotel.zip}</div>
+	</div>
+	<div class="field">
+		<div class="label">Country:</div>
+		<div class="output">#{hotelController.hotel.country}</div>
+	</div>
+    <div class="field">
+        <div class="label">Nightly rate:</div>
+        <div class="output">
+            <h:outputText value="#{hotelController.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" ajaxEnabled="false" action="book" value="Book Hotel"/>&#160;
+		<h:commandButton id="cancel" ajaxEnabled="false" action="cancel" value="Back to Search"/>
+	</fieldset>
+	<h:inputText id="hotelId" value="#{hotelController.hotelId}" style="visibility:hidden"/>
+	</h:form>
+</div>
+
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotels.xhtml
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotels.xhtml
@@ -0,0 +1,57 @@
+<!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="/WEB-INF/layouts/standard.xhtml">
+
+<ui:define name="content">
+
+<h:form id="hotels">
+	<div class="section">
+		<h2>Hotel Results</h2>
+		<p>
+			<h:commandLink value="Change Search" action="changeSearch"/>
+		</p>
+
+			<div id="searchResults">
+				<h:outputText id="noHotelsText" value="No Hotels Found" rendered="#{searchController.hotels.rowCount == 0}"/>
+				<h:dataTable id="hotels" styleClass="summary" value="#{searchController.hotels}" var="hotel" rendered="#{searchController.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>
+						<a href="reviewHotel.faces?id=#{hotel.id}">View Hotel</a>
+					</h:column>
+				</h:dataTable>
+				<div class="next">
+					<h:commandLink id="nextPageLink" value="More Results" actionListener="#{searchController.nextListener}" rendered="#{empty searchController.hotels or searchController.hotels.rowCount == searchController.searchCriteria.pageSize}"/>
+				</div>
+				<div class="previous">
+					<h:commandLink id="previousPageLink" value="Previous results" actionListener="#{searchController.prevListener}" rendered="#{empty searchController.hotels or searchController.searchCriteria.page > 0}"/>
+				</div>
+			</div>
+			<div style="visibility:hidden">
+				<h:inputText id="searchString" value="#{searchController.searchCriteria.searchString}"/>
+				<h:inputText id="pageSize" value="#{searchController.searchCriteria.pageSize}"/>
+				<h:inputText id="page" value="#{searchController.searchCriteria.page}"/>
+			</div>
+
+	</div>
+</h:form>
+</ui:define>
+</ui:composition>
--- a/spring-webflow-samples/jsf-booking/src/main/webapp/styles/booking.css
+++ b/spring-webflow-samples/jsf-booking/src/main/webapp/styles/booking.css
@@ -0,0 +1,187 @@
+	a, a:visited, a:link, a:active  {		
+		color: #59924B;
+		background-color: transparent;
+		text-decoration: none;
+		font-weight: bold;
+	}
+	
+	a:hover {		
+		color: white;		
+		background-color: #65a242;		
+		text-decoration: none;		
+		font-weight: bold;
+	}
+	
+	body.spring {
+		background-color: #9cac7c;
+	}
+	
+	#header.spring { 
+		margin: 0 0 1em 0;
+        padding: 0px 0px;
+		background-color : #414f23;
+	}
+	
+	#branding.spring {
+		float: none;
+        width: 100%;
+        margin: 10px 0 0 0;
+        padding: 0 0 0 0;
+        text-align: none;
+    }
+    
+    #welcome {
+    	padding: 10px 10px;
+    }
+    
+    #welcome div.left {
+    	float: left;
+    } 
+    
+    #welcome div.right {
+    	float: right;
+    }
+    
+    #content.spring form div, 
+    #content.spring form p {
+    	padding: 0px;
+		margin: 0 0 .5em 0;
+    }
+    
+    #content.spring {
+    	width: 740px;
+    	background: #fff url(../images/bg.gif) 0 0 repeat;
+    	margin-bottom: 0px;
+    }
+    
+    #content .section {
+    	width: 505px;
+    	float: left;
+    	margin-bottom: 5px;
+    }
+    
+    #content.spring input[type="submit"], input[type="button"], button {
+		font-weight: bold;
+		color: #fff;
+		height: 20px;
+		background: #fff url(../images/btn.bg.gif) 0 0 repeat-x;
+		border-style: none;
+		vertical-align: middle;
+	}
+	
+	#content.spring button
+	{
+		font-size: 1em;
+		font-family: arial,helvetica,verdana,sans-serif;
+		margin-top: 0pt;
+		margin-right: 0pt;
+		margin-bottom: 0pt;
+		margin-left: 0pt;
+		padding-top: 2px;
+		padding-right: 2px;
+		padding-bottom: 2px;
+		padding-left: 2px;
+	}
+	
+	#content.spring button
+	{
+		vertical-align: middle;
+	}
+	
+	.errors {
+		font-weight: bold;
+		text-align: left;
+		color: #600;
+	}
+	
+	.errors ul {
+		list-style: none;
+	}
+	
+	#content .field {
+		float:left;
+	}
+	
+	#content .field .label {
+		float: left;
+		padding-top: 5px;
+		padding-right: 5px;
+		font-weight: bold;
+		width: 150px;
+		text-align: right;
+	}
+	
+	#content .field .output {
+		float: left;
+		width: 250px;
+		padding-top: 5px;
+		text-align: left;
+	}
+	
+	#content .field .input {
+		float: left;
+		width: 250px;
+		text-align: left;
+	}
+	
+	#content .searchGroup {
+		width: 35%;
+	}
+	
+	#content .buttonGroup {
+		clear: both;
+		text-align: right;
+	}
+	
+	#content .buttonGroup input[type="submit"], .buttonGroup input[type="button"] {
+		margin-right: 5px;
+	}
+	
+	#content .previous {
+		float: right;
+	}
+	
+	#content .next {
+		float: right;	
+	}
+	
+	#content .next a {
+		margin-left: 20px;
+	}
+	
+	#content .summary {
+		width: 100%;
+		border: 1px solid #414f23;
+		border-collapse: collapse;
+	}
+	
+	#content .summary thead th {
+		border-left: 1px solid #414f23;
+		background: #fff url(../images/th.bg.gif) 0 100% repeat-x;
+		border-bottom: 1px solid #414f23;
+		padding: 6px;
+		text-align: left;
+		font-size: small;
+	}
+    
+    #content .summary tbody td {
+		border-left: 1px solid #9cac7c;
+		padding: 4px;
+		border-bottom: 1px solid #9cac7c;
+		font-size: 8pt;
+	}
+    
+    #local.spring{
+        width: 215px;
+    }
+    
+    #footer.spring {
+    	padding: 25px 0;
+    	background-color : white;
+    	border-top: 1px solid #C3BBB6;
+    }
+    
+    #footer.spring img {
+    	float: right;
+    	padding-right: 20px;
+    }