diff --git a/spring-webflow-samples/booking-faces/.classpath b/spring-webflow-samples/booking-faces/.classpath
index 35e84375..41effcfe 100755
--- a/spring-webflow-samples/booking-faces/.classpath
+++ b/spring-webflow-samples/booking-faces/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/el-api/el-api-1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-faces/.springBeans b/spring-webflow-samples/booking-faces/.springBeans
index a1c6dc1e..455ff2cf 100755
--- a/spring-webflow-samples/booking-faces/.springBeans
+++ b/spring-webflow-samples/booking-faces/.springBeans
@@ -19,9 +19,9 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
+				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
-				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
 			</configs>
diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index ee222953..3d2926b9 100755
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -6,7 +6,9 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/easymock/easymock-2.3.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/servlet-api/servlet-api-2.4.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/easymock/easymock-sources-2.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVVY_CACHE/javax.el/el-api/el-api-sources-1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-mvc/.springBeans b/spring-webflow-samples/booking-mvc/.springBeans
index 7065ca75..92b4d41e 100755
--- a/spring-webflow-samples/booking-mvc/.springBeans
+++ b/spring-webflow-samples/booking-mvc/.springBeans
@@ -19,9 +19,9 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
+				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
-				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
 				<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
 			</configs>
diff --git a/spring-webflow-samples/booking-portlet-mvc/.classpath b/spring-webflow-samples/booking-portlet-mvc/.classpath
index 898600ff..996dbcc2 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.classpath
+++ b/spring-webflow-samples/booking-portlet-mvc/.classpath
@@ -6,6 +6,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-3.8.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="IVY_CACHE/javax.servlet/servlet-api/servlet-api-sources-2.4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.portlet/com.springsource.javax.portlet/1.0.0/com.springsource.javax.portlet-1.0.0.jar" sourcepath="IVY_CACHE/javax.portlet/portlet-api/portlet-api-sources-1.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
index 7d4df312..d4a91c60 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp
@@ -124,7 +124,7 @@
 				</td>
 			</tr>
 			<tr class="field">
-				<td colspan="2" class="buttonGroup"
+				<td colspan="2" class="buttonGroup">
 					<input type="submit" name="_eventId_proceed" value="Proceed"/>&#160;
 					<input type="submit" name="_eventId_cancel" value="Cancel"/>&#160;
 				</td>
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
index 614a51cf..4dcea977 100644
--- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
+++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp
@@ -44,7 +44,7 @@
 				</td>
 			</tr>
 			<tr class="field">
-				<td class="label">Check Out Date:</div>
+				<td class="label">Check Out Date:</td>
 				<td class="output">
 					<spring:bind path="checkoutDate">${status.value}</spring:bind>
 				</td>