From 87308d65652d81fe5a415f5d4c8007a062b55106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 00:08:42 +0200
Subject: [PATCH 01/22] Updated dependency versions:    * Spring Framework to
 3.1.2    * Spring Security to 3.1.2 Added dependencies:    * Thymeleaf
 2.0.14-SNAPSHOT    * Thymeleaf-extras-Tiles2 1.0.0-beta3-SNAPSHOT    *
 Thymeleaf-extras-SpringSecurity3 1.0.0-beta2-SNAPSHOT

---
 booking-mvc/pom.xml                           | 131 ++++++++++--------
 .../WEB-INF/config/data-access-config.xml     |   6 +-
 .../WEB-INF/config/web-application-config.xml |   4 +-
 .../webapp/WEB-INF/config/webflow-config.xml  |   6 +-
 .../webapp/WEB-INF/config/webmvc-config.xml   |   4 +-
 5 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index f41fb3f..c64b0cf 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -1,29 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.webflow.samples</groupId>
-	<artifactId>booking-mvc</artifactId>
-	<packaging>war</packaging>
-	<name>Hotel Booking : Spring MVC + Web Flow + JSP</name>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.webflow.samples</groupId>
+  <artifactId>booking-mvc</artifactId>
+  <packaging>war</packaging>
+  <name>Hotel Booking : Spring MVC + Web Flow + JSP</name>
+  <version>1.0.0.BUILD-SNAPSHOT</version>
 
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
 		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
+		<thymeleaf-version>2.0.14-SNAPSHOT</thymeleaf-version>
+		<thymeleaf-extras-tiles2-version>1.0.0-beta3-SNAPSHOT</thymeleaf-extras-tiles2-version>
+		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2-SNAPSHOT</thymeleaf-extras-springsecurity3-version>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
-		</repository>
-	</repositories>
+  <repositories>
+    <repository>
+      <id>spring-repository</id>
+      <name>Spring project snapshots, milestones, and releases</name>
+      <url>http://repo.springsource.org/snapshot</url>
+    </repository>
+  </repositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf</artifactId>
+			<version>${thymeleaf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf-spring3</artifactId>
+			<version>${thymeleaf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-tiles2</artifactId>
+			<version>${thymeleaf-extras-tiles2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-springsecurity3</artifactId>
+			<version>${thymeleaf-extras-springsecurity3-version}</version>
+		</dependency>
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -233,44 +256,44 @@
 		</dependency>
 	</dependencies>
 
-	<build>
-		<finalName>booking-mvc</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-				<configuration>
-					<junitArtifactName>junit:junit</junitArtifactName>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>2.0-SNAPSHOT</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>false</downloadJavadocs>
-					<wtpversion>2.0</wtpversion>
-				</configuration>
-			</plugin>			
-		</plugins>
-	</build>
+  <build>
+    <finalName>booking-mvc</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.12</version>
+        <configuration>
+          <junitArtifactName>junit:junit</junitArtifactName>
+          <includes>
+            <include>**/*Tests.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>2.0-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.8</version>
+        <configuration>
+          <downloadSources>true</downloadSources>
+          <downloadJavadocs>false</downloadJavadocs>
+          <wtpversion>2.0</wtpversion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
index 1a6d00f..c7b9d8b 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
 
 	<!-- Instructs Spring to perfrom declarative transaction management on annotated classes -->
 	<tx:annotation-driven />
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
index 5791b17..10ebcf5 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<!-- Scans for application @Components to deploy -->
 	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
index f6589f7..edb4fdb 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
 
 	<!-- Executes flows: the entry point into the Spring Web Flow system -->
 	<webflow:flow-executor id="flowExecutor">
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 1628c08..2d753ab 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-1.0.xsd">
 
 	<!-- Enables controllers mapped with @RequestMapping annotations, formatting annotations @NumberFormat @DateTimeFormat, and JSR 303 style validation -->
 	<mvc:annotation-driven/>

From be645eb31f036bb8e213dcffc37438f80431dfbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 00:39:38 +0200
Subject: [PATCH 02/22] Refactored dependencies.

  * Reformatted code. Removed unnecessary exclude clauses.
  * Upgraded Apache Tiles dependency to version 2.2.2
---
 booking-mvc/pom.xml | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index c64b0cf..dbcee35 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -27,6 +27,7 @@
   </repositories>
 
 	<dependencies>
+		<!-- Thymeleaf -->
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
@@ -52,13 +53,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 			<version>${springframework-version}</version>
-			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				 </exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -85,11 +79,6 @@
 			<artifactId>spring-security-web</artifactId>
 			<version>${springsecurity-version}</version>
 			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>*</artifactId>
@@ -112,11 +101,6 @@
 			<artifactId>spring-security-config</artifactId>
 			<version>${springsecurity-version}</version>
 			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>*</artifactId>
@@ -197,15 +181,13 @@
 		<!-- Apache Tiles -->
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-jsp</artifactId>
-			<version>2.1.3</version>
-			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging-api</artifactId>
-				 </exclusion>
-			</exclusions>			
+			<artifactId>tiles-core</artifactId>
+			<version>2.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-api</artifactId>
+			<version>2.2.2</version>
 		</dependency>
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>

From c836b8f792aab36fd62713dc1b8509a11fa1d73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 00:56:26 +0200
Subject: [PATCH 03/22] Refactored Tiles version in pom.xml

---
 booking-mvc/pom.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index dbcee35..211dcf7 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -16,6 +16,7 @@
 		<thymeleaf-version>2.0.14-SNAPSHOT</thymeleaf-version>
 		<thymeleaf-extras-tiles2-version>1.0.0-beta3-SNAPSHOT</thymeleaf-extras-tiles2-version>
 		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2-SNAPSHOT</thymeleaf-extras-springsecurity3-version>
+		<tiles-version>2.2.2</tiles-version>
 	</properties>
 
   <repositories>
@@ -178,17 +179,34 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
+
 		<!-- Apache Tiles -->
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-core</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-api</artifactId>
-			<version>2.2.2</version>
+			<version>${tiles-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-template</artifactId>
+			<version>${tiles-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-servlet</artifactId>
+			<version>${tiles-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-jsp</artifactId>
+			<version>${tiles-version}</version>
+		</dependency>
+
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
 			<groupId>org.hibernate</groupId>

From 7fec97b1d54608ba0ebe1d111aea9eaa0069b14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 01:06:12 +0200
Subject: [PATCH 04/22] Applied Thymeleaf configuration

  * Applied Thymeleaf configuration and Template Engine creation
    to webmvc-config configuration file.
  * Made application run through Thymeleaf's own Tiles infrastructure.
---
 .../webapp/WEB-INF/config/webmvc-config.xml   | 36 +++++++++++++++++++
 .../webapp/WEB-INF/hotels/booking/views.xml   |  8 ++---
 .../src/main/webapp/WEB-INF/hotels/views.xml  | 12 +++----
 .../src/main/webapp/WEB-INF/layouts/views.xml |  6 ++--
 booking-mvc/src/main/webapp/WEB-INF/views.xml | 16 ++++-----
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 2d753ab..015df08 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -46,4 +46,40 @@
 	<!-- Custom FlowHandler for the hotel booking flow -->
 	<bean name="hotels/booking" class="org.springframework.webflow.samples.booking.BookingFlowHandler" />	
 		
+
+	<!-- Thymeleaf template resolver -->
+	<bean id="templateResolver"
+		  class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
+		<property name="prefix" value="/WEB-INF/" />
+		<property name="suffix" value=".html" />
+		<property name="templateMode" value="HTML5" />
+	</bean>
+
+	<!-- Thymeleaf Template Engine -->
+  	<bean id="templateEngine"
+		  class="org.thymeleaf.spring3.SpringTemplateEngine">
+		<property name="templateResolver" ref="templateResolver" />
+		<property name="additionalDialects">
+			<set>
+				<bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
+				<bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
+			</set>
+		</property>
+	</bean>
+
+	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
+	<bean id="tilesViewResolver" class="org.thymeleaf.spring3.view.AjaxThymeleafViewResolver">
+		<property name="viewClass" value="org.thymeleaf.extras.tiles2.spring.web.view.FlowAjaxThymeleafTilesView"/>
+		<property name="templateEngine" ref="templateEngine"/>
+	</bean>
+  
+	<!-- Configures the Tiles layout system using a specific thymeleaf-enabled Tiles Configurer -->
+	<bean id="tilesConfigurer" class="org.thymeleaf.extras.tiles2.spring.web.configurer.ThymeleafTilesConfigurer">
+		<property name="definitions">
+			<list>
+				<value>/WEB-INF/**/views.xml</value>
+			</list>
+		</property>
+	</bean>
+  	
 </beans>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index 3e1ee8b..dd3cb6d 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -5,12 +5,12 @@
 	
 <tiles-definitions>
 	
-	<definition name="enterBookingDetails" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp"/>
+	<definition name="enterBookingDetails" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp" type="jsp"/>
 	</definition>
 	
-	<definition name="reviewBooking" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" />
+	<definition name="reviewBooking" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/>
 	</definition>
 	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 42e7bc0..b3317e9 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -5,17 +5,17 @@
 	
 <tiles-definitions>
 	
-	<definition name="hotels/search" extends="standardLayout">
+	<definition name="hotels/search" extends="standardLayout" templateType="jsp">
 		<put-attribute name="body">
-			<definition template="/WEB-INF/hotels/search.jsp">
-				<put-attribute name="searchForm" value="/WEB-INF/hotels/searchForm.jsp" />
-				<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" />
+			<definition template="/WEB-INF/hotels/search.jsp" templateType="jsp">
+				<put-attribute name="searchForm" value="/WEB-INF/hotels/searchForm.jsp" type="jsp"/>
+				<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" type="jsp"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
-	<definition name="hotels/*" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" />
+	<definition name="hotels/*" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" type="jsp"/>
 	</definition>
 
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
index 0f94b92..a2a5039 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-       "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+       "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
+       "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
 
 <tiles-definitions>
 	
-	<definition name="standardLayout" template="/WEB-INF/layouts/standard.jsp" />
+	<definition name="standardLayout" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/>
 	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index 96200a1..f6c7327 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE tiles-definitions PUBLIC
-	"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-	"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+	"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
+	"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
 	
 <tiles-definitions>
 	
-	<definition name="intro" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/intro.jsp" />
+	<definition name="intro" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/intro.jsp" type="jsp"/>
 	</definition>
 	
-	<definition name="login" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/login.jsp" />
+	<definition name="login" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/login.jsp" type="jsp"/>
 	</definition>
 	
-	<definition name="logoutSuccess" extends="standardLayout">
-		<put-attribute name="body" value="/WEB-INF/logoutSuccess.jsp" />
+	<definition name="logoutSuccess" extends="standardLayout" templateType="jsp">
+		<put-attribute name="body" value="/WEB-INF/logoutSuccess.jsp" type="jsp"/>
 	</definition>
 	
 </tiles-definitions>

From d24f40ddf3dff97aaf9ffc2ca21355aeb23ac68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 01:11:33 +0200
Subject: [PATCH 05/22] Added log configuration entry for thymeleaf.

---
 booking-mvc/src/main/resources/log4j.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/booking-mvc/src/main/resources/log4j.xml b/booking-mvc/src/main/resources/log4j.xml
index b4e9ad1..a24fc28 100644
--- a/booking-mvc/src/main/resources/log4j.xml
+++ b/booking-mvc/src/main/resources/log4j.xml
@@ -38,7 +38,11 @@
 	<logger name="org.springframework.webflow">
 		<level value="debug" />
 	</logger>
-	
+
+	<logger name="org.thymeleaf">
+		<level value="debug" />
+	</logger>
+		
 	<!-- Root Logger -->
 	<root>
 		<priority value="warn" />

From 0e1a2453e0be0d44a803a0017c30fa6946582838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 13 Sep 2012 01:15:10 +0200
Subject: [PATCH 06/22] Added first Thymeleaf template to application
 (intro.html)

Also modified template resolver configuration to remove ".html"
suffix so that it is specified in Tiles definition names and therefore
is easy to differentiate in case when the HTML has the same name as a
definition (thus avoiding infinite recursion).
---
 .../webapp/WEB-INF/config/webmvc-config.xml   |  1 -
 .../src/main/webapp/WEB-INF/intro.html        | 29 +++++++++++++++++++
 booking-mvc/src/main/webapp/WEB-INF/views.xml |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/intro.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 015df08..fd03282 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -51,7 +51,6 @@
 	<bean id="templateResolver"
 		  class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
 		<property name="prefix" value="/WEB-INF/" />
-		<property name="suffix" value=".html" />
 		<property name="templateMode" value="HTML5" />
 	</bean>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
new file mode 100644
index 0000000..4212158
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -0,0 +1,29 @@
+<div xmlns:th="http://www.thymeleaf.org">
+	<h1>Welcome to Spring Travel</h1>
+	<p>
+	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
+	</p>
+	<hr/>
+	<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>Spring Expression Language (SpEL) integration</li>
+		<li>Spring 3 formatting annotations @DateTimeFormat, @NumberFormat</li>
+		<li>Spring MVC custom namespace</li>
+		<li>Spring Security integration</li>
+		<li>Annotated POJO @Controllers for implementing RESTful user interactions.</li>
+		<li>Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library</li>
+		<li>Page layout and composition with Apache Tiles</li>
+		<li>A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.</li>
+		<li>A grid layout with Blueprint CSS</li>
+		<li>Exception handling support across all layers of the application</li>
+		<li>SpringSource Tool Suite integration, with support for graphical flow modeling and visualization</li>
+	</ul>
+	<p>
+		<a href="hotels/search.html" th:href="@{/hotels/search}">Start your Spring Travel experience</a>
+	</p>
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index f6c7327..42aca64 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -6,7 +6,7 @@
 <tiles-definitions>
 	
 	<definition name="intro" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/intro.jsp" type="jsp"/>
+		<put-attribute name="body" value="intro.html"/>
 	</definition>
 	
 	<definition name="login" extends="standardLayout" templateType="jsp">

From 4545043fa52d2d94066067eae6a553a86eb602df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Fri, 14 Sep 2012 00:15:43 +0200
Subject: [PATCH 07/22] Added thymeleaf versions of "login" and "logoutSuccess"

---
 .../src/main/webapp/WEB-INF/login.html        | 84 +++++++++++++++++++
 .../main/webapp/WEB-INF/logoutSuccess.html    |  6 ++
 booking-mvc/src/main/webapp/WEB-INF/views.xml |  4 +-
 3 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/login.html
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html
new file mode 100644
index 0000000..93bfa2a
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/login.html
@@ -0,0 +1,84 @@
+
+<div class="span-5">
+	<p>Valid username/passwords are:</p>
+	<ul>
+		<li>keith/melbourne</li>
+		<li>erwin/leuven</li>
+		<li>jeremy/atlanta</li>
+		<li>scott/rochester</li>
+	</ul>
+</div>
+
+<div class="span-10 append-2 last" 
+     xmlns:th="http://www.thymeleaf.org"
+     th:with="lastUsernameKey=${T(org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter).SPRING_SECURITY_LAST_USERNAME_KEY},
+              lastExceptionKey=${T(org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter).SPRING_SECURITY_LAST_EXCEPTION_KEY}">
+
+	<div class="error" th:if="${param.login_error}">
+		Your login attempt was not successful, try again.<br /><br />
+		Reason: <span th:text="${session[__${lastExceptionKey}__].message}">Invalid password</span> 
+	</div>
+    
+	<form name="f" action="#" th:action="@{/loginProcess}" method="post">
+    
+		<fieldset>
+        
+			<legend>Login Information</legend>
+            
+			<p>
+				<label for="j_username">User:</label>
+				<br />
+				<input type="text" name="j_username" id="j_username"
+                       th:value="${param.login_error} ? ${session[__${lastUsernameKey}__]} : ''" />
+			</p>
+            
+			<script type="text/javascript">
+  			    // <![CDATA[
+				    Spring.addDecoration(new Spring.ElementDecoration({
+					    elementId : "j_username",
+					    widgetType : "dijit.form.ValidationTextBox",
+					    widgetAttrs : { required : true }}));
+			    // ]]>
+			</script>
+            
+			<p>
+				<label for="j_password">Password:</label>
+				<br />
+				<input type="password" name="j_password" id="j_password" />
+			</p>
+            
+			<script type="text/javascript">
+			    // <![CDATA[
+				    Spring.addDecoration(new Spring.ElementDecoration({
+					    elementId : "j_password",
+					    widgetType : "dijit.form.ValidationTextBox",
+					    widgetAttrs : { required : true}}));
+			    // ]]>
+			</script>
+            
+			<p>
+				<input type="checkbox" name="_spring_security_remember_me" id="remember_me" />
+				<label for="remember_me">Don't ask for my password for two weeks:</label>
+			</p>
+            
+			<script type="text/javascript">
+		        // <![CDATA[
+				    Spring.addDecoration(new Spring.ElementDecoration({
+					    elementId : "remember_me",
+					    widgetType : "dijit.form.CheckBox"}));
+				// ]]>
+			</script>
+            
+			<p>
+				<button id="submit" type="submit">Login</button>
+				<script type="text/javascript">
+					Spring.addDecoration(
+					        new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
+				</script>
+			</p>
+            
+		</fieldset>
+        
+	</form>
+    
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
new file mode 100644
index 0000000..85eee8e
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
@@ -0,0 +1,6 @@
+<div xmlns:th="http://www.thymeleaf.org">
+	<h1>Logout</h1>
+	<p>You have successfully logged out.</p>
+	<hr />
+	<p><a href="hotels/searchForm.html" th:href="@{/hotels/search}">Continue</a></p>
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index 42aca64..6aecbaa 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -10,11 +10,11 @@
 	</definition>
 	
 	<definition name="login" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/login.jsp" type="jsp"/>
+		<put-attribute name="body" value="login.html"/>
 	</definition>
 	
 	<definition name="logoutSuccess" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/logoutSuccess.jsp" type="jsp"/>
+		<put-attribute name="body" value="logoutSuccess.html"/>
 	</definition>
 	
 </tiles-definitions>

From c7500200b9895e47b9b2ebab311ff2cff79c1a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Fri, 14 Sep 2012 01:04:24 +0200
Subject: [PATCH 08/22] Created Standard Layout in thymeleaf.

---
 .../main/webapp/WEB-INF/layouts/standard.html | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
new file mode 100644
index 0000000..c91dc1a
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+	<link type="text/css" rel="stylesheet" href="#" th:href="@{/resources/dijit/themes/tundra/tundra.css}" />
+	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
+	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
+	<!--[if lt IE 8]>
+	        <link rel="stylesheet" href="<c:url value="/resources/blueprint/ie.css" />" type="text/css" media="screen, projection" />
+	<![endif]-->
+	<link rel="stylesheet" href="#" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />
+    <script type="text/javascript" src="#" th:src="@{/resources/dojo/dojo.js}"></script>
+    <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring.js}"></script>
+    <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring-Dojo.js}"></script>
+</head>
+
+<body class="tundra">
+
+<div id="page" class="container">
+	<div id="header">
+		<div id="topbar">
+			<p>
+				<security:authorize ifAllGranted="ROLE_USER">
+					<c:if test="${pageContext.request.userPrincipal != null}">
+						Welcome, ${pageContext.request.userPrincipal.name} |
+					</c:if>
+					<a href="<c:url value="/logout" />">Logout</a>
+				</security:authorize>
+				<security:authorize ifAllGranted="ROLE_ANONYMOUS">
+					<a href="<c:url value="/login" />">Login</a>
+				</security:authorize>
+			</p>
+		</div>
+		<div id="logo">
+			<p>
+				<a href="<c:url value="/" />">
+					<img src="<c:url value="/resources/images/header.jpg"/>" alt="Spring Travel" />
+				</a>
+			</p>
+		</div>
+	</div>
+	<div id="content">
+		<div id="local" class="span-6">
+			<p>
+				<a href="http://www.thespringexperience.com">
+					<img src="<c:url value="/resources/images/diplomat.jpg"/>" alt="generic hotel" />
+				</a>
+			</p>
+			<p>
+				<a href="http://www.thespringexperience.com">
+					<img src="<c:url value="/resources/images/springone2gx.jpeg"/>" alt="SpringOne 2GX" />
+				</a>
+			</p>
+		</div>
+		<div id="main" class="span-18 last">
+			<tiles:insertAttribute name="body" />
+		</div>
+	</div>
+	<hr />
+	<div id="footer">
+		<a href="http://www.springframework.org">
+			<img src="<c:url value="/resources/images/powered-by-spring.png"/>" alt="Powered by Spring" />
+		</a>
+	</div>
+</div>
+</body>
+</html>
\ No newline at end of file

From d00d53793eee0c664a101112324d3ff2e244a3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Wed, 19 Dec 2012 03:07:23 +0100
Subject: [PATCH 09/22] Added dependency to
 thymeleaf-extras-conditionalcomments

---
 booking-mvc/pom.xml                           |  7 ++++---
 booking-mvc/src/main/resources/log4j.xml      |  2 +-
 .../webapp/WEB-INF/config/webmvc-config.xml   | 21 ++++++++++---------
 .../src/main/webapp/WEB-INF/intro.html        |  6 ++++++
 .../main/webapp/WEB-INF/layouts/standard.html |  1 +
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 211dcf7..bfdb618 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -13,9 +13,10 @@
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
 		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
-		<thymeleaf-version>2.0.14-SNAPSHOT</thymeleaf-version>
-		<thymeleaf-extras-tiles2-version>1.0.0-beta3-SNAPSHOT</thymeleaf-extras-tiles2-version>
-		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2-SNAPSHOT</thymeleaf-extras-springsecurity3-version>
+		<thymeleaf-version>2.0.15</thymeleaf-version>
+		<thymeleaf-extras-tiles2-version>1.0.0-beta3</thymeleaf-extras-tiles2-version>
+		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2</thymeleaf-extras-springsecurity3-version>
+		<thymeleaf-extras-conditionalcomments-version>1.0.0-beta1</thymeleaf-extras-conditionalcomments-version>
 		<tiles-version>2.2.2</tiles-version>
 	</properties>
 
diff --git a/booking-mvc/src/main/resources/log4j.xml b/booking-mvc/src/main/resources/log4j.xml
index a24fc28..d8ab4b0 100644
--- a/booking-mvc/src/main/resources/log4j.xml
+++ b/booking-mvc/src/main/resources/log4j.xml
@@ -40,7 +40,7 @@
 	</logger>
 
 	<logger name="org.thymeleaf">
-		<level value="debug" />
+		<level value="info" />
 	</logger>
 		
 	<!-- Root Logger -->
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index fd03282..ce2e8da 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -55,16 +55,17 @@
 	</bean>
 
 	<!-- Thymeleaf Template Engine -->
-  	<bean id="templateEngine"
-		  class="org.thymeleaf.spring3.SpringTemplateEngine">
-		<property name="templateResolver" ref="templateResolver" />
-		<property name="additionalDialects">
-			<set>
-				<bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
-				<bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
-			</set>
-		</property>
-	</bean>
+    <bean id="templateEngine"
+          class="org.thymeleaf.spring3.SpringTemplateEngine">
+        <property name="templateResolver" ref="templateResolver" />
+        <property name="additionalDialects">
+            <set>
+                <bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
+                <bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
+                <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
+            </set>
+        </property>
+    </bean>
 
 	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
 	<bean id="tilesViewResolver" class="org.thymeleaf.spring3.view.AjaxThymeleafViewResolver">
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index 4212158..66b4cca 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -1,4 +1,10 @@
 <div xmlns:th="http://www.thymeleaf.org">
+    <!-- Following this, we will see a conditional comment! -->
+    <!--[if lt IE 8]>
+            <link rel="stylesheet" href="/resources/blueprint/ie.css" type="text/css" media="screen, projection">
+              <p>
+    <![endif]-->
+
 	<h1>Welcome to Spring Travel</h1>
 	<p>
 	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index c91dc1a..3441a74 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -8,6 +8,7 @@
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
 	<!--[if lt IE 8]>
+    
 	        <link rel="stylesheet" href="<c:url value="/resources/blueprint/ie.css" />" type="text/css" media="screen, projection" />
 	<![endif]-->
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />

From 72402f6f2d2d17066a1d0c8a7c8344dba37dfb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Wed, 19 Dec 2012 20:55:03 +0100
Subject: [PATCH 10/22] Thymeleaf-ied layout and several JSP pages.

---
 .../webapp/WEB-INF/config/security-config.xml |  4 +-
 .../main/webapp/WEB-INF/hotels/search.html    |  4 ++
 .../webapp/WEB-INF/hotels/searchForm.html     | 35 +++++++++++++++
 .../src/main/webapp/WEB-INF/hotels/views.xml  |  8 ++--
 .../src/main/webapp/WEB-INF/intro.html        |  6 ---
 .../main/webapp/WEB-INF/layouts/standard.html | 45 +++++++++----------
 .../src/main/webapp/WEB-INF/layouts/views.xml |  2 +-
 booking-mvc/src/main/webapp/WEB-INF/views.xml | 12 ++---
 8 files changed, 74 insertions(+), 42 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
index cd84b62..12c2945 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml
@@ -7,7 +7,7 @@
            http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
 	<!-- Configure Spring Security -->
-	<security:http auto-config="true">
+	<security:http auto-config="true" use-expressions="true">
 		<security:form-login login-page="/login" login-processing-url="/loginProcess" 
 			default-target-url="/hotels/search" authentication-failure-url="/login?login_error=1" />
 		<security:logout logout-url="/logout" logout-success-url="/logoutSuccess" />
@@ -34,4 +34,4 @@
 		</security:authentication-provider>
 	</security:authentication-manager>
 	
-</beans>
+</beans>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
new file mode 100644
index 0000000..008e71a
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -0,0 +1,4 @@
+
+<div tiles:include="searchForm"></div>
+
+<div tiles:include="bookingsTable"></div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
new file mode 100644
index 0000000..5054fea
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
@@ -0,0 +1,35 @@
+<h1>Search Hotels</h1>
+
+<form action="#" th:object="${searchCriteria}" th:action="@{/hotels}" method="get" cssClass="inline">
+
+    <ul th:if="${#fields.hasErrors('*')}" class="errors span-18">
+        <li th:each="err : ${#fields.errors('*')}" th:text="${err}">Input is incorrect</li>
+    </ul>
+
+	<fieldset>
+		<div class="span-8">
+			<label for="searchString">Search String:</label>
+			<input type="text" id="searchString" th:field="*{searchString}" />
+			<script type="text/javascript">
+				Spring.addDecoration(new Spring.ElementDecoration({
+					elementId : "searchString",
+					widgetType : "dijit.form.ValidationTextBox",
+					widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
+			</script>
+		</div>
+		<div class="span-6">
+			<div>
+				<label for="pageSize">Maximum results:</label>
+				<select id="pageSize" th:field="*{pageSize}">
+					<option label="5" value="5"/>
+					<option label="10" value="10"/>
+					<option label="20" value="20"/>
+				</select>
+			</div>
+		</div>
+		<div class="span-3 last">
+			<button type="submit">Find Hotels</button>
+		</div>		
+    </fieldset>
+    
+</form>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index b3317e9..0520de3 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -5,16 +5,16 @@
 	
 <tiles-definitions>
 	
-	<definition name="hotels/search" extends="standardLayout" templateType="jsp">
+	<definition name="hotels/search" extends="standardLayout">
 		<put-attribute name="body">
-			<definition template="/WEB-INF/hotels/search.jsp" templateType="jsp">
-				<put-attribute name="searchForm" value="/WEB-INF/hotels/searchForm.jsp" type="jsp"/>
+			<definition template="hotels/search.html" templateType="thymeleaf">
+				<put-attribute name="searchForm" value="hotels/searchForm.html" type="thymeleaf"/>
 				<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" type="jsp"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
-	<definition name="hotels/*" extends="standardLayout" templateType="jsp">
+	<definition name="hotels/*" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" type="jsp"/>
 	</definition>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index 66b4cca..4212158 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -1,10 +1,4 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <!-- Following this, we will see a conditional comment! -->
-    <!--[if lt IE 8]>
-            <link rel="stylesheet" href="/resources/blueprint/ie.css" type="text/css" media="screen, projection">
-              <p>
-    <![endif]-->
-
 	<h1>Welcome to Spring Travel</h1>
 	<p>
 	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index 3441a74..3ba6db6 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -1,17 +1,20 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
 	<link type="text/css" rel="stylesheet" href="#" th:href="@{/resources/dijit/themes/tundra/tundra.css}" />
-	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
-	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
+	<link rel="stylesheet" href="../../styles/blueprint/screen.css" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
+	<link rel="stylesheet" href="../../styles/blueprint/print.css" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
 	<!--[if lt IE 8]>
-    
-	        <link rel="stylesheet" href="<c:url value="/resources/blueprint/ie.css" />" type="text/css" media="screen, projection" />
+	        <link rel="stylesheet" href="../../styles/blueprint/ie.css" th:href="@{/resources/styles/blueprint/ie.css}" type="text/css" media="screen, projection" />
 	<![endif]-->
-	<link rel="stylesheet" href="#" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />
+	<link rel="stylesheet" href="../../styles/booking.css" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />
     <script type="text/javascript" src="#" th:src="@{/resources/dojo/dojo.js}"></script>
     <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring.js}"></script>
     <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring-Dojo.js}"></script>
@@ -22,22 +25,18 @@
 <div id="page" class="container">
 	<div id="header">
 		<div id="topbar">
-			<p>
-				<security:authorize ifAllGranted="ROLE_USER">
-					<c:if test="${pageContext.request.userPrincipal != null}">
-						Welcome, ${pageContext.request.userPrincipal.name} |
-					</c:if>
-					<a href="<c:url value="/logout" />">Logout</a>
-				</security:authorize>
-				<security:authorize ifAllGranted="ROLE_ANONYMOUS">
-					<a href="<c:url value="/login" />">Login</a>
-				</security:authorize>
+			<p sec:authorize="hasRole('ROLE_USER')" th:if="${#authentication}">
+				Welcome, <span sec:authentication="name">Dear User</span> |
+				<a href="#" th:href="@{/logout}">Logout</a>
+			</p>
+			<p sec:authorize="hasRole('ROLE_ANONYMOUS')">
+				<a href="#" th:href="@{/login}">Login</a>
 			</p>
 		</div>
 		<div id="logo">
 			<p>
-				<a href="<c:url value="/" />">
-					<img src="<c:url value="/resources/images/header.jpg"/>" alt="Spring Travel" />
+				<a href="#" th:href="@{/}">
+					<img src="../../images/header.jpg" th:src="@{/resources/images/header.jpg}" alt="Spring Travel" />
 				</a>
 			</p>
 		</div>
@@ -46,23 +45,23 @@
 		<div id="local" class="span-6">
 			<p>
 				<a href="http://www.thespringexperience.com">
-					<img src="<c:url value="/resources/images/diplomat.jpg"/>" alt="generic hotel" />
+					<img src="../../images/diplomat.jpg" th:src="@{/resources/images/diplomat.jpg}" alt="generic hotel" />
 				</a>
 			</p>
 			<p>
 				<a href="http://www.thespringexperience.com">
-					<img src="<c:url value="/resources/images/springone2gx.jpeg"/>" alt="SpringOne 2GX" />
+					<img src="../../images/springone2gx.jpeg" th:src="@{/resources/images/springone2gx.jpeg}" alt="SpringOne 2GX" />
 				</a>
 			</p>
 		</div>
-		<div id="main" class="span-18 last">
-			<tiles:insertAttribute name="body" />
+		<div id="main" class="span-18 last" tiles:include="body">
+          Body here...
 		</div>
 	</div>
 	<hr />
 	<div id="footer">
 		<a href="http://www.springframework.org">
-			<img src="<c:url value="/resources/images/powered-by-spring.png"/>" alt="Powered by Spring" />
+			<img src="../../images/powered-by-spring.png" th:src="@{/resources/images/powered-by-spring.png}" alt="Powered by Spring" />
 		</a>
 	</div>
 </div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
index a2a5039..c09aca8 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
@@ -5,6 +5,6 @@
 
 <tiles-definitions>
 	
-	<definition name="standardLayout" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/>
+    <definition name="standardLayout" template="layouts/standard.html" templateType="thymeleaf"/>
 	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index 6aecbaa..827999f 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -5,16 +5,16 @@
 	
 <tiles-definitions>
 	
-	<definition name="intro" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="intro.html"/>
+	<definition name="intro" extends="standardLayout">
+		<put-attribute name="body" value="intro.html" type="thymeleaf"/>
 	</definition>
 	
-	<definition name="login" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="login.html"/>
+	<definition name="login" extends="standardLayout">
+		<put-attribute name="body" value="login.html" type="thymeleaf"/>
 	</definition>
 	
-	<definition name="logoutSuccess" extends="standardLayout" templateType="jsp">
-		<put-attribute name="body" value="logoutSuccess.html"/>
+	<definition name="logoutSuccess" extends="standardLayout">
+		<put-attribute name="body" value="logoutSuccess.html" type="thymeleaf"/>
 	</definition>
 	
 </tiles-definitions>

From 60581276a7d340c8b57d31809a776a260ae00d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Mon, 24 Dec 2012 03:08:04 +0100
Subject: [PATCH 11/22] Added bookingsTable.html, reconfigured JSP layout for
 old pages.

---
 .../webapp/WEB-INF/hotels/booking/views.xml   |  4 +-
 .../webapp/WEB-INF/hotels/bookingsTable.html  | 38 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/hotels/views.xml  |  4 +-
 .../src/main/webapp/WEB-INF/layouts/views.xml |  3 +-
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index dd3cb6d..6350717 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -5,11 +5,11 @@
 	
 <tiles-definitions>
 	
-	<definition name="enterBookingDetails" extends="standardLayout" templateType="jsp">
+	<definition name="enterBookingDetails" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp" type="jsp"/>
 	</definition>
 	
-	<definition name="reviewBooking" extends="standardLayout" templateType="jsp">
+	<definition name="reviewBooking" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/>
 	</definition>
 	
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
new file mode 100644
index 0000000..a2e80ca
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
@@ -0,0 +1,38 @@
+<div id="bookings" sec:authorize="hasRole('ROLE_USER')">
+
+	<h2>Current Hotel Bookings</h2>
+
+	<p th:unless="${bookingList}">
+		No bookings found
+	</p>
+
+	<table class="summary" th:if="${bookingList}">
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Address</th>
+				<th>City, State</th>
+				<th>Check in Date</th>
+				<th>Check out Date</th>
+				<th>Confirmation Number</th>
+				<th>Action</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr th:each="booking : ${bookingList}" th:object="${booking}">
+				<td th:text="*{hotel.name}">The Herb Plaza</td>
+				<td th:text="*{hotel.address}">Thyme Square, 13</td>
+				<td th:text="*{hotel.city} + ', ' + *{hotel.state}">Icetown, North Pole</td>
+				<td th:text="*{checkinDate}">2012-12-21</td>
+				<td th:text="*{checkoutDate}">2012-12-21</td>
+				<td th:text="*{id}">1</td>
+				<td>
+                    <form action="#" th:action="@{'/bookings/' + *{id}}" th:method="'delete'">
+                        <button type="submit">Cancel</button>
+                    </form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+    
+</div>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 0520de3..9f8de24 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -9,12 +9,12 @@
 		<put-attribute name="body">
 			<definition template="hotels/search.html" templateType="thymeleaf">
 				<put-attribute name="searchForm" value="hotels/searchForm.html" type="thymeleaf"/>
-				<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" type="jsp"/>
+				<put-attribute name="bookingsTable" value="hotels/bookingsTable.html" type="thymeleaf"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
-	<definition name="hotels/*" extends="standardLayout">
+	<definition name="hotels/*" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" type="jsp"/>
 	</definition>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
index c09aca8..5ebccd9 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
@@ -6,5 +6,6 @@
 <tiles-definitions>
 	
     <definition name="standardLayout" template="layouts/standard.html" templateType="thymeleaf"/>
-	
+    <definition name="standardLayoutJSP" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/>
+    	
 </tiles-definitions>

From 196ec3ce141a841f9c67c71a5dbc88da4194e8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Wed, 26 Dec 2012 00:14:17 +0100
Subject: [PATCH 12/22] Added list and show pages

---
 .../src/main/webapp/WEB-INF/hotels/list.html  | 70 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/hotels/show.html  | 19 +++++
 2 files changed, 89 insertions(+)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/show.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
new file mode 100644
index 0000000..9b0bf73
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -0,0 +1,70 @@
+
+<h1>Hotel Results</h1>
+<p>
+	<a id="changeSearchLink" href="#" 
+       th:href="@{hotels/search(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize})}">Change Search</a>
+	<script type="text/javascript">
+		Spring.addDecoration(new Spring.AjaxEventDecoration({
+			elementId: "changeSearchLink",
+			event: "onclick",
+			popup: true,
+			params: {fragments: "searchForm"}		
+		}));
+	</script>
+</p>
+<div id="hotelResults">
+  <div th:if="${hotelList}">
+	<table class="summary">
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Address</th>
+				<th>City, State</th>
+				<th>Zip</th>
+				<th>Action</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr th:each="hotel : ${hotelList}">
+				<td th:text="${hotel.name}">The Herb Plaza</td>
+				<td th:text="${hotel.address}">Thyme Square, 13</td>
+				<td th:text="${hotel.city} + ', ' + ${hotel.state} + ', ' + ${hotel.country}">Icetown, North Pole, Earth</td>
+				<td th:text="${hotel.zip}">0W</td>
+				<td><a href="#" th:href="@{'hotels/' + ${hotel.id}}">View Hotel</a></td>
+			</tr>
+			<tr th:unless="${hotelList}">
+				<td colspan="5">No hotels found</td>
+			</tr>
+		</tbody>
+	</table>
+	<div class="buttonGroup">
+		<div class="span-3">
+			<div th:if="${searchCriteria.page > 0}">
+                <a id="prevResultsLink" href="#" 
+                   th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page - 1})}">Previous Results</a>
+				<script type="text/javascript">
+					Spring.addDecoration(new Spring.AjaxEventDecoration({
+						elementId: "prevResultsLink",
+						event: "onclick",
+						params: {fragments: "body"}
+					}));
+				</script>
+			</div>
+		</div>
+		<div class="span-3 append-12 last">
+			<div th:if="${hotelList} and ${hotelList.size() == searchCriteria.pageSize}">
+				<a id="moreResultsLink" href="#" 
+                   th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page + 1})}">More Results</a>
+				<script type="text/javascript">
+					Spring.addDecoration(new Spring.AjaxEventDecoration({
+						elementId: "moreResultsLink",
+						event: "onclick",
+						params: {fragments: "body"}		
+					}));
+				</script>
+			</div>		
+		</div>
+	</div>
+  </div>
+</div>	
+
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
new file mode 100644
index 0000000..2554d44
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
@@ -0,0 +1,19 @@
+<h1 th:text="${hotel.name}">The Herb Plaza</h1>
+<address>
+	<span th:text="${hotel.address}">Thyme Square, 13</span>
+	<br />
+	<span th:text="${hotel.city}">Icetown</span>, 
+    <span th:text="${hotel.state}">North Pole</span>, 
+    <span th:text="${hotel.zip}">0W</span>
+	<br />
+	<span th:text="${hotel.country}">Earth</span>
+</address>
+<form action="booking?mode=embedded" method="get">
+	<p>
+		Nightly Rate: <span th:text="${hotel.price}">4,300</span>
+	</p>
+	<input type="hidden" name="hotelId" th:value="${hotel.id}" />
+	<div>
+		<button type="submit">Book Hotel</button>
+	</div>
+</form>

From 880586585b4ed1ab439382515aea44b25f656843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Wed, 26 Dec 2012 23:40:27 +0100
Subject: [PATCH 13/22] Converted booking flow to thymeleaf.

---
 .../hotels/booking/enterBookingDetails.html   | 200 ++++++++++++++++++
 .../WEB-INF/hotels/booking/messages.html      |   6 +
 .../WEB-INF/hotels/booking/reviewBooking.html |  74 +++++++
 .../webapp/WEB-INF/hotels/booking/views.xml   |  13 +-
 .../src/main/webapp/WEB-INF/hotels/views.xml  |   8 +-
 .../src/main/webapp/WEB-INF/layouts/views.xml |   4 +-
 booking-mvc/src/main/webapp/WEB-INF/views.xml |   6 +-
 7 files changed, 297 insertions(+), 14 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
new file mode 100644
index 0000000..0a1700e
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -0,0 +1,200 @@
+
+<div id="bookingForm">
+
+	<div class="span-5">
+    
+		<h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
+		
+        <address th:object="${booking.hotel}">
+            <span th:text="*{address}">Thyme Square, 13</span>
+            <br />
+            <span th:text="*{city}">Icetown</span>, 
+            <span th:text="*{state}">North Pole</span>, 
+            <span th:text="*{zip}">0W</span>
+            <br />
+            <span th:text="*{country}">Earth</span>
+        </address>
+        
+		<p>
+			Nightly rate: <span th:text="${booking.hotel.price}">400.00</span>
+		</p>
+        
+	</div>
+    
+	<div class="span-12">
+    
+        <form id="booking" action="#" th:object="${booking}" th:action="${flowExecutionUrl}" method="post">
+
+            <div class="error" th:if="${#fields.hasErrors('*')}">
+                <span th:each="err : ${#fields.errors('*')}" th:text="${err} + '&lt;br /&gt;'">Input is incorrect</span>
+            </div>
+        
+			<fieldset>
+				<legend>Book Hotel</legend>
+		        <div>
+					<div class="span-4">
+						<label for="checkinDate">Check In:</label>
+					</div>
+					<div class="span-7 last">
+						<p><input type="text" th:field="*{checkinDate}" /></p>
+						<script type="text/javascript">
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : "checkinDate",
+								widgetType : "dijit.form.DateTextBox",
+								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
+						</script>
+						
+					</div>
+				</div>
+				<div>
+					<div class="span-4">
+						<label for="checkoutDate">Check Out:</label>
+					</div>
+					<div class="span-7 last">
+						<p><input type="text" th:field="*{checkoutDate}" /></p>
+						<script type="text/javascript">
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : "checkoutDate",
+								widgetType : "dijit.form.DateTextBox",
+								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
+						</script>
+					</div>
+				</div>
+				<div>
+					<div class="span-4">
+						<label for="beds">Room Preference:</label>
+					</div>
+					<div class="span-7 last">
+						<p>
+							<select th:field="*{beds}">
+								<option label="One king-size bed" value="1" />
+								<option label="Two double beds" value="2" />
+								<option label="Three beds" value="3" />
+							</select>
+						</p>
+					</div>
+				</div>
+				<div>
+					<div class="label span-4">
+						Smoking Preference:
+					</div>
+					<div id="radio" class="span-7 last">
+						<p>
+							<input type="radio" id="smoking" th:field="*{smoking}" value="true" /><label for="smoking">Smoking</label>
+                            <input type="radio" id="non-smoking" th:field="*{smoking}" value="false" /><label for="non-smoking">Non Smoking</label>
+						</p>
+						<script type="text/javascript">
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : 'smoking',
+								widgetType : "dijit.form.RadioButton",
+								widgetModule : "dijit.form.CheckBox",
+								widgetAttrs : { value : "true" }
+							}));
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : 'non-smoking',
+								widgetType : "dijit.form.RadioButton",
+								widgetModule : "dijit.form.CheckBox",
+								widgetAttrs : { value : "false" }
+							}));
+						</script>
+					</div>
+				</div>
+				<div>
+					<div class="label span-4">
+						Amenities:
+					</div>
+					<div id="amenities" class="span-7 last">
+						<p>
+                            <input type="checkbox" th:field="*{amenities}" value="OCEAN_VIEW" /><label th:for="${#ids.prev('amenities')}">Ocean View</label>
+							<br />
+                            <input type="checkbox" th:field="*{amenities}" value="LATE_CHECKOUT" /><label th:for="${#ids.prev('amenities')}">Late Checkout</label>
+							<br />
+                            <input type="checkbox" th:field="*{amenities}" value="MINIBAR" /><label th:for="${#ids.prev('amenities')}">Minibar</label>
+						</p>
+						<script type="text/javascript">
+							dojo.query("#amenities input[type='checkbox']").forEach(function(element){
+								Spring.addDecoration(new Spring.ElementDecoration({
+									elementId: element.id,
+									widgetType : "dijit.form.CheckBox",
+									widgetAttrs : { checked : element.checked }
+								}));
+							});
+						</script>
+					</div>
+				</div>
+				<div>
+					<div class="span-4">
+						<label for="creditCard">Credit Card #:</label>
+					</div>
+					<div class="span-7 last">
+						<p><input type="text" th:field="*{creditCard}" /></p>
+						<script type="text/javascript">
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : "creditCard",
+								widgetType : "dijit.form.ValidationTextBox",
+								widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
+								regExp : "[0-9]{16}"  }}));
+						</script>
+					</div>
+				</div>
+				<div>
+					<div class="span-4">
+						<label for="creditCardName">Credit Card Name:</label>
+					</div>
+					<div class="span-7 last">
+                        <p><input type="text" th:field="*{creditCardName}" maxlength="40" /></p>
+						<script type="text/javascript">
+							Spring.addDecoration(new Spring.ElementDecoration({
+								elementId : "creditCardName",
+								widgetType : "dijit.form.ValidationTextBox",
+								widgetAttrs : { required : true }}));
+						</script>
+					</div>
+				</div>
+				<div>
+					<div class="span-4">
+						<label for="creditCardExpiryMonth">Expiration Date:</label>
+					</div>
+					<div class="span-7 last">
+						<p>
+							<select th:field="*{creditCardExpiryMonth}">
+								<option value="1">Jan</option>
+								<option value="2">Feb</option>
+								<option value="3">Mar</option>
+								<option value="4">Apr</option>
+								<option value="5">May</option>
+								<option value="6">Jun</option>
+								<option value="7">Jul</option>
+								<option value="8">Aug</option>
+								<option value="9">Sep</option>
+								<option value="10">Oct</option>
+								<option value="11">Nov</option>
+								<option value="12">Dec</option>
+							</select>
+							<select th:field="*{creditCardExpiryYear}">
+								<option value="1">2008</option>
+								<option value="2">2009</option>
+								<option value="3">2010</option>
+								<option value="4">2011</option>
+								<option value="5">2012</option>
+							</select>
+						</p>
+					</div>
+				</div>
+				<div>
+					<p>
+					<button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
+					<button type="submit" name="_eventId_cancel" >Cancel</button>
+					</p>
+					<script type="text/javascript">
+						Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
+						Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));
+					</script>
+				</div>
+			</fieldset>
+            
+		</form>
+        	
+	</div>
+    
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
new file mode 100644
index 0000000..4fb9fcd
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
@@ -0,0 +1,6 @@
+
+<div id="messages">
+    <ul th:if="${#fields.hasErrors('*')}" class="errors">
+        <li th:each="err : ${#fields.errors('*')}" th:text="${err}">Input is incorrect</li>
+    </ul>
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
new file mode 100644
index 0000000..8b0886f
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -0,0 +1,74 @@
+<div id="bookingForm">
+
+	<div class="span-5">
+    
+		<h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
+		
+        <address th:object="${booking.hotel}">
+            <span th:text="*{address}">Thyme Square, 13</span>
+            <br />
+            <span th:text="*{city}">Icetown</span>, 
+            <span th:text="*{state}">North Pole</span>, 
+            <span th:text="*{zip}">0W</span>
+            <br />
+            <span th:text="*{country}">Earth</span>
+        </address>
+
+	</div>
+    
+	<div class="span-12 last">
+    
+		<form id="confirm" action="#" method="post" th:object="${booking}" th:action="${flowExecutionUrl}">
+        
+    		<fieldset>
+            
+    			<legend>Confirm Booking Details</legend>
+                
+    			<div>
+    				<div class="span-3">Check In:</div>
+    				<div class="span-8 last">
+    					<p th:text="*{checkinDate}">2012-12-21</p>
+    				</div>
+    			</div>
+    			<div>
+    				<div class="span-3">Checkout:</div>
+    				<div class="span-8 last">
+                        <p th:text="*{checkoutDate}">2012-12-21</p>
+    				</div>
+    			</div>
+    	        <div>
+    	            <div class="span-3">Number of Nights:</div>
+    	            <div class="span-8 last">
+                        <p th:text="*{nights}">0</p>
+    	            </div>
+    	        </div>
+    	        <div>
+    	            <div class="span-3">Total Payment:</div>
+    	            <div class="span-8 last">
+                        <p th:text="*{total}">400.00</p>
+    	            </div>
+    	        </div>
+    			<div>
+    				<div class="span-3">Credit Card #:</div>
+    				<div class="span-8 last">
+                        <p th:text="*{creditCard}">1234123412341234</p>
+    				</div>
+    			</div>
+    			<div>
+    				<p>
+    					<button type="submit" name="_eventId_confirm">Confirm</button>
+    					<button type="submit" name="_eventId_revise" id="revise">Revise</button>
+    					<button type="submit" name="_eventId_cancel">Cancel</button>
+    				</p>
+    				<script type="text/javascript">
+    					Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
+    				</script>
+    			</div>
+                
+    		</fieldset>
+        
+		</form>
+        
+	</div>
+
+</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index 6350717..413de56 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -5,12 +5,15 @@
 	
 <tiles-definitions>
 	
-	<definition name="enterBookingDetails" extends="standardLayoutJSP" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp" type="jsp"/>
+	<definition name="enterBookingDetails" extends="standardLayout" templateType="thymeleaf">
+		<put-attribute name="body" value="/hotels/booking/enterBookingDetails.html" type="thymeleaf"/>
 	</definition>
-	
-	<definition name="reviewBooking" extends="standardLayoutJSP" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/>
+
+	<definition name="reviewBooking" extends="standardLayout" templateType="thymeleaf">
+		<put-attribute name="body" value="/hotels/booking/reviewBooking.html" type="thymeleaf"/>
 	</definition>
+<!--     <definition name="reviewBooking" extends="standardLayoutJSP" templateType="jsp"> -->
+<!--         <put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/> -->
+<!--     </definition> -->
 	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 9f8de24..f8a7bdd 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -8,14 +8,14 @@
 	<definition name="hotels/search" extends="standardLayout">
 		<put-attribute name="body">
 			<definition template="hotels/search.html" templateType="thymeleaf">
-				<put-attribute name="searchForm" value="hotels/searchForm.html" type="thymeleaf"/>
-				<put-attribute name="bookingsTable" value="hotels/bookingsTable.html" type="thymeleaf"/>
+				<put-attribute name="searchForm" value="/hotels/searchForm.html" type="thymeleaf"/>
+				<put-attribute name="bookingsTable" value="/hotels/bookingsTable.html" type="thymeleaf"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
-	<definition name="hotels/*" extends="standardLayoutJSP" templateType="jsp">
-		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" type="jsp"/>
+	<definition name="hotels/*" extends="standardLayout" templateType="thymeleaf">
+		<put-attribute name="body" value="/hotels/{1}.html" type="thymeleaf"/>
 	</definition>
 
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
index 5ebccd9..aa4d2da 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
@@ -5,7 +5,7 @@
 
 <tiles-definitions>
 	
-    <definition name="standardLayout" template="layouts/standard.html" templateType="thymeleaf"/>
-    <definition name="standardLayoutJSP" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/>
+    <definition name="standardLayout" template="/layouts/standard.html" templateType="thymeleaf"/>
+<!--     <definition name="standardLayoutJSP" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/> -->
     	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index 827999f..b96d524 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -6,15 +6,15 @@
 <tiles-definitions>
 	
 	<definition name="intro" extends="standardLayout">
-		<put-attribute name="body" value="intro.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/intro.html" type="thymeleaf"/>
 	</definition>
 	
 	<definition name="login" extends="standardLayout">
-		<put-attribute name="body" value="login.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/login.html" type="thymeleaf"/>
 	</definition>
 	
 	<definition name="logoutSuccess" extends="standardLayout">
-		<put-attribute name="body" value="logoutSuccess.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/logoutSuccess.html" type="thymeleaf"/>
 	</definition>
 	
 </tiles-definitions>

From 7ff65c47e3edd232a178aefe34215e4c14fc6850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Thu, 27 Dec 2012 02:25:42 +0100
Subject: [PATCH 14/22] Small markup fixes.

---
 .../hotels/booking/enterBookingDetails.html   | 22 +++++++++++++++----
 .../WEB-INF/hotels/booking/reviewBooking.html |  2 ++
 .../src/main/webapp/WEB-INF/hotels/list.html  | 12 ++++++++++
 .../main/webapp/WEB-INF/hotels/search.html    |  4 ++--
 .../webapp/WEB-INF/hotels/searchForm.html     |  8 ++++---
 .../src/main/webapp/WEB-INF/hotels/show.html  | 17 ++++++++------
 .../src/main/webapp/WEB-INF/intro.html        |  2 +-
 .../main/webapp/WEB-INF/layouts/standard.html |  5 +++++
 8 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
index 0a1700e..5ac9f86 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -38,10 +38,12 @@
 					<div class="span-7 last">
 						<p><input type="text" th:field="*{checkinDate}" /></p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							Spring.addDecoration(new Spring.ElementDecoration({
 								elementId : "checkinDate",
 								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
+								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
+							// ]]>
 						</script>
 						
 					</div>
@@ -53,10 +55,12 @@
 					<div class="span-7 last">
 						<p><input type="text" th:field="*{checkoutDate}" /></p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							Spring.addDecoration(new Spring.ElementDecoration({
 								elementId : "checkoutDate",
 								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
+								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
+							// ]]>
 						</script>
 					</div>
 				</div>
@@ -84,6 +88,7 @@
                             <input type="radio" id="non-smoking" th:field="*{smoking}" value="false" /><label for="non-smoking">Non Smoking</label>
 						</p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							Spring.addDecoration(new Spring.ElementDecoration({
 								elementId : 'smoking',
 								widgetType : "dijit.form.RadioButton",
@@ -96,6 +101,7 @@
 								widgetModule : "dijit.form.CheckBox",
 								widgetAttrs : { value : "false" }
 							}));
+							// ]]>
 						</script>
 					</div>
 				</div>
@@ -112,6 +118,7 @@
                             <input type="checkbox" th:field="*{amenities}" value="MINIBAR" /><label th:for="${#ids.prev('amenities')}">Minibar</label>
 						</p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							dojo.query("#amenities input[type='checkbox']").forEach(function(element){
 								Spring.addDecoration(new Spring.ElementDecoration({
 									elementId: element.id,
@@ -119,6 +126,7 @@
 									widgetAttrs : { checked : element.checked }
 								}));
 							});
+							// ]]>
 						</script>
 					</div>
 				</div>
@@ -129,11 +137,13 @@
 					<div class="span-7 last">
 						<p><input type="text" th:field="*{creditCard}" /></p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							Spring.addDecoration(new Spring.ElementDecoration({
 								elementId : "creditCard",
 								widgetType : "dijit.form.ValidationTextBox",
 								widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
 								regExp : "[0-9]{16}"  }}));
+							// ]]>
 						</script>
 					</div>
 				</div>
@@ -144,10 +154,12 @@
 					<div class="span-7 last">
                         <p><input type="text" th:field="*{creditCardName}" maxlength="40" /></p>
 						<script type="text/javascript">
+				            // <![CDATA[
 							Spring.addDecoration(new Spring.ElementDecoration({
 								elementId : "creditCardName",
 								widgetType : "dijit.form.ValidationTextBox",
 								widgetAttrs : { required : true }}));
+							// ]]>
 						</script>
 					</div>
 				</div>
@@ -183,12 +195,14 @@
 				</div>
 				<div>
 					<p>
-					<button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
-					<button type="submit" name="_eventId_cancel" >Cancel</button>
+					    <button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
+					    <button type="submit" name="_eventId_cancel" >Cancel</button>
 					</p>
 					<script type="text/javascript">
+			            // <![CDATA[
 						Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
 						Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));
+						// ]]>
 					</script>
 				</div>
 			</fieldset>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
index 8b0886f..b5438da 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -61,7 +61,9 @@
     					<button type="submit" name="_eventId_cancel">Cancel</button>
     				</p>
     				<script type="text/javascript">
+    		            // <![CDATA[
     					Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
+    					// ]]>
     				</script>
     			</div>
                 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
index 9b0bf73..5df2018 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -1,19 +1,25 @@
 
 <h1>Hotel Results</h1>
+
 <p>
 	<a id="changeSearchLink" href="#" 
        th:href="@{hotels/search(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize})}">Change Search</a>
 	<script type="text/javascript">
+        // <![CDATA[
 		Spring.addDecoration(new Spring.AjaxEventDecoration({
 			elementId: "changeSearchLink",
 			event: "onclick",
 			popup: true,
 			params: {fragments: "searchForm"}		
 		}));
+		// ]]>
 	</script>
 </p>
+
 <div id="hotelResults">
+
   <div th:if="${hotelList}">
+  
 	<table class="summary">
 		<thead>
 			<tr>
@@ -37,17 +43,20 @@
 			</tr>
 		</tbody>
 	</table>
+    
 	<div class="buttonGroup">
 		<div class="span-3">
 			<div th:if="${searchCriteria.page > 0}">
                 <a id="prevResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page - 1})}">Previous Results</a>
 				<script type="text/javascript">
+		            // <![CDATA[
 					Spring.addDecoration(new Spring.AjaxEventDecoration({
 						elementId: "prevResultsLink",
 						event: "onclick",
 						params: {fragments: "body"}
 					}));
+					// ]]>
 				</script>
 			</div>
 		</div>
@@ -56,15 +65,18 @@
 				<a id="moreResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page + 1})}">More Results</a>
 				<script type="text/javascript">
+		            // <![CDATA[
 					Spring.addDecoration(new Spring.AjaxEventDecoration({
 						elementId: "moreResultsLink",
 						event: "onclick",
 						params: {fragments: "body"}		
 					}));
+					// ]]>
 				</script>
 			</div>		
 		</div>
 	</div>
   </div>
+
 </div>	
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
index 008e71a..6f74d76 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -1,4 +1,4 @@
 
-<div tiles:include="searchForm"></div>
+<div tiles:include="searchForm">Search form here...</div>
 
-<div tiles:include="bookingsTable"></div>
+<div tiles:include="bookingsTable">Bookings table here...</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
index 5054fea..1d4cfa1 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
@@ -11,19 +11,21 @@
 			<label for="searchString">Search String:</label>
 			<input type="text" id="searchString" th:field="*{searchString}" />
 			<script type="text/javascript">
+	            // <![CDATA[
 				Spring.addDecoration(new Spring.ElementDecoration({
 					elementId : "searchString",
 					widgetType : "dijit.form.ValidationTextBox",
 					widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
+				// ]]>
 			</script>
 		</div>
 		<div class="span-6">
 			<div>
 				<label for="pageSize">Maximum results:</label>
 				<select id="pageSize" th:field="*{pageSize}">
-					<option label="5" value="5"/>
-					<option label="10" value="10"/>
-					<option label="20" value="20"/>
+					<option label="5" value="5" />
+					<option label="10" value="10" />
+					<option label="20" value="20" />
 				</select>
 			</div>
 		</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
index 2554d44..052ae43 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
@@ -1,14 +1,17 @@
+
 <h1 th:text="${hotel.name}">The Herb Plaza</h1>
-<address>
-	<span th:text="${hotel.address}">Thyme Square, 13</span>
+
+<address th:object="${hotel}">
+	<span th:text="*{address}">Thyme Square, 13</span>
 	<br />
-	<span th:text="${hotel.city}">Icetown</span>, 
-    <span th:text="${hotel.state}">North Pole</span>, 
-    <span th:text="${hotel.zip}">0W</span>
+	<span th:text="*{city}">Icetown</span>, 
+    <span th:text="*{state}">North Pole</span>, 
+    <span th:text="*{zip}">0W</span>
 	<br />
-	<span th:text="${hotel.country}">Earth</span>
+	<span th:text="*{country}">Earth</span>
 </address>
-<form action="booking?mode=embedded" method="get">
+
+<form action="#" th:action="@{/hotels/booking(mode='embedded')}" method="get">
 	<p>
 		Nightly Rate: <span th:text="${hotel.price}">4,300</span>
 	</p>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index 4212158..5389769 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -3,7 +3,7 @@
 	<p>
 	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
 	</p>
-	<hr/>
+	<hr />
 	<p>
 		The key features illustrated in this sample include:
 	</p>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index 3ba6db6..7ea9555 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -23,6 +23,7 @@
 <body class="tundra">
 
 <div id="page" class="container">
+
 	<div id="header">
 		<div id="topbar">
 			<p sec:authorize="hasRole('ROLE_USER')" th:if="${#authentication}">
@@ -41,6 +42,7 @@
 			</p>
 		</div>
 	</div>
+    
 	<div id="content">
 		<div id="local" class="span-6">
 			<p>
@@ -58,12 +60,15 @@
           Body here...
 		</div>
 	</div>
+    
 	<hr />
+    
 	<div id="footer">
 		<a href="http://www.springframework.org">
 			<img src="../../images/powered-by-spring.png" th:src="@{/resources/images/powered-by-spring.png}" alt="Powered by Spring" />
 		</a>
 	</div>
+    
 </div>
 </body>
 </html>
\ No newline at end of file

From 802a3e919ab710c193557be0ff53be1f82b78413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 29 Dec 2012 21:40:48 +0100
Subject: [PATCH 15/22] Added static prototyping structures to all templates.

---
 .../hotels/booking/enterBookingDetails.html   | 58 +++++++++++++++++
 .../WEB-INF/hotels/booking/messages.html      | 59 ++++++++++++++++++
 .../WEB-INF/hotels/booking/reviewBooking.html | 59 ++++++++++++++++++
 .../webapp/WEB-INF/hotels/booking/views.xml   |  7 +--
 .../webapp/WEB-INF/hotels/bookingsTable.html  | 60 +++++++++++++++++-
 .../src/main/webapp/WEB-INF/hotels/list.html  | 57 +++++++++++++++++
 .../main/webapp/WEB-INF/hotels/search.html    | 59 ++++++++++++++++++
 .../webapp/WEB-INF/hotels/searchForm.html     | 62 ++++++++++++++++++-
 .../src/main/webapp/WEB-INF/hotels/show.html  | 59 ++++++++++++++++++
 .../src/main/webapp/WEB-INF/hotels/views.xml  |  8 +--
 .../src/main/webapp/WEB-INF/intro.html        | 59 +++++++++++++++++-
 .../main/webapp/WEB-INF/layouts/standard.html | 43 ++++++++++---
 .../src/main/webapp/WEB-INF/login.html        | 57 +++++++++++++++++
 .../main/webapp/WEB-INF/logoutSuccess.html    | 60 +++++++++++++++++-
 booking-mvc/src/main/webapp/WEB-INF/views.xml |  6 +-
 15 files changed, 689 insertions(+), 24 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
index 5ac9f86..46063e1 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -1,3 +1,53 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 
 <div id="bookingForm">
 
@@ -212,3 +262,11 @@
 	</div>
     
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
index 4fb9fcd..7d9638c 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
@@ -1,6 +1,65 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
+
 
 <div id="messages">
     <ul th:if="${#fields.hasErrors('*')}" class="errors">
         <li th:each="err : ${#fields.errors('*')}" th:text="${err}">Input is incorrect</li>
     </ul>
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
index b5438da..5422e01 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -1,3 +1,54 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
+
 <div id="bookingForm">
 
 	<div class="span-5">
@@ -74,3 +125,11 @@
 	</div>
 
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index 413de56..e683dd6 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -6,14 +6,11 @@
 <tiles-definitions>
 	
 	<definition name="enterBookingDetails" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/booking/enterBookingDetails.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/hotels/booking/enterBookingDetails.html :: content" type="thymeleaf"/>
 	</definition>
 
 	<definition name="reviewBooking" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/booking/reviewBooking.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/hotels/booking/reviewBooking.html :: content" type="thymeleaf"/>
 	</definition>
-<!--     <definition name="reviewBooking" extends="standardLayoutJSP" templateType="jsp"> -->
-<!--         <put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/> -->
-<!--     </definition> -->
 	
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
index a2e80ca..3cddaa3 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
@@ -1,3 +1,53 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 <div id="bookings" sec:authorize="hasRole('ROLE_USER')">
 
 	<h2>Current Hotel Bookings</h2>
@@ -35,4 +85,12 @@
 		</tbody>
 	</table>
     
-</div>
\ No newline at end of file
+</div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
index 5df2018..6ec83ca 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -1,3 +1,53 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 
 <h1>Hotel Results</h1>
 
@@ -80,3 +130,10 @@
 
 </div>	
 
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
index 6f74d76..a8c1692 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -1,4 +1,63 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 
 <div tiles:include="searchForm">Search form here...</div>
 
 <div tiles:include="bookingsTable">Bookings table here...</div>
+
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
index 1d4cfa1..ddfbc68 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
@@ -1,6 +1,56 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 <h1>Search Hotels</h1>
 
-<form action="#" th:object="${searchCriteria}" th:action="@{/hotels}" method="get" cssClass="inline">
+<form action="#" th:object="${searchCriteria}" th:action="@{/hotels}" method="get" class="inline">
 
     <ul th:if="${#fields.hasErrors('*')}" class="errors span-18">
         <li th:each="err : ${#fields.errors('*')}" th:text="${err}">Input is incorrect</li>
@@ -34,4 +84,12 @@
 		</div>		
     </fieldset>
     
-</form>
\ No newline at end of file
+</form>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
index 052ae43..3ed7168 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
@@ -1,3 +1,53 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
 
 <h1 th:text="${hotel.name}">The Herb Plaza</h1>
 
@@ -20,3 +70,12 @@
 		<button type="submit">Book Hotel</button>
 	</div>
 </form>
+
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index f8a7bdd..a6a7e9a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -7,15 +7,15 @@
 	
 	<definition name="hotels/search" extends="standardLayout">
 		<put-attribute name="body">
-			<definition template="hotels/search.html" templateType="thymeleaf">
-				<put-attribute name="searchForm" value="/hotels/searchForm.html" type="thymeleaf"/>
-				<put-attribute name="bookingsTable" value="/hotels/bookingsTable.html" type="thymeleaf"/>
+			<definition template="hotels/search.html :: content" templateType="thymeleaf">
+				<put-attribute name="searchForm" value="/hotels/searchForm.html :: content" type="thymeleaf"/>
+				<put-attribute name="bookingsTable" value="/hotels/bookingsTable.html :: content" type="thymeleaf"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
 	<definition name="hotels/*" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/{1}.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/hotels/{1}.html :: content" type="thymeleaf"/>
 	</definition>
 
 </tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index 5389769..a5ea43b 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -1,4 +1,53 @@
-<div xmlns:th="http://www.thymeleaf.org">
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+<div>
 	<h1>Welcome to Spring Travel</h1>
 	<p>
 	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
@@ -27,3 +76,11 @@
 		<a href="hotels/search.html" th:href="@{/hotels/search}">Start your Spring Travel experience</a>
 	</p>
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index 7ea9555..a1e39aa 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -6,20 +6,41 @@
       lang="en">
 
 <head>
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
-	<link type="text/css" rel="stylesheet" href="#" th:href="@{/resources/dijit/themes/tundra/tundra.css}" />
-	<link rel="stylesheet" href="../../styles/blueprint/screen.css" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
-	<link rel="stylesheet" href="../../styles/blueprint/print.css" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
+    
+	<link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../../styles/blueprint/screen.css" 
+          th:href="@{/resources/styles/blueprint/screen.css}" />
+    
+	<link rel="stylesheet" type="text/css" media="print" 
+          href="../../styles/blueprint/print.css" 
+          th:href="@{/resources/styles/blueprint/print.css}" />
+    
 	<!--[if lt IE 8]>
-	        <link rel="stylesheet" href="../../styles/blueprint/ie.css" th:href="@{/resources/styles/blueprint/ie.css}" type="text/css" media="screen, projection" />
+	    <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../../styles/blueprint/ie.css" 
+              th:href="@{/resources/styles/blueprint/ie.css}" />
 	<![endif]-->
-	<link rel="stylesheet" href="../../styles/booking.css" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />
+    
+	<link rel="stylesheet" type="text/css" media="screen" 
+          href="../../styles/booking.css" 
+          th:href="@{/resources/styles/booking.css}" />
+
+    
+    <!-- The following styles and scripts are served from spring-js-resources-{ver}.jar -->
+    
+    <link rel="stylesheet" type="text/css" 
+          href="#" th:href="@{/resources/dijit/themes/tundra/tundra.css}" />
+    
     <script type="text/javascript" src="#" th:src="@{/resources/dojo/dojo.js}"></script>
     <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring.js}"></script>
     <script type="text/javascript" src="#" th:src="@{/resources/spring/Spring-Dojo.js}"></script>
+    
 </head>
 
+
 <body class="tundra">
 
 <div id="page" class="container">
@@ -57,7 +78,15 @@
 			</p>
 		</div>
 		<div id="main" class="span-18 last" tiles:include="body">
-          Body here...
+
+          <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->      
+          <!-- At runtime, the body of this <div> will be substituted by -->
+          <!-- Tiles in order to create the final HTML page that will be -->
+          <!-- sent to the browser.                                      -->
+          <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->      
+          
+          BODY PAGE GOES HERE!
+          
 		</div>
 	</div>
     
diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html
index 93bfa2a..700e91a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/login.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/login.html
@@ -1,3 +1,52 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
 
 <div class="span-5">
 	<p>Valid username/passwords are:</p>
@@ -82,3 +131,11 @@
 	</form>
     
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
index 85eee8e..6cbead6 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
@@ -1,6 +1,64 @@
-<div xmlns:th="http://www.thymeleaf.org">
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:tiles="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org"
+      lang="en">
+
+<head>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
+    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
+    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
+          href="../styles/blueprint/screen.css" />
+    
+    <link rel="stylesheet" type="text/css" media="print" 
+          href="../styles/blueprint/print.css" />
+    
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
+              href="../styles/blueprint/ie.css" />
+    <![endif]-->
+    
+    <link rel="stylesheet" type="text/css" media="screen" 
+          href="../styles/booking.css" />
+
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
+    <!-- runtime. Therefore not available for static prototyping. See the         -->
+    <!-- layouts/standard.html template file for detail.                          -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    
+</head>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- START of the content to be included in the execution result.  -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Only the markup inside this <body> would be required in this  -->
+<!-- template if no static prototyping was intended.               -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<body tiles:fragment="content">
+
+
+<div>
 	<h1>Logout</h1>
 	<p>You have successfully logged out.</p>
 	<hr />
 	<p><a href="hotels/searchForm.html" th:href="@{/hotels/search}">Continue</a></p>
 </div>
+
+
+</body>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- END of the content to be included in the execution result -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+</html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
index b96d524..0fcba6a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -6,15 +6,15 @@
 <tiles-definitions>
 	
 	<definition name="intro" extends="standardLayout">
-		<put-attribute name="body" value="/intro.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/intro.html :: content" type="thymeleaf"/>
 	</definition>
 	
 	<definition name="login" extends="standardLayout">
-		<put-attribute name="body" value="/login.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/login.html :: content" type="thymeleaf"/>
 	</definition>
 	
 	<definition name="logoutSuccess" extends="standardLayout">
-		<put-attribute name="body" value="/logoutSuccess.html" type="thymeleaf"/>
+		<put-attribute name="body" value="/logoutSuccess.html :: content" type="thymeleaf"/>
 	</definition>
 	
 </tiles-definitions>

From f60181ad06c0623ec18b7677f51c5b133d076e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 29 Dec 2012 21:45:18 +0100
Subject: [PATCH 16/22] Added static content to search.html

---
 booking-mvc/src/main/webapp/WEB-INF/hotels/search.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
index a8c1692..35f5f0a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -49,9 +49,14 @@
 
 
 
-<div tiles:include="searchForm">Search form here...</div>
+<div tiles:include="searchForm">
+   A search form will go here. See it at <a href="searchForm.html">searchForm.html</a>. 
+</div>
 
-<div tiles:include="bookingsTable">Bookings table here...</div>
+<div tiles:include="bookingsTable">
+   A table with the current hotel bookings will go here. 
+   See it at <a href="bookingsTable.html">bookingsTable.html</a>. 
+</div>
 
 
 

From 63170166fb0dd7b080f87afe7c44c338da095a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 29 Dec 2012 22:10:12 +0100
Subject: [PATCH 17/22] Fixed error reporting format.

---
 .../webapp/WEB-INF/hotels/booking/enterBookingDetails.html    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
index 46063e1..095392a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -76,7 +76,9 @@
         <form id="booking" action="#" th:object="${booking}" th:action="${flowExecutionUrl}" method="post">
 
             <div class="error" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:text="${err} + '&lt;br /&gt;'">Input is incorrect</span>
+                <span th:each="err : ${#fields.errors('*')}">
+                  <span th:text="${err}">Input is incorrect</span><br />
+                </span>
             </div>
         
 			<fieldset>

From 1bcfa72497da57a3fd35ead3d50a8543a4cbe519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 29 Dec 2012 22:12:21 +0100
Subject: [PATCH 18/22] Deleted original JSP files.

---
 .../hotels/booking/enterBookingDetails.jsp    | 196 ------------------
 .../WEB-INF/hotels/booking/messages.jsp       |   5 -
 .../WEB-INF/hotels/booking/reviewBooking.jsp  |  65 ------
 .../webapp/WEB-INF/hotels/bookingsTable.jsp   |  53 -----
 .../src/main/webapp/WEB-INF/hotels/list.jsp   |  74 -------
 .../main/webapp/WEB-INF/hotels/searchForm.jsp |  36 ----
 .../src/main/webapp/WEB-INF/hotels/show.jsp   |  22 --
 booking-mvc/src/main/webapp/WEB-INF/intro.jsp |  29 ---
 .../main/webapp/WEB-INF/layouts/standard.jsp  |  69 ------
 booking-mvc/src/main/webapp/WEB-INF/login.jsp |  66 ------
 .../src/main/webapp/WEB-INF/logoutSuccess.jsp |   8 -
 11 files changed, 623 deletions(-)
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp
 delete mode 100755 booking-mvc/src/main/webapp/WEB-INF/intro.jsp
 delete mode 100644 booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
 delete mode 100755 booking-mvc/src/main/webapp/WEB-INF/login.jsp
 delete mode 100755 booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
deleted file mode 100644
index 1f95919..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
+++ /dev/null
@@ -1,196 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<div id="bookingForm">
-	<div class="span-5">
-		<h3>${booking.hotel.name}</h3>
-		
-		<address>
-			${booking.hotel.address}
-			<br/>
-			${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip}
-			<br/>
-			${booking.hotel.country}
-		</address>
-		<p>
-			Nightly rate: <spring:bind path="booking.hotel.price">${status.value}</spring:bind>
-		</p>
-	</div>
-	<div class="span-12">
-		<spring:hasBindErrors name="booking">
-			<div class="error">
-				<spring:bind path="booking.*">
-					<c:forEach items="${status.errorMessages}" var="error">
-						<span><c:out value="${error}"/></span><br>
-					</c:forEach>
-				</spring:bind>
-			</div>
-		</spring:hasBindErrors>
-		<form:form modelAttribute="booking" action="${flowExecutionUrl}">
-			<fieldset>
-				<legend>Book Hotel</legend>
-		        <div>
-					<div class="span-4">
-						<label for="checkinDate">Check In:</label>
-					</div>
-					<div class="span-7 last">
-						<p><form:input path="checkinDate"/></p>
-						<script type="text/javascript">
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "checkinDate",
-								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
-						</script>
-						
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="checkoutDate">Check Out:</label>
-					</div>
-					<div class="span-7 last">
-						<p><form:input path="checkoutDate"/></p>
-						<script type="text/javascript">
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "checkoutDate",
-								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));  
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="beds">Room Preference:</label>
-					</div>
-					<div class="span-7 last">
-						<p>
-							<form:select id="beds" path="beds">
-								<form:option label="One king-size bed" value="1"/>
-								<form:option label="Two double beds" value="2"/>
-								<form:option label="Three beds" value="3"/>
-							</form:select>
-						</p>
-					</div>
-				</div>
-				<div>
-					<div class="label span-4">
-						Smoking Preference:
-					</div>
-					<div id="radio" class="span-7 last">
-						<p>
-							<form:radiobutton id="smoking" path="smoking" label="Smoking" value="true"/>
-							<form:radiobutton id="non-smoking" path="smoking" label="Non Smoking" value="false"/>
-						</p>
-						<script type="text/javascript">
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : 'smoking',
-								widgetType : "dijit.form.RadioButton",
-								widgetModule : "dijit.form.CheckBox",
-								widgetAttrs : { value : "true" }
-							}));
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : 'non-smoking',
-								widgetType : "dijit.form.RadioButton",
-								widgetModule : "dijit.form.CheckBox",
-								widgetAttrs : { value : "false" }
-							}));
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="label span-4">
-						Amenities:
-					</div>
-					<div id="amenities" class="span-7 last">
-						<p>
-							<form:checkbox path="amenities" value="OCEAN_VIEW" label="Ocean View" />
-							<br />
-							<form:checkbox path="amenities" value="LATE_CHECKOUT" label="Late Checkout" />
-							<br />
-							<form:checkbox path="amenities" value="MINIBAR" label="Minibar" />
-						</p>
-						<script type="text/javascript">
-							dojo.query("#amenities input[type='checkbox']").forEach(function(element){
-								Spring.addDecoration(new Spring.ElementDecoration({
-									elementId: element.id,
-									widgetType : "dijit.form.CheckBox",
-									widgetAttrs : { checked : element.checked }
-								}));
-							});
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCard">Credit Card #:</label>
-					</div>
-					<div class="span-7 last">
-						<p><form:input path="creditCard"/></p>
-						<script type="text/javascript">
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "creditCard",
-								widgetType : "dijit.form.ValidationTextBox",
-								widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
-								regExp : "[0-9]{16}"  }}));
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCardName">Credit Card Name:</label>
-					</div>
-					<div class="span-7 last">
-						<p><form:input path="creditCardName" maxlength="40"/></p>
-						<script type="text/javascript">
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "creditCardName",
-								widgetType : "dijit.form.ValidationTextBox",
-								widgetAttrs : { required : true }}));
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCardExpiryMonth">Expiration Date:</label>
-					</div>
-					<div class="span-7 last">
-						<p>
-							<form:select id="creditCardExpiryMonth" path="creditCardExpiryMonth">
-								<form:option label="Jan" value="1"/>
-								<form:option label="Feb" value="2"/>
-								<form:option label="Mar" value="3"/>
-								<form:option label="Apr" value="4"/>
-								<form:option label="May" value="5"/>
-								<form:option label="Jun" value="6"/>
-								<form:option label="Jul" value="7"/>
-								<form:option label="Aug" value="8"/>
-								<form:option label="Sep" value="9"/>
-								<form:option label="Oct" value="10"/>
-								<form:option label="Nov" value="11"/>
-								<form:option label="Dec" value="12"/>
-							</form:select>
-							<form:select path="creditCardExpiryYear">
-								<form:option label="2008" value="1"/>
-								<form:option label="2009" value="2"/>
-								<form:option label="2010" value="3"/>
-								<form:option label="2011" value="4"/>
-								<form:option label="2012" value="5"/>
-							</form:select>
-						</p>
-					</div>
-				</div>
-				<div>
-					<p>
-					<button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
-					<button type="submit" name="_eventId_cancel" >Cancel</button>
-					</p>
-					<script type="text/javascript">
-						Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
-						Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));
-					</script>
-				</div>
-			</fieldset>
-		</form:form>	
-	</div>
-</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp
deleted file mode 100644
index 42054c9..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<div id="messages">
-	<form:errors path="booking.*" cssClass="errors" />
-</div>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp
deleted file mode 100644
index 9efe4fa..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<div id="bookingForm">
-	<div class="span-5">
-		<h3>${booking.hotel.name}</h3>
-		
-		<address>
-			${booking.hotel.address}
-			<br/>
-			${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip}
-			<br/>
-			${booking.hotel.country}
-		</address>
-	</div>
-	<div class="span-12 last">
-		<form:form id="confirm" modelAttribute="booking" action="${flowExecutionUrl}">
-		<fieldset>
-			<legend>Confirm Booking Details</legend>
-			<div>
-				<div class="span-3">Check In:</div>
-				<div class="span-8 last">
-					<p><spring:bind path="checkinDate">${status.value}</spring:bind></p>
-				</div>
-			</div>
-			<div>
-				<div class="span-3">Checkout:</div>
-				<div class="span-8 last">
-					<p><spring:bind path="checkoutDate">${status.value}</spring:bind></p>
-				</div>
-			</div>
-	        <div>
-	            <div class="span-3">Number of Nights:</div>
-	            <div class="span-8 last">
-	            	<p><spring:bind path="nights">${status.value}</spring:bind></p>
-	            </div>
-	        </div>
-	        <div>
-	            <div class="span-3">Total Payment:</div>
-	            <div class="span-8 last">
-	            	<p><spring:bind path="total">${status.value}</spring:bind></p>
-	            </div>
-	        </div>
-			<div>
-				<div class="span-3">Credit Card #:</div>
-				<div class="span-8 last">
-					<p>${booking.creditCard}</p>
-				</div>
-			</div>
-			<div>
-				<p>
-					<button type="submit" name="_eventId_confirm">Confirm</button>
-					<button type="submit" name="_eventId_revise" id="revise">Revise</button>
-					<button type="submit" name="_eventId_cancel">Cancel</button>
-				</p>
-				<script type="text/javascript">
-					Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
-				</script>
-			</div>
-		</fieldset>
-		</form:form>
-	</div>
-
-</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp
deleted file mode 100644
index 6d66283..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<div id="bookings">
-<security:authorize ifAllGranted="ROLE_USER">
-	<h2>Current Hotel Bookings</h2>
-
-	<c:if test="${empty bookingList}">
-	<tr>
-		<td colspan="7">No bookings found</td>
-	</tr>
-	</c:if>
-
-	<c:if test="${!empty bookingList}">
-	<table class="summary">
-		<thead>
-			<tr>
-				<th>Name</th>
-				<th>Address</th>
-				<th>City, State</th>
-				<th>Check in Date</th>
-				<th>Check out Date</th>
-				<th>Confirmation Number</th>
-				<th>Action</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach var="booking" items="${bookingList}">
-			<tr>
-				<td>${booking.hotel.name}</td>
-				<td>${booking.hotel.address}</td>
-				<td>${booking.hotel.city}, ${booking.hotel.state}</td>
-				<td>${booking.checkinDate}</td>
-				<td>${booking.checkoutDate}</td>
-				<td>${booking.id}</td>
-				<td>
-					<spring:url var="bookingUrl" value="/bookings/{id}">
-						<spring:param name="id" value="${booking.id}"/>
-					</spring:url>
-					<form:form action="${bookingUrl}" method="delete">
-						<button type="submit">Cancel</button>
-					</form:form>
-				</td>
-			</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	</c:if>
-</security:authorize>
-
-</div>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp
deleted file mode 100644
index fdd0880..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-
-<h1>Hotel Results</h1>
-<p>
-	<a id="changeSearchLink" href="hotels/search?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}">Change Search</a>
-	<script type="text/javascript">
-		Spring.addDecoration(new Spring.AjaxEventDecoration({
-			elementId: "changeSearchLink",
-			event: "onclick",
-			popup: true,
-			params: {fragments: "searchForm"}		
-		}));
-	</script>
-</p>
-<div id="hotelResults">
-<c:if test="${not empty hotelList}">
-	<table class="summary">
-		<thead>
-			<tr>
-				<th>Name</th>
-				<th>Address</th>
-				<th>City, State</th>
-				<th>Zip</th>
-				<th>Action</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach var="hotel" items="${hotelList}">
-				<tr>
-					<td>${hotel.name}</td>
-					<td>${hotel.address}</td>
-					<td>${hotel.city}, ${hotel.state}, ${hotel.country}</td>
-					<td>${hotel.zip}</td>
-					<td><a href="hotels/${hotel.id}">View Hotel</a></td>
-				</tr>
-			</c:forEach>
-			<c:if test="${empty hotelList}">
-				<tr>
-					<td colspan="5">No hotels found</td>
-				</tr>
-			</c:if>
-		</tbody>
-	</table>
-	<div class="buttonGroup">
-		<div class="span-3">
-			<c:if test="${searchCriteria.page > 0}">
-				<a id="prevResultsLink" href="hotels?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}&page=${searchCriteria.page - 1}">Previous Results</a>
-				<script type="text/javascript">
-					Spring.addDecoration(new Spring.AjaxEventDecoration({
-						elementId: "prevResultsLink",
-						event: "onclick",
-						params: {fragments: "body"}
-					}));
-				</script>
-			</c:if>
-		</div>
-		<div class="span-3 append-12 last">
-			<c:if test="${not empty hotelList && fn:length(hotelList) == searchCriteria.pageSize}">
-				<a id="moreResultsLink" href="hotels?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}&page=${searchCriteria.page + 1}">More Results</a>
-				<script type="text/javascript">
-					Spring.addDecoration(new Spring.AjaxEventDecoration({
-						elementId: "moreResultsLink",
-						event: "onclick",
-						params: {fragments: "body"}		
-					}));
-				</script>
-			</c:if>		
-		</div>
-	</div>
-</c:if>
-</div>	
-
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp
deleted file mode 100644
index 0940b44..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-
-<h1>Search Hotels</h1>
-
-<c:url var="hotelsUrl" value="/hotels"/>
-<form:form modelAttribute="searchCriteria" action="${hotelsUrl}" method="get" cssClass="inline">
-    <span class="errors span-18">
-    	<form:errors path="*"/>
-    </span>
-	<fieldset>
-		<div class="span-8">
-			<label for="searchString">Search String:</label>
-			<form:input id="searchString" path="searchString"/>
-			<script type="text/javascript">
-				Spring.addDecoration(new Spring.ElementDecoration({
-					elementId : "searchString",
-					widgetType : "dijit.form.ValidationTextBox",
-					widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
-			</script>
-		</div>
-		<div class="span-6">
-			<div>
-				<label for="pageSize">Maximum results:</label>
-				<form:select id="pageSize" path="pageSize">
-					<form:option label="5" value="5"/>
-					<form:option label="10" value="10"/>
-					<form:option label="20" value="20"/>
-				</form:select>
-			</div>
-		</div>
-		<div class="span-3 last">
-			<button type="submit">Find Hotels</button>
-		</div>		
-    </fieldset>
-</form:form>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp
deleted file mode 100644
index 82e2e70..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<h1>${hotel.name}</h1>
-<address>
-	${hotel.address}
-	<br />
-	${hotel.city}, ${hotel.state}, ${hotel.zip}
-	<br />
-	${hotel.country}
-</address>
-<form action="booking?mode=embedded" method="get">
-	<p>
-		Nightly Rate:
-		<spring:bind path="hotel.price">${status.value}</spring:bind>
-	</p>
-	<input type="hidden" name="hotelId" value="${hotel.id}" />
-	<div>
-		<button type="submit">Book Hotel</button>
-	</div>
-</form>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
deleted file mode 100755
index 4525d2f..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<div>
-	<h1>Welcome to Spring Travel</h1>
-	<p>
-	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
-	</p>
-	<hr/>
-	<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>Spring Expression Language (SpEL) integration</li>
-		<li>Spring 3 formatting annotations @DateTimeFormat, @NumberFormat</li>
-		<li>Spring MVC custom namespace</li>
-		<li>Spring Security integration</li>
-		<li>Annotated POJO @Controllers for implementing RESTful user interactions.</li>
-		<li>Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library</li>
-		<li>Page layout and composition with Apache Tiles</li>
-		<li>A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.</li>
-		<li>A grid layout with Blueprint CSS</li>
-		<li>Exception handling support across all layers of the application</li>
-		<li>SpringSource Tool Suite integration, with support for graphical flow modeling and visualization</li>
-	</ul>
-	<p>
-		<a href="hotels/search">Start your Spring Travel experience</a>
-	</p>
-</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
deleted file mode 100644
index 5e7bfbb..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
-<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
-<!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" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
-	<link type="text/css" rel="stylesheet" href="<c:url value="/resources/dijit/themes/tundra/tundra.css" />" />
-	<link rel="stylesheet" href="<c:url value="/resources/styles/blueprint/screen.css" />" type="text/css" media="screen, projection" />
-	<link rel="stylesheet" href="<c:url value="/resources/styles/blueprint/print.css" />" type="text/css" media="print" />
-	<!--[if lt IE 8]>
-	        <link rel="stylesheet" href="<c:url value="/resources/blueprint/ie.css" />" type="text/css" media="screen, projection" />
-	<![endif]-->
-	<link rel="stylesheet" href="<c:url value="/resources/styles/booking.css" />" type="text/css" media="screen" />
-    <script type="text/javascript" src="<c:url value="/resources/dojo/dojo.js" />"></script>
-    <script type="text/javascript" src="<c:url value="/resources/spring/Spring.js" />"></script>
-    <script type="text/javascript" src="<c:url value="/resources/spring/Spring-Dojo.js" />"></script>
-</head>
-<body class="tundra">
-<div id="page" class="container">
-	<div id="header">
-		<div id="topbar">
-			<p>
-				<security:authorize ifAllGranted="ROLE_USER">
-					<c:if test="${pageContext.request.userPrincipal != null}">
-						Welcome, ${pageContext.request.userPrincipal.name} |
-					</c:if>
-					<a href="<c:url value="/logout" />">Logout</a>
-				</security:authorize>
-				<security:authorize ifAllGranted="ROLE_ANONYMOUS">
-					<a href="<c:url value="/login" />">Login</a>
-				</security:authorize>
-			</p>
-		</div>
-		<div id="logo">
-			<p>
-				<a href="<c:url value="/" />">
-					<img src="<c:url value="/resources/images/header.jpg"/>" alt="Spring Travel" />
-				</a>
-			</p>
-		</div>
-	</div>
-	<div id="content">
-		<div id="local" class="span-6">
-			<p>
-				<a href="http://www.thespringexperience.com">
-					<img src="<c:url value="/resources/images/diplomat.jpg"/>" alt="generic hotel" />
-				</a>
-			</p>
-			<p>
-				<a href="http://www.thespringexperience.com">
-					<img src="<c:url value="/resources/images/springone2gx.jpeg"/>" alt="SpringOne 2GX" />
-				</a>
-			</p>
-		</div>
-		<div id="main" class="span-18 last">
-			<tiles:insertAttribute name="body" />
-		</div>
-	</div>
-	<hr />
-	<div id="footer">
-		<a href="http://www.springframework.org">
-			<img src="<c:url value="/resources/images/powered-by-spring.png"/>" alt="Powered by Spring" />
-		</a>
-	</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/booking-mvc/src/main/webapp/WEB-INF/login.jsp
deleted file mode 100755
index 04d9c59..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<%@ page import="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter" %>
-<%@ page import="org.springframework.security.core.AuthenticationException" %>
-
-<div class="span-5">
-	<p>Valid username/passwords are:</p>
-	<ul>
-		<li>keith/melbourne</li>
-		<li>erwin/leuven</li>
-		<li>jeremy/atlanta</li>
-		<li>scott/rochester</li>
-	</ul>
-</div>
-
-<div class="span-10 append-2 last">
-	<c:if test="${not empty param.login_error}">
-		<div class="error">
-			Your login attempt was not successful, try again.<br /><br />
-			Reason: <%= ((AuthenticationException) session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
-		</div>
-	</c:if>
-	<form name="f" action="<c:url value="/loginProcess" />" method="post">
-		<fieldset>
-			<legend>Login Information</legend>
-			<p>
-				<label for="j_username">User:</label>
-				<br />
-				<input type="text" name="j_username" id="j_username" <c:if test="${not empty param.login_error}">value="<%= session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>"</c:if> />
-			</p>
-			<script type="text/javascript">
-				Spring.addDecoration(new Spring.ElementDecoration({
-					elementId : "j_username",
-					widgetType : "dijit.form.ValidationTextBox",
-					widgetAttrs : { required : true }}));
-			</script>
-			<p>
-				<label for="j_password">Password:</label>
-				<br />
-				<input type="password" name="j_password" id="j_password" />
-			</p>
-			<script type="text/javascript">
-				Spring.addDecoration(new Spring.ElementDecoration({
-					elementId : "j_password",
-					widgetType : "dijit.form.ValidationTextBox",
-					widgetAttrs : { required : true}}));
-			</script>
-			<p>
-				<input type="checkbox" name="_spring_security_remember_me" id="remember_me" />
-				<label for="remember_me">Don't ask for my password for two weeks:</label>
-			</p>
-			<script type="text/javascript">
-				Spring.addDecoration(new Spring.ElementDecoration({
-					elementId : "remember_me",
-					widgetType : "dijit.form.CheckBox"}));
-			</script>
-			<p>
-				<button id="submit" type="submit">Login</button>
-				<script type="text/javascript">
-					Spring.addDecoration(new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
-				</script>
-			</p>
-		</fieldset>
-	</form>
-</div>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
deleted file mode 100755
index 8f7418c..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<div>
-	<h1>Logout</h1>
-	<p>You have successfully logged out.</p>
-	<hr />
-	<p><a href="<c:url value="hotels/search" />">Continue</a></p>
-</div>

From 7aa70a437e5b1be16b87ca61098cc7b6c91f0c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 29 Dec 2012 22:15:27 +0100
Subject: [PATCH 19/22] Fixed unix line feeds.

---
 .../src/main/webapp/WEB-INF/config/data-access-config.xml   | 2 +-
 .../src/main/webapp/WEB-INF/config/webflow-config.xml       | 6 +++---
 .../src/main/webapp/WEB-INF/config/webmvc-config.xml        | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
index c7b9d8b..924ede3 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
+       xsi:schemaLocation="
            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
            http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
index edb4fdb..06cb11a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd">
 
 	<!-- Executes flows: the entry point into the Spring Web Flow system -->
 	<webflow:flow-executor id="flowExecutor">
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index ce2e8da..2bdfa4e 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -4,7 +4,7 @@
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-1.0.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<!-- Enables controllers mapped with @RequestMapping annotations, formatting annotations @NumberFormat @DateTimeFormat, and JSR 303 style validation -->
 	<mvc:annotation-driven/>
@@ -46,7 +46,6 @@
 	<!-- Custom FlowHandler for the hotel booking flow -->
 	<bean name="hotels/booking" class="org.springframework.webflow.samples.booking.BookingFlowHandler" />	
 		
-
 	<!-- Thymeleaf template resolver -->
 	<bean id="templateResolver"
 		  class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">

From ef9d94c2a37a551d2e0b85981c8380d80a1e551f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sun, 30 Dec 2012 00:26:23 +0100
Subject: [PATCH 20/22] Expanded tabs into spaces.

---
 .../hotels/booking/enterBookingDetails.html   | 366 +++++++++---------
 .../WEB-INF/hotels/booking/reviewBooking.html |  98 ++---
 .../webapp/WEB-INF/hotels/bookingsTable.html  |  58 +--
 .../src/main/webapp/WEB-INF/hotels/list.html  | 126 +++---
 .../webapp/WEB-INF/hotels/searchForm.html     |  52 +--
 .../src/main/webapp/WEB-INF/hotels/show.html  |  24 +-
 .../src/main/webapp/WEB-INF/intro.html        |  54 +--
 .../main/webapp/WEB-INF/layouts/standard.html |  94 ++---
 .../src/main/webapp/WEB-INF/login.html        | 120 +++---
 .../main/webapp/WEB-INF/logoutSuccess.html    |   8 +-
 10 files changed, 500 insertions(+), 500 deletions(-)

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
index 095392a..50bb3bd 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -51,10 +51,10 @@
 
 <div id="bookingForm">
 
-	<div class="span-5">
+    <div class="span-5">
     
-		<h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
-		
+        <h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
+        
         <address th:object="${booking.hotel}">
             <span th:text="*{address}">Thyme Square, 13</span>
             <br />
@@ -65,13 +65,13 @@
             <span th:text="*{country}">Earth</span>
         </address>
         
-		<p>
-			Nightly rate: <span th:text="${booking.hotel.price}">400.00</span>
-		</p>
+        <p>
+            Nightly rate: <span th:text="${booking.hotel.price}">400.00</span>
+        </p>
         
-	</div>
+    </div>
     
-	<div class="span-12">
+    <div class="span-12">
     
         <form id="booking" action="#" th:object="${booking}" th:action="${flowExecutionUrl}" method="post">
 
@@ -81,187 +81,187 @@
                 </span>
             </div>
         
-			<fieldset>
-				<legend>Book Hotel</legend>
-		        <div>
-					<div class="span-4">
-						<label for="checkinDate">Check In:</label>
-					</div>
-					<div class="span-7 last">
-						<p><input type="text" th:field="*{checkinDate}" /></p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "checkinDate",
-								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
-							// ]]>
-						</script>
-						
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="checkoutDate">Check Out:</label>
-					</div>
-					<div class="span-7 last">
-						<p><input type="text" th:field="*{checkoutDate}" /></p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "checkoutDate",
-								widgetType : "dijit.form.DateTextBox",
-								widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
-							// ]]>
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="beds">Room Preference:</label>
-					</div>
-					<div class="span-7 last">
-						<p>
-							<select th:field="*{beds}">
-								<option label="One king-size bed" value="1" />
-								<option label="Two double beds" value="2" />
-								<option label="Three beds" value="3" />
-							</select>
-						</p>
-					</div>
-				</div>
-				<div>
-					<div class="label span-4">
-						Smoking Preference:
-					</div>
-					<div id="radio" class="span-7 last">
-						<p>
-							<input type="radio" id="smoking" th:field="*{smoking}" value="true" /><label for="smoking">Smoking</label>
+            <fieldset>
+                <legend>Book Hotel</legend>
+                <div>
+                    <div class="span-4">
+                        <label for="checkinDate">Check In:</label>
+                    </div>
+                    <div class="span-7 last">
+                        <p><input type="text" th:field="*{checkinDate}" /></p>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : "checkinDate",
+                                widgetType : "dijit.form.DateTextBox",
+                                widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
+                            // ]]>
+                        </script>
+                        
+                    </div>
+                </div>
+                <div>
+                    <div class="span-4">
+                        <label for="checkoutDate">Check Out:</label>
+                    </div>
+                    <div class="span-7 last">
+                        <p><input type="text" th:field="*{checkoutDate}" /></p>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : "checkoutDate",
+                                widgetType : "dijit.form.DateTextBox",
+                                widgetAttrs : { datePattern : "MM-dd-yyyy", required : true }}));
+                            // ]]>
+                        </script>
+                    </div>
+                </div>
+                <div>
+                    <div class="span-4">
+                        <label for="beds">Room Preference:</label>
+                    </div>
+                    <div class="span-7 last">
+                        <p>
+                            <select th:field="*{beds}">
+                                <option label="One king-size bed" value="1" />
+                                <option label="Two double beds" value="2" />
+                                <option label="Three beds" value="3" />
+                            </select>
+                        </p>
+                    </div>
+                </div>
+                <div>
+                    <div class="label span-4">
+                        Smoking Preference:
+                    </div>
+                    <div id="radio" class="span-7 last">
+                        <p>
+                            <input type="radio" id="smoking" th:field="*{smoking}" value="true" /><label for="smoking">Smoking</label>
                             <input type="radio" id="non-smoking" th:field="*{smoking}" value="false" /><label for="non-smoking">Non Smoking</label>
-						</p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : 'smoking',
-								widgetType : "dijit.form.RadioButton",
-								widgetModule : "dijit.form.CheckBox",
-								widgetAttrs : { value : "true" }
-							}));
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : 'non-smoking',
-								widgetType : "dijit.form.RadioButton",
-								widgetModule : "dijit.form.CheckBox",
-								widgetAttrs : { value : "false" }
-							}));
-							// ]]>
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="label span-4">
-						Amenities:
-					</div>
-					<div id="amenities" class="span-7 last">
-						<p>
+                        </p>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : 'smoking',
+                                widgetType : "dijit.form.RadioButton",
+                                widgetModule : "dijit.form.CheckBox",
+                                widgetAttrs : { value : "true" }
+                            }));
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : 'non-smoking',
+                                widgetType : "dijit.form.RadioButton",
+                                widgetModule : "dijit.form.CheckBox",
+                                widgetAttrs : { value : "false" }
+                            }));
+                            // ]]>
+                        </script>
+                    </div>
+                </div>
+                <div>
+                    <div class="label span-4">
+                        Amenities:
+                    </div>
+                    <div id="amenities" class="span-7 last">
+                        <p>
                             <input type="checkbox" th:field="*{amenities}" value="OCEAN_VIEW" /><label th:for="${#ids.prev('amenities')}">Ocean View</label>
-							<br />
+                            <br />
                             <input type="checkbox" th:field="*{amenities}" value="LATE_CHECKOUT" /><label th:for="${#ids.prev('amenities')}">Late Checkout</label>
-							<br />
+                            <br />
                             <input type="checkbox" th:field="*{amenities}" value="MINIBAR" /><label th:for="${#ids.prev('amenities')}">Minibar</label>
-						</p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							dojo.query("#amenities input[type='checkbox']").forEach(function(element){
-								Spring.addDecoration(new Spring.ElementDecoration({
-									elementId: element.id,
-									widgetType : "dijit.form.CheckBox",
-									widgetAttrs : { checked : element.checked }
-								}));
-							});
-							// ]]>
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCard">Credit Card #:</label>
-					</div>
-					<div class="span-7 last">
-						<p><input type="text" th:field="*{creditCard}" /></p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "creditCard",
-								widgetType : "dijit.form.ValidationTextBox",
-								widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
-								regExp : "[0-9]{16}"  }}));
-							// ]]>
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCardName">Credit Card Name:</label>
-					</div>
-					<div class="span-7 last">
+                        </p>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            dojo.query("#amenities input[type='checkbox']").forEach(function(element){
+                                Spring.addDecoration(new Spring.ElementDecoration({
+                                    elementId: element.id,
+                                    widgetType : "dijit.form.CheckBox",
+                                    widgetAttrs : { checked : element.checked }
+                                }));
+                            });
+                            // ]]>
+                        </script>
+                    </div>
+                </div>
+                <div>
+                    <div class="span-4">
+                        <label for="creditCard">Credit Card #:</label>
+                    </div>
+                    <div class="span-7 last">
+                        <p><input type="text" th:field="*{creditCard}" /></p>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : "creditCard",
+                                widgetType : "dijit.form.ValidationTextBox",
+                                widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
+                                regExp : "[0-9]{16}"  }}));
+                            // ]]>
+                        </script>
+                    </div>
+                </div>
+                <div>
+                    <div class="span-4">
+                        <label for="creditCardName">Credit Card Name:</label>
+                    </div>
+                    <div class="span-7 last">
                         <p><input type="text" th:field="*{creditCardName}" maxlength="40" /></p>
-						<script type="text/javascript">
-				            // <![CDATA[
-							Spring.addDecoration(new Spring.ElementDecoration({
-								elementId : "creditCardName",
-								widgetType : "dijit.form.ValidationTextBox",
-								widgetAttrs : { required : true }}));
-							// ]]>
-						</script>
-					</div>
-				</div>
-				<div>
-					<div class="span-4">
-						<label for="creditCardExpiryMonth">Expiration Date:</label>
-					</div>
-					<div class="span-7 last">
-						<p>
-							<select th:field="*{creditCardExpiryMonth}">
-								<option value="1">Jan</option>
-								<option value="2">Feb</option>
-								<option value="3">Mar</option>
-								<option value="4">Apr</option>
-								<option value="5">May</option>
-								<option value="6">Jun</option>
-								<option value="7">Jul</option>
-								<option value="8">Aug</option>
-								<option value="9">Sep</option>
-								<option value="10">Oct</option>
-								<option value="11">Nov</option>
-								<option value="12">Dec</option>
-							</select>
-							<select th:field="*{creditCardExpiryYear}">
-								<option value="1">2008</option>
-								<option value="2">2009</option>
-								<option value="3">2010</option>
-								<option value="4">2011</option>
-								<option value="5">2012</option>
-							</select>
-						</p>
-					</div>
-				</div>
-				<div>
-					<p>
-					    <button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
-					    <button type="submit" name="_eventId_cancel" >Cancel</button>
-					</p>
-					<script type="text/javascript">
-			            // <![CDATA[
-						Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
-						Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));
-						// ]]>
-					</script>
-				</div>
-			</fieldset>
+                        <script type="text/javascript">
+                            // <![CDATA[
+                            Spring.addDecoration(new Spring.ElementDecoration({
+                                elementId : "creditCardName",
+                                widgetType : "dijit.form.ValidationTextBox",
+                                widgetAttrs : { required : true }}));
+                            // ]]>
+                        </script>
+                    </div>
+                </div>
+                <div>
+                    <div class="span-4">
+                        <label for="creditCardExpiryMonth">Expiration Date:</label>
+                    </div>
+                    <div class="span-7 last">
+                        <p>
+                            <select th:field="*{creditCardExpiryMonth}">
+                                <option value="1">Jan</option>
+                                <option value="2">Feb</option>
+                                <option value="3">Mar</option>
+                                <option value="4">Apr</option>
+                                <option value="5">May</option>
+                                <option value="6">Jun</option>
+                                <option value="7">Jul</option>
+                                <option value="8">Aug</option>
+                                <option value="9">Sep</option>
+                                <option value="10">Oct</option>
+                                <option value="11">Nov</option>
+                                <option value="12">Dec</option>
+                            </select>
+                            <select th:field="*{creditCardExpiryYear}">
+                                <option value="1">2008</option>
+                                <option value="2">2009</option>
+                                <option value="3">2010</option>
+                                <option value="4">2011</option>
+                                <option value="5">2012</option>
+                            </select>
+                        </p>
+                    </div>
+                </div>
+                <div>
+                    <p>
+                        <button type="submit" id="proceed" name="_eventId_proceed">Proceed</button>
+                        <button type="submit" name="_eventId_cancel" >Cancel</button>
+                    </p>
+                    <script type="text/javascript">
+                        // <![CDATA[
+                        Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));
+                        Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'proceed',event:'onclick',formId:'booking'}));
+                        // ]]>
+                    </script>
+                </div>
+            </fieldset>
             
-		</form>
-        	
-	</div>
+        </form>
+            
+    </div>
     
 </div>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
index 5422e01..a54a00a 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -51,10 +51,10 @@
 
 <div id="bookingForm">
 
-	<div class="span-5">
+    <div class="span-5">
     
-		<h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
-		
+        <h3 th:text="${booking.hotel.name}">The Herb Plaza</h3>
+        
         <address th:object="${booking.hotel}">
             <span th:text="*{address}">Thyme Square, 13</span>
             <br />
@@ -65,64 +65,64 @@
             <span th:text="*{country}">Earth</span>
         </address>
 
-	</div>
+    </div>
     
-	<div class="span-12 last">
+    <div class="span-12 last">
     
-		<form id="confirm" action="#" method="post" th:object="${booking}" th:action="${flowExecutionUrl}">
+        <form id="confirm" action="#" method="post" th:object="${booking}" th:action="${flowExecutionUrl}">
         
-    		<fieldset>
+            <fieldset>
             
-    			<legend>Confirm Booking Details</legend>
+                <legend>Confirm Booking Details</legend>
                 
-    			<div>
-    				<div class="span-3">Check In:</div>
-    				<div class="span-8 last">
-    					<p th:text="*{checkinDate}">2012-12-21</p>
-    				</div>
-    			</div>
-    			<div>
-    				<div class="span-3">Checkout:</div>
-    				<div class="span-8 last">
+                <div>
+                    <div class="span-3">Check In:</div>
+                    <div class="span-8 last">
+                        <p th:text="*{checkinDate}">2012-12-21</p>
+                    </div>
+                </div>
+                <div>
+                    <div class="span-3">Checkout:</div>
+                    <div class="span-8 last">
                         <p th:text="*{checkoutDate}">2012-12-21</p>
-    				</div>
-    			</div>
-    	        <div>
-    	            <div class="span-3">Number of Nights:</div>
-    	            <div class="span-8 last">
+                    </div>
+                </div>
+                <div>
+                    <div class="span-3">Number of Nights:</div>
+                    <div class="span-8 last">
                         <p th:text="*{nights}">0</p>
-    	            </div>
-    	        </div>
-    	        <div>
-    	            <div class="span-3">Total Payment:</div>
-    	            <div class="span-8 last">
+                    </div>
+                </div>
+                <div>
+                    <div class="span-3">Total Payment:</div>
+                    <div class="span-8 last">
                         <p th:text="*{total}">400.00</p>
-    	            </div>
-    	        </div>
-    			<div>
-    				<div class="span-3">Credit Card #:</div>
-    				<div class="span-8 last">
+                    </div>
+                </div>
+                <div>
+                    <div class="span-3">Credit Card #:</div>
+                    <div class="span-8 last">
                         <p th:text="*{creditCard}">1234123412341234</p>
-    				</div>
-    			</div>
-    			<div>
-    				<p>
-    					<button type="submit" name="_eventId_confirm">Confirm</button>
-    					<button type="submit" name="_eventId_revise" id="revise">Revise</button>
-    					<button type="submit" name="_eventId_cancel">Cancel</button>
-    				</p>
-    				<script type="text/javascript">
-    		            // <![CDATA[
-    					Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
-    					// ]]>
-    				</script>
-    			</div>
+                    </div>
+                </div>
+                <div>
+                    <p>
+                        <button type="submit" name="_eventId_confirm">Confirm</button>
+                        <button type="submit" name="_eventId_revise" id="revise">Revise</button>
+                        <button type="submit" name="_eventId_cancel">Cancel</button>
+                    </p>
+                    <script type="text/javascript">
+                        // <![CDATA[
+                        Spring.addDecoration(new Spring.AjaxEventDecoration({elementId:'revise',event:'onclick',formId:'confirm'}));
+                        // ]]>
+                    </script>
+                </div>
                 
-    		</fieldset>
+            </fieldset>
         
-		</form>
+        </form>
         
-	</div>
+    </div>
 
 </div>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
index 3cddaa3..d6bbc21 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
@@ -50,40 +50,40 @@
 
 <div id="bookings" sec:authorize="hasRole('ROLE_USER')">
 
-	<h2>Current Hotel Bookings</h2>
+    <h2>Current Hotel Bookings</h2>
 
-	<p th:unless="${bookingList}">
-		No bookings found
-	</p>
+    <p th:unless="${bookingList}">
+        No bookings found
+    </p>
 
-	<table class="summary" th:if="${bookingList}">
-		<thead>
-			<tr>
-				<th>Name</th>
-				<th>Address</th>
-				<th>City, State</th>
-				<th>Check in Date</th>
-				<th>Check out Date</th>
-				<th>Confirmation Number</th>
-				<th>Action</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr th:each="booking : ${bookingList}" th:object="${booking}">
-				<td th:text="*{hotel.name}">The Herb Plaza</td>
-				<td th:text="*{hotel.address}">Thyme Square, 13</td>
-				<td th:text="*{hotel.city} + ', ' + *{hotel.state}">Icetown, North Pole</td>
-				<td th:text="*{checkinDate}">2012-12-21</td>
-				<td th:text="*{checkoutDate}">2012-12-21</td>
-				<td th:text="*{id}">1</td>
-				<td>
+    <table class="summary" th:if="${bookingList}">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Address</th>
+                <th>City, State</th>
+                <th>Check in Date</th>
+                <th>Check out Date</th>
+                <th>Confirmation Number</th>
+                <th>Action</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr th:each="booking : ${bookingList}" th:object="${booking}">
+                <td th:text="*{hotel.name}">The Herb Plaza</td>
+                <td th:text="*{hotel.address}">Thyme Square, 13</td>
+                <td th:text="*{hotel.city} + ', ' + *{hotel.state}">Icetown, North Pole</td>
+                <td th:text="*{checkinDate}">2012-12-21</td>
+                <td th:text="*{checkoutDate}">2012-12-21</td>
+                <td th:text="*{id}">1</td>
+                <td>
                     <form action="#" th:action="@{'/bookings/' + *{id}}" th:method="'delete'">
                         <button type="submit">Cancel</button>
                     </form>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
     
 </div>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
index 6ec83ca..45e8150 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -52,83 +52,83 @@
 <h1>Hotel Results</h1>
 
 <p>
-	<a id="changeSearchLink" href="#" 
+    <a id="changeSearchLink" href="#" 
        th:href="@{hotels/search(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize})}">Change Search</a>
-	<script type="text/javascript">
+    <script type="text/javascript">
         // <![CDATA[
-		Spring.addDecoration(new Spring.AjaxEventDecoration({
-			elementId: "changeSearchLink",
-			event: "onclick",
-			popup: true,
-			params: {fragments: "searchForm"}		
-		}));
-		// ]]>
-	</script>
+        Spring.addDecoration(new Spring.AjaxEventDecoration({
+            elementId: "changeSearchLink",
+            event: "onclick",
+            popup: true,
+            params: {fragments: "searchForm"}       
+        }));
+        // ]]>
+    </script>
 </p>
 
 <div id="hotelResults">
 
   <div th:if="${hotelList}">
   
-	<table class="summary">
-		<thead>
-			<tr>
-				<th>Name</th>
-				<th>Address</th>
-				<th>City, State</th>
-				<th>Zip</th>
-				<th>Action</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr th:each="hotel : ${hotelList}">
-				<td th:text="${hotel.name}">The Herb Plaza</td>
-				<td th:text="${hotel.address}">Thyme Square, 13</td>
-				<td th:text="${hotel.city} + ', ' + ${hotel.state} + ', ' + ${hotel.country}">Icetown, North Pole, Earth</td>
-				<td th:text="${hotel.zip}">0W</td>
-				<td><a href="#" th:href="@{'hotels/' + ${hotel.id}}">View Hotel</a></td>
-			</tr>
-			<tr th:unless="${hotelList}">
-				<td colspan="5">No hotels found</td>
-			</tr>
-		</tbody>
-	</table>
+    <table class="summary">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Address</th>
+                <th>City, State</th>
+                <th>Zip</th>
+                <th>Action</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr th:each="hotel : ${hotelList}">
+                <td th:text="${hotel.name}">The Herb Plaza</td>
+                <td th:text="${hotel.address}">Thyme Square, 13</td>
+                <td th:text="${hotel.city} + ', ' + ${hotel.state} + ', ' + ${hotel.country}">Icetown, North Pole, Earth</td>
+                <td th:text="${hotel.zip}">0W</td>
+                <td><a href="#" th:href="@{'hotels/' + ${hotel.id}}">View Hotel</a></td>
+            </tr>
+            <tr th:unless="${hotelList}">
+                <td colspan="5">No hotels found</td>
+            </tr>
+        </tbody>
+    </table>
     
-	<div class="buttonGroup">
-		<div class="span-3">
-			<div th:if="${searchCriteria.page > 0}">
+    <div class="buttonGroup">
+        <div class="span-3">
+            <div th:if="${searchCriteria.page > 0}">
                 <a id="prevResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page - 1})}">Previous Results</a>
-				<script type="text/javascript">
-		            // <![CDATA[
-					Spring.addDecoration(new Spring.AjaxEventDecoration({
-						elementId: "prevResultsLink",
-						event: "onclick",
-						params: {fragments: "body"}
-					}));
-					// ]]>
-				</script>
-			</div>
-		</div>
-		<div class="span-3 append-12 last">
-			<div th:if="${hotelList} and ${hotelList.size() == searchCriteria.pageSize}">
-				<a id="moreResultsLink" href="#" 
+                <script type="text/javascript">
+                    // <![CDATA[
+                    Spring.addDecoration(new Spring.AjaxEventDecoration({
+                        elementId: "prevResultsLink",
+                        event: "onclick",
+                        params: {fragments: "body"}
+                    }));
+                    // ]]>
+                </script>
+            </div>
+        </div>
+        <div class="span-3 append-12 last">
+            <div th:if="${hotelList} and ${hotelList.size() == searchCriteria.pageSize}">
+                <a id="moreResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page + 1})}">More Results</a>
-				<script type="text/javascript">
-		            // <![CDATA[
-					Spring.addDecoration(new Spring.AjaxEventDecoration({
-						elementId: "moreResultsLink",
-						event: "onclick",
-						params: {fragments: "body"}		
-					}));
-					// ]]>
-				</script>
-			</div>		
-		</div>
-	</div>
+                <script type="text/javascript">
+                    // <![CDATA[
+                    Spring.addDecoration(new Spring.AjaxEventDecoration({
+                        elementId: "moreResultsLink",
+                        event: "onclick",
+                        params: {fragments: "body"}     
+                    }));
+                    // ]]>
+                </script>
+            </div>      
+        </div>
+    </div>
   </div>
 
-</div>	
+</div>  
 
 
 </body>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
index ddfbc68..f337b8c 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
@@ -56,32 +56,32 @@
         <li th:each="err : ${#fields.errors('*')}" th:text="${err}">Input is incorrect</li>
     </ul>
 
-	<fieldset>
-		<div class="span-8">
-			<label for="searchString">Search String:</label>
-			<input type="text" id="searchString" th:field="*{searchString}" />
-			<script type="text/javascript">
-	            // <![CDATA[
-				Spring.addDecoration(new Spring.ElementDecoration({
-					elementId : "searchString",
-					widgetType : "dijit.form.ValidationTextBox",
-					widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
-				// ]]>
-			</script>
-		</div>
-		<div class="span-6">
-			<div>
-				<label for="pageSize">Maximum results:</label>
-				<select id="pageSize" th:field="*{pageSize}">
-					<option label="5" value="5" />
-					<option label="10" value="10" />
-					<option label="20" value="20" />
-				</select>
-			</div>
-		</div>
-		<div class="span-3 last">
-			<button type="submit">Find Hotels</button>
-		</div>		
+    <fieldset>
+        <div class="span-8">
+            <label for="searchString">Search String:</label>
+            <input type="text" id="searchString" th:field="*{searchString}" />
+            <script type="text/javascript">
+                // <![CDATA[
+                Spring.addDecoration(new Spring.ElementDecoration({
+                    elementId : "searchString",
+                    widgetType : "dijit.form.ValidationTextBox",
+                    widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
+                // ]]>
+            </script>
+        </div>
+        <div class="span-6">
+            <div>
+                <label for="pageSize">Maximum results:</label>
+                <select id="pageSize" th:field="*{pageSize}">
+                    <option label="5" value="5" />
+                    <option label="10" value="10" />
+                    <option label="20" value="20" />
+                </select>
+            </div>
+        </div>
+        <div class="span-3 last">
+            <button type="submit">Find Hotels</button>
+        </div>      
     </fieldset>
     
 </form>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
index 3ed7168..e4f6489 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
@@ -52,23 +52,23 @@
 <h1 th:text="${hotel.name}">The Herb Plaza</h1>
 
 <address th:object="${hotel}">
-	<span th:text="*{address}">Thyme Square, 13</span>
-	<br />
-	<span th:text="*{city}">Icetown</span>, 
+    <span th:text="*{address}">Thyme Square, 13</span>
+    <br />
+    <span th:text="*{city}">Icetown</span>, 
     <span th:text="*{state}">North Pole</span>, 
     <span th:text="*{zip}">0W</span>
-	<br />
-	<span th:text="*{country}">Earth</span>
+    <br />
+    <span th:text="*{country}">Earth</span>
 </address>
 
 <form action="#" th:action="@{/hotels/booking(mode='embedded')}" method="get">
-	<p>
-		Nightly Rate: <span th:text="${hotel.price}">4,300</span>
-	</p>
-	<input type="hidden" name="hotelId" th:value="${hotel.id}" />
-	<div>
-		<button type="submit">Book Hotel</button>
-	</div>
+    <p>
+        Nightly Rate: <span th:text="${hotel.price}">4,300</span>
+    </p>
+    <input type="hidden" name="hotelId" th:value="${hotel.id}" />
+    <div>
+        <button type="submit">Book Hotel</button>
+    </div>
 </form>
 
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index a5ea43b..b434438 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -48,33 +48,33 @@
 <body tiles:fragment="content">
 
 <div>
-	<h1>Welcome to Spring Travel</h1>
-	<p>
-	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
-	</p>
-	<hr />
-	<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>Spring Expression Language (SpEL) integration</li>
-		<li>Spring 3 formatting annotations @DateTimeFormat, @NumberFormat</li>
-		<li>Spring MVC custom namespace</li>
-		<li>Spring Security integration</li>
-		<li>Annotated POJO @Controllers for implementing RESTful user interactions.</li>
-		<li>Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library</li>
-		<li>Page layout and composition with Apache Tiles</li>
-		<li>A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.</li>
-		<li>A grid layout with Blueprint CSS</li>
-		<li>Exception handling support across all layers of the application</li>
-		<li>SpringSource Tool Suite integration, with support for graphical flow modeling and visualization</li>
-	</ul>
-	<p>
-		<a href="hotels/search.html" th:href="@{/hotels/search}">Start your Spring Travel experience</a>
-	</p>
+    <h1>Welcome to Spring Travel</h1>
+    <p>
+        This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
+    </p>
+    <hr />
+    <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>Spring Expression Language (SpEL) integration</li>
+        <li>Spring 3 formatting annotations @DateTimeFormat, @NumberFormat</li>
+        <li>Spring MVC custom namespace</li>
+        <li>Spring Security integration</li>
+        <li>Annotated POJO @Controllers for implementing RESTful user interactions.</li>
+        <li>Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library</li>
+        <li>Page layout and composition with Apache Tiles</li>
+        <li>A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.</li>
+        <li>A grid layout with Blueprint CSS</li>
+        <li>Exception handling support across all layers of the application</li>
+        <li>SpringSource Tool Suite integration, with support for graphical flow modeling and visualization</li>
+    </ul>
+    <p>
+        <a href="hotels/search.html" th:href="@{/hotels/search}">Start your Spring Travel experience</a>
+    </p>
 </div>
 
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index a1e39aa..fb1c2de 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -8,23 +8,23 @@
 <head>
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     
-	<link rel="stylesheet" type="text/css" media="screen, projection" 
+    <link rel="stylesheet" type="text/css" media="screen, projection" 
           href="../../styles/blueprint/screen.css" 
           th:href="@{/resources/styles/blueprint/screen.css}" />
     
-	<link rel="stylesheet" type="text/css" media="print" 
+    <link rel="stylesheet" type="text/css" media="print" 
           href="../../styles/blueprint/print.css" 
           th:href="@{/resources/styles/blueprint/print.css}" />
     
-	<!--[if lt IE 8]>
-	    <link rel="stylesheet" type="text/css" media="screen, projection"
+    <!--[if lt IE 8]>
+        <link rel="stylesheet" type="text/css" media="screen, projection"
               href="../../styles/blueprint/ie.css" 
               th:href="@{/resources/styles/blueprint/ie.css}" />
-	<![endif]-->
+    <![endif]-->
     
-	<link rel="stylesheet" type="text/css" media="screen" 
+    <link rel="stylesheet" type="text/css" media="screen" 
           href="../../styles/booking.css" 
           th:href="@{/resources/styles/booking.css}" />
 
@@ -45,39 +45,39 @@
 
 <div id="page" class="container">
 
-	<div id="header">
-		<div id="topbar">
-			<p sec:authorize="hasRole('ROLE_USER')" th:if="${#authentication}">
-				Welcome, <span sec:authentication="name">Dear User</span> |
-				<a href="#" th:href="@{/logout}">Logout</a>
-			</p>
-			<p sec:authorize="hasRole('ROLE_ANONYMOUS')">
-				<a href="#" th:href="@{/login}">Login</a>
-			</p>
-		</div>
-		<div id="logo">
-			<p>
-				<a href="#" th:href="@{/}">
-					<img src="../../images/header.jpg" th:src="@{/resources/images/header.jpg}" alt="Spring Travel" />
-				</a>
-			</p>
-		</div>
-	</div>
+    <div id="header">
+        <div id="topbar">
+            <p sec:authorize="hasRole('ROLE_USER')" th:if="${#authentication}">
+                Welcome, <span sec:authentication="name">Dear User</span> |
+                <a href="#" th:href="@{/logout}">Logout</a>
+            </p>
+            <p sec:authorize="hasRole('ROLE_ANONYMOUS')">
+                <a href="#" th:href="@{/login}">Login</a>
+            </p>
+        </div>
+        <div id="logo">
+            <p>
+                <a href="#" th:href="@{/}">
+                    <img src="../../images/header.jpg" th:src="@{/resources/images/header.jpg}" alt="Spring Travel" />
+                </a>
+            </p>
+        </div>
+    </div>
     
-	<div id="content">
-		<div id="local" class="span-6">
-			<p>
-				<a href="http://www.thespringexperience.com">
-					<img src="../../images/diplomat.jpg" th:src="@{/resources/images/diplomat.jpg}" alt="generic hotel" />
-				</a>
-			</p>
-			<p>
-				<a href="http://www.thespringexperience.com">
-					<img src="../../images/springone2gx.jpeg" th:src="@{/resources/images/springone2gx.jpeg}" alt="SpringOne 2GX" />
-				</a>
-			</p>
-		</div>
-		<div id="main" class="span-18 last" tiles:include="body">
+    <div id="content">
+        <div id="local" class="span-6">
+            <p>
+                <a href="http://www.thespringexperience.com">
+                    <img src="../../images/diplomat.jpg" th:src="@{/resources/images/diplomat.jpg}" alt="generic hotel" />
+                </a>
+            </p>
+            <p>
+                <a href="http://www.thespringexperience.com">
+                    <img src="../../images/springone2gx.jpeg" th:src="@{/resources/images/springone2gx.jpeg}" alt="SpringOne 2GX" />
+                </a>
+            </p>
+        </div>
+        <div id="main" class="span-18 last" tiles:include="body">
 
           <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->      
           <!-- At runtime, the body of this <div> will be substituted by -->
@@ -87,16 +87,16 @@
           
           BODY PAGE GOES HERE!
           
-		</div>
-	</div>
+        </div>
+    </div>
     
-	<hr />
+    <hr />
     
-	<div id="footer">
-		<a href="http://www.springframework.org">
-			<img src="../../images/powered-by-spring.png" th:src="@{/resources/images/powered-by-spring.png}" alt="Powered by Spring" />
-		</a>
-	</div>
+    <div id="footer">
+        <a href="http://www.springframework.org">
+            <img src="../../images/powered-by-spring.png" th:src="@{/resources/images/powered-by-spring.png}" alt="Powered by Spring" />
+        </a>
+    </div>
     
 </div>
 </body>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html
index 700e91a..e27a7ad 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/login.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/login.html
@@ -49,13 +49,13 @@
 
 
 <div class="span-5">
-	<p>Valid username/passwords are:</p>
-	<ul>
-		<li>keith/melbourne</li>
-		<li>erwin/leuven</li>
-		<li>jeremy/atlanta</li>
-		<li>scott/rochester</li>
-	</ul>
+    <p>Valid username/passwords are:</p>
+    <ul>
+        <li>keith/melbourne</li>
+        <li>erwin/leuven</li>
+        <li>jeremy/atlanta</li>
+        <li>scott/rochester</li>
+    </ul>
 </div>
 
 <div class="span-10 append-2 last" 
@@ -63,72 +63,72 @@
      th:with="lastUsernameKey=${T(org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter).SPRING_SECURITY_LAST_USERNAME_KEY},
               lastExceptionKey=${T(org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter).SPRING_SECURITY_LAST_EXCEPTION_KEY}">
 
-	<div class="error" th:if="${param.login_error}">
-		Your login attempt was not successful, try again.<br /><br />
-		Reason: <span th:text="${session[__${lastExceptionKey}__].message}">Invalid password</span> 
-	</div>
+    <div class="error" th:if="${param.login_error}">
+        Your login attempt was not successful, try again.<br /><br />
+        Reason: <span th:text="${session[__${lastExceptionKey}__].message}">Invalid password</span> 
+    </div>
     
-	<form name="f" action="#" th:action="@{/loginProcess}" method="post">
+    <form name="f" action="#" th:action="@{/loginProcess}" method="post">
     
-		<fieldset>
+        <fieldset>
         
-			<legend>Login Information</legend>
+            <legend>Login Information</legend>
             
-			<p>
-				<label for="j_username">User:</label>
-				<br />
-				<input type="text" name="j_username" id="j_username"
+            <p>
+                <label for="j_username">User:</label>
+                <br />
+                <input type="text" name="j_username" id="j_username"
                        th:value="${param.login_error} ? ${session[__${lastUsernameKey}__]} : ''" />
-			</p>
+            </p>
             
-			<script type="text/javascript">
-  			    // <![CDATA[
-				    Spring.addDecoration(new Spring.ElementDecoration({
-					    elementId : "j_username",
-					    widgetType : "dijit.form.ValidationTextBox",
-					    widgetAttrs : { required : true }}));
-			    // ]]>
-			</script>
+            <script type="text/javascript">
+                // <![CDATA[
+                    Spring.addDecoration(new Spring.ElementDecoration({
+                        elementId : "j_username",
+                        widgetType : "dijit.form.ValidationTextBox",
+                        widgetAttrs : { required : true }}));
+                // ]]>
+            </script>
             
-			<p>
-				<label for="j_password">Password:</label>
-				<br />
-				<input type="password" name="j_password" id="j_password" />
-			</p>
+            <p>
+                <label for="j_password">Password:</label>
+                <br />
+                <input type="password" name="j_password" id="j_password" />
+            </p>
             
-			<script type="text/javascript">
-			    // <![CDATA[
-				    Spring.addDecoration(new Spring.ElementDecoration({
-					    elementId : "j_password",
-					    widgetType : "dijit.form.ValidationTextBox",
-					    widgetAttrs : { required : true}}));
-			    // ]]>
-			</script>
+            <script type="text/javascript">
+                // <![CDATA[
+                    Spring.addDecoration(new Spring.ElementDecoration({
+                        elementId : "j_password",
+                        widgetType : "dijit.form.ValidationTextBox",
+                        widgetAttrs : { required : true}}));
+                // ]]>
+            </script>
             
-			<p>
-				<input type="checkbox" name="_spring_security_remember_me" id="remember_me" />
-				<label for="remember_me">Don't ask for my password for two weeks:</label>
-			</p>
+            <p>
+                <input type="checkbox" name="_spring_security_remember_me" id="remember_me" />
+                <label for="remember_me">Don't ask for my password for two weeks:</label>
+            </p>
             
-			<script type="text/javascript">
-		        // <![CDATA[
-				    Spring.addDecoration(new Spring.ElementDecoration({
-					    elementId : "remember_me",
-					    widgetType : "dijit.form.CheckBox"}));
-				// ]]>
-			</script>
+            <script type="text/javascript">
+                // <![CDATA[
+                    Spring.addDecoration(new Spring.ElementDecoration({
+                        elementId : "remember_me",
+                        widgetType : "dijit.form.CheckBox"}));
+                // ]]>
+            </script>
             
-			<p>
-				<button id="submit" type="submit">Login</button>
-				<script type="text/javascript">
-					Spring.addDecoration(
-					        new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
-				</script>
-			</p>
+            <p>
+                <button id="submit" type="submit">Login</button>
+                <script type="text/javascript">
+                    Spring.addDecoration(
+                            new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
+                </script>
+            </p>
             
-		</fieldset>
+        </fieldset>
         
-	</form>
+    </form>
     
 </div>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
index 6cbead6..b8552d5 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
@@ -49,10 +49,10 @@
 
 
 <div>
-	<h1>Logout</h1>
-	<p>You have successfully logged out.</p>
-	<hr />
-	<p><a href="hotels/searchForm.html" th:href="@{/hotels/search}">Continue</a></p>
+    <h1>Logout</h1>
+    <p>You have successfully logged out.</p>
+    <hr />
+    <p><a href="hotels/searchForm.html" th:href="@{/hotels/search}">Continue</a></p>
 </div>
 
 

From 35fcc082a96eca814f80e7900efcec570083c16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Mon, 31 Dec 2012 02:59:37 +0100
Subject: [PATCH 21/22] Modified thymeleaf-extras-* dependencies to version
 2.0.0

---
 booking-mvc/pom.xml | 108 ++++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 50 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index bfdb618..3448b7e 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -14,21 +14,22 @@
 		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 		<thymeleaf-version>2.0.15</thymeleaf-version>
-		<thymeleaf-extras-tiles2-version>1.0.0-beta3</thymeleaf-extras-tiles2-version>
-		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2</thymeleaf-extras-springsecurity3-version>
-		<thymeleaf-extras-conditionalcomments-version>1.0.0-beta1</thymeleaf-extras-conditionalcomments-version>
+		<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
+		<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
+		<thymeleaf-extras-conditionalcomments-version>2.0.0</thymeleaf-extras-conditionalcomments-version>
 		<tiles-version>2.2.2</tiles-version>
 	</properties>
 
-  <repositories>
-    <repository>
-      <id>spring-repository</id>
-      <name>Spring project snapshots, milestones, and releases</name>
-      <url>http://repo.springsource.org/snapshot</url>
-    </repository>
-  </repositories>
+	<repositories>
+		<repository>
+			<id>spring-repository</id>
+			<name>Spring project snapshots, milestones, and releases</name>
+			<url>http://repo.springsource.org/snapshot</url>
+		</repository>
+	</repositories>
 
 	<dependencies>
+	
 		<!-- Thymeleaf -->
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
@@ -50,6 +51,7 @@
 			<artifactId>thymeleaf-extras-springsecurity3</artifactId>
 			<version>${thymeleaf-extras-springsecurity3-version}</version>
 		</dependency>
+		
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -109,6 +111,7 @@
 				 </exclusion>
 			</exclusions>						
         </dependency>	
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -150,6 +153,7 @@
 			</exclusions>
 			<scope>runtime</scope>
 		</dependency>
+		
 		<!-- Database, JPA -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -162,6 +166,7 @@
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>3.5.0-Final</version>
 		</dependency>
+		
 		<!-- Servlet -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -224,6 +229,7 @@
           <artifactId>jaxb-api</artifactId>
           <version>2.1</version>
         </dependency>
+        
 		<!--  Joda Time -->
 		<dependency>
 			<groupId>joda-time</groupId>
@@ -236,6 +242,7 @@
 			<version>1.0.2</version>
 			<scope>runtime</scope>
 		</dependency>		
+
 		<!-- Test -->
 		<dependency>
 			<groupId>org.easymock</groupId>
@@ -257,44 +264,45 @@
 		</dependency>
 	</dependencies>
 
-  <build>
-    <finalName>booking-mvc</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
-        <configuration>
-          <junitArtifactName>junit:junit</junitArtifactName>
-          <includes>
-            <include>**/*Tests.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <version>2.0-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <downloadJavadocs>false</downloadJavadocs>
-          <wtpversion>2.0</wtpversion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<build>
+		<finalName>booking-mvc</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12</version>
+				<configuration>
+					<junitArtifactName>junit:junit</junitArtifactName>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.0-SNAPSHOT</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<downloadSources>true</downloadSources>
+					<downloadJavadocs>false</downloadJavadocs>
+					<wtpversion>2.0</wtpversion>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>

From 2adb680e6aea0b78f8659286c9c931cbc89518e9 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 1 Feb 2013 16:51:58 -0500
Subject: [PATCH 22/22] Upgrade to SWF 2.4 M1 and fix git rebase issues

---
 booking-faces/pom.xml                         |  6 ++---
 booking-mvc/pom.xml                           | 26 +++++++++++++------
 .../webapp/WEB-INF/config/webmvc-config.xml   | 14 ----------
 booking-portlet-faces/pom.xml                 |  6 ++---
 booking-portlet-mvc/pom.xml                   |  6 ++---
 5 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index 84273a0..ea56105 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -11,7 +11,7 @@
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 		<mojarra-version>2.1.7</mojarra-version>
 		<primefaces-version>3.1.1</primefaces-version>
@@ -20,8 +20,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 		<repository>
 			<id>primefaces-repository</id>
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 3448b7e..3c17ea0 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -11,8 +11,8 @@
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
-		<slf4j-version>1.5.10</slf4j-version>
+		<webflow-version>2.4.0.M1</webflow-version>
+		<slf4j-version>1.6.1</slf4j-version>
 		<thymeleaf-version>2.0.15</thymeleaf-version>
 		<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
 		<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
@@ -23,8 +23,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>
 
@@ -51,8 +51,18 @@
 			<artifactId>thymeleaf-extras-springsecurity3</artifactId>
 			<version>${thymeleaf-extras-springsecurity3-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
+			<version>${thymeleaf-extras-conditionalcomments-version}</version>
+		</dependency>
 		
 		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${springframework-version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
@@ -85,7 +95,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>
 		</dependency>
@@ -96,7 +106,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>
 		</dependency>
@@ -107,7 +117,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
-					<artifactId>*</artifactId>
+					<artifactId>spring-aop</artifactId>
 				 </exclusion>
 			</exclusions>						
         </dependency>	
@@ -295,7 +305,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
+				<version>2.9</version>
 				<configuration>
 					<downloadSources>true</downloadSources>
 					<downloadJavadocs>false</downloadJavadocs>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 2bdfa4e..394aece 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -23,20 +23,6 @@
 	<mvc:view-controller path="/login" />
 	<mvc:view-controller path="/logoutSuccess" />
 
-	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
-	<bean id="tilesViewResolver" class="org.springframework.js.ajax.AjaxUrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.webflow.mvc.view.FlowAjaxTilesView"/>
-	</bean>
-
-	<!-- Configures the Tiles layout system -->
-	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
-		<property name="definitions">
-			<list>
-				<value>/WEB-INF/**/views.xml</value>
-			</list>
-		</property>
-	</bean>
-	
 	<!-- Dispatches requests mapped to flows to FlowHandler implementations -->
 	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter">
 		<property name="flowExecutor" ref="flowExecutor"/>
diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml
index c0e4f4f..99b5b87 100644
--- a/booking-portlet-faces/pom.xml
+++ b/booking-portlet-faces/pom.xml
@@ -10,7 +10,7 @@
 
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 		<myfaces-version>2.1.6</myfaces-version>
 	</properties>
@@ -18,8 +18,8 @@
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>
 
diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml
index 310a22c..ba1d1b1 100644
--- a/booking-portlet-mvc/pom.xml
+++ b/booking-portlet-mvc/pom.xml
@@ -10,15 +10,15 @@
 
 	<properties>
 		<springframework-version>3.2.1.RELEASE</springframework-version>
-		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
+		<webflow-version>2.4.0.M1</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
 	</properties>
 
 	<repositories>
 		<repository>
 			<id>spring-repository</id>
-			<name>Spring project snapshots, milestones, and releases</name>
-			<url>http://repo.springsource.org/snapshot</url>
+			<name>SpringSource Repository</name>
+			<url>http://repo.springsource.org/milestone</url>
 		</repository>
 	</repositories>