diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt
index 67e2c502..7b453d44 100644
--- a/build-spring-webflow/resources/changelog.txt
+++ b/build-spring-webflow/resources/changelog.txt
@@ -2,6 +2,12 @@ SPRING WEB FLOW CHANGELOG
 =========================
 http://www.springframework.org/webflow
 
+Changes in version 2.4.0.RELEASE
+-----------------------------------------------
+
+
+
+
 Changes in version 2.3.0.RELEASE (Feb 28, 2011)
 -----------------------------------------------
 [SWF-360] - Flow managed persistence context propagation
diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt
index 69bedf7e..a3218721 100644
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.3.0
+SPRING WEB FLOW 2.4.0
 ----------------------
 http://www.springframework.org/webflow
 
@@ -50,25 +50,25 @@ The following jar files are included in the distribution.
 The contents of each jar and its dependencies are noted.
 Dependencies in [brackets] are optional, and are just necessary for certain functionality.
 
-* org.springframework.webflow-2.3.0.RELEASE.jar
+* org.springframework.webflow-2.4.0.RELEASE.jar
 - Contents: The Spring Web Flow system
 - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-expression, spring-binding, spring-web, spring-web-servlet, spring-js
                 [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
               
-* org.springframework.binding-2.3.0.RELEASE.jar
+* org.springframework.binding-2.4.0.RELEASE.jar
 - Contents: The Spring Data Binding framework, a utility library used by Web Flow
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-expression
                 [Log4J, OGNL, EL API]
 
-* org.springframework.js-2.3.0.RELEASE.jar
+* org.springframework.js-2.4.0.RELEASE.jar
 - Contents: The Spring JavaScript module
 - Dependencies: spring-beans, spring-core, spring-context, spring-web, spring-web-servlet
 
-* org.springframework.js.resources-2.3.0.RELEASE.jar
+* org.springframework.js.resources-2.4.0.RELEASE.jar
 - Contents: Spring's custom Dojo build and client-side Dojo integration files.
 - Dependencies: 
 
-* org.springframework.faces-2.3.0.RELEASE.jar
+* org.springframework.faces-2.4.0.RELEASE.jar
 - Contents: The Spring Faces module, containing Spring's integration with Java Server Faces (JSF) and additional JSF functionality.
 - Dependencies: spring-webflow, spring-js, spring-js-resources, JSF API
                                 
@@ -109,19 +109,19 @@ org.springframework.js, and org.springframework.js via transitive dependencies):
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency> 
 
 If using JavaServerFaces all you need to include is:
@@ -129,7 +129,7 @@ If using JavaServerFaces all you need to include is:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency> 
 
 To access jars using Ivy, add the following repositories to your Ivy config:
@@ -146,13 +146,13 @@ To access jars using Ivy, add the following repositories to your Ivy config:
 
 Then declare the following dependencies in your ivy.xml:
 
-<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.3.0.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.3.0.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.3.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.4.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.4.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.4.0.RELEASE" conf="compile->runtime" />
 
 If using JavaServerFaces:
 
-<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.3.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.4.0.RELEASE" conf="compile->runtime" />
 
 Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.
 	
diff --git a/build.properties b/build.properties
index 1bc2bd83..b9b50c63 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.3.0
+version=2.4.0
 release.type=integration
 natural.name=spring-webflow
 project.key=SWF
@@ -21,4 +21,3 @@ ivy.settings.file=${basedir}/../build-spring-webflow/ivysettings.xml
 # For development in trunk
 #release.type=integration
 
-
diff --git a/pom.xml b/pom.xml
index f55958f6..c9dc471c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-webflow-root</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Web Flow</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<modules>
 		<module>spring-binding</module>
 		<module>spring-js-resources</module>
diff --git a/spring-binding/.classpath b/spring-binding/.classpath
index 950a9819..586caa4c 100644
--- a/spring-binding/.classpath
+++ b/spring-binding/.classpath
@@ -1,21 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-1.0.0.jar" sourcepath="/IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.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/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.el/com.springsource.org.jboss.el/2.0.0.GA/com.springsource.org.jboss.el-2.0.0.GA.jar" sourcepath="/IVY_CACHE/org.jboss.el/com.springsource.org.jboss.el/2.0.0.GA/com.springsource.org.jboss.el-sources-2.0.0.GA.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-3.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-sources-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.ognl/com.springsource.org.ognl/2.6.9/com.springsource.org.ognl-2.6.9.jar" sourcepath="/IVY_CACHE/org.ognl/com.springsource.org.ognl/2.6.9/com.springsource.org.ognl-sources-2.6.9.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/home/rossen/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/home/rossen/.m2/repository/org/easymock/easymock/2.5.2/easymock-2.5.2-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/2.0.1.GA/jboss-el-2.0.1.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar" sourcepath="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/home/rossen/.m2/repository/joda-time/joda-time/1.6/joda-time-1.6-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
diff --git a/spring-binding/.project b/spring-binding/.project
index d0cc361b..bef675d6 100644
--- a/spring-binding/.project
+++ b/spring-binding/.project
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-binding</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+  <name>spring-binding</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index cca0ab16..8086c2b9 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-binding</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Binding</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index 95a7ec4a..dbbde107 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-faces</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Faces</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-faces/template.mf b/spring-faces/template.mf
index ac6c098c..709dbdd2 100644
--- a/spring-faces/template.mf
+++ b/spring-faces/template.mf
@@ -3,11 +3,11 @@ Bundle-Name: Spring Faces
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.webflow.engine.builder.support;version="[2.3.0, 2.4.0)"
+ org.springframework.webflow.engine.builder.support;version="[2.4.0, 2.5.0)"
 Import-Template: 
- org.springframework.binding.*;version="[2.3.0, 2.4.0)",
- org.springframework.js.*;version="[2.3.0, 2.4.0)",
- org.springframework.webflow.*;version="[2.3.0, 2.4.0)",
+ org.springframework.binding.*;version="[2.4.0, 2.5.0)",
+ org.springframework.js.*;version="[2.4.0, 2.5.0)",
+ org.springframework.webflow.*;version="[2.4.0, 2.5.0)",
  org.springframework.*;version="[3.0.5.RELEASE, 3.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.el;version="[1.0.0, 2.0.0)",
diff --git a/spring-js-resources/pom.xml b/spring-js-resources/pom.xml
index 9f60f661..994c74c0 100644
--- a/spring-js-resources/pom.xml
+++ b/spring-js-resources/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-js-resources</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript Resources</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 
 	<build>
 	<plugins>
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 26fcbacb..24ec239d 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-js</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-js/src/main/resources/.gitignore b/spring-js/src/main/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-webflow-reference/src/overview.xml b/spring-webflow-reference/src/overview.xml
index 7912ec9b..0bbc7153 100644
--- a/spring-webflow-reference/src/overview.xml
+++ b/spring-webflow-reference/src/overview.xml
@@ -58,7 +58,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-webflow</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency>
 ]]>
 		</programlisting>
@@ -69,7 +69,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>spring-faces</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency> 
 ]]>
 		</programlisting>
@@ -106,7 +106,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency>]]>
 			</programlisting>
 			<para>
@@ -116,7 +116,7 @@
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency>]]>
 			</programlisting>
 			<para>
@@ -150,14 +150,14 @@
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.webflow"
-            rev="2.3.0.RELEASE" conf="compile->runtime" />]]>
+            rev="2.4.0.RELEASE" conf="compile->runtime" />]]>
 			</programlisting>
 			<para>
 				And if using JavaServerFaces:
 			</para>
 			<programlisting language="xml"><![CDATA[
 <dependency org="org.springframework.webflow" name="org.springframework.faces"
-            rev="2.3.0.RELEASE" conf="compile->runtime" />]]>
+            rev="2.4.0.RELEASE" conf="compile->runtime" />]]>
 			</programlisting>
 		</sect2>
 		<sect2 id="webflow-dm-server-lib">
@@ -182,7 +182,7 @@
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow-library</artifactId>
     <type>libd</type>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
 </dependency>]]>	
 			</programlisting>
 		</sect2>
diff --git a/spring-webflow-reference/src/spring-webflow-reference.xml b/spring-webflow-reference/src/spring-webflow-reference.xml
index f538cf21..d6b55c7b 100644
--- a/spring-webflow-reference/src/spring-webflow-reference.xml
+++ b/spring-webflow-reference/src/spring-webflow-reference.xml
@@ -6,7 +6,7 @@
 		<title>Spring Web Flow Reference Guide</title>
 		<titleabbrev>Spring Web Flow</titleabbrev>
 		<productname>Spring Web Flow</productname>
-		<releaseinfo>Version 2.3.0</releaseinfo>
+		<releaseinfo>Version 2.4.0</releaseinfo>
 		<pubdate></pubdate>
 		<authorgroup>
 			<author>
diff --git a/spring-webflow-samples/booking-faces/.classpath b/spring-webflow-samples/booking-faces/.classpath
index 50ce8018..7056877b 100755
--- a/spring-webflow-samples/booking-faces/.classpath
+++ b/spring-webflow-samples/booking-faces/.classpath
@@ -72,15 +72,15 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-config/3.0.2.RELEASE/spring-security-config-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-config/3.0.2.RELEASE/spring-security-config-3.0.2.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-core/3.0.2.RELEASE/spring-security-core-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-core/3.0.2.RELEASE/spring-security-core-3.0.2.RELEASE-sources.jar"/>
@@ -88,7 +88,7 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
index 8223f501..b0f60e72 100755
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
   <wb-module deploy-name="booking-faces">
     <property name="context-root" value="booking-faces"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
@@ -97,7 +96,7 @@
     <dependent-module archiveName="spring-beans-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-binding-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-binding-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-context-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar">
@@ -112,16 +111,16 @@
     <dependent-module archiveName="spring-expression-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-faces-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-faces-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-jdbc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-orm-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar">
@@ -142,7 +141,7 @@
     <dependent-module archiveName="spring-web-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-webmvc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar">
@@ -159,8 +158,5 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index 3bf68092..d1fa8210 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-faces</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
 		<org.springsecurity-version>3.0.2.RELEASE</org.springsecurity-version>
diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index 5d7401e6..3323c77e 100755
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -86,14 +86,14 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-acl/3.0.2.RELEASE/spring-security-acl-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-acl/3.0.2.RELEASE/spring-security-acl-3.0.2.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-config/3.0.2.RELEASE/spring-security-config-3.0.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-config/3.0.2.RELEASE/spring-security-config-3.0.2.RELEASE-sources.jar"/>
@@ -103,10 +103,8 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar" sourcepath="M2_REPO/stax/stax/1.2.0/stax-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/tiles/tiles-api/2.1.3/tiles-api-2.1.3.jar" sourcepath="M2_REPO/org/apache/tiles/tiles-api/2.1.3/tiles-api-2.1.3-sources.jar">
     <attributes>
       <attribute value="jar:file:/home/rossen/.m2/repository/org/apache/tiles/tiles-api/2.1.3/tiles-api-2.1.3-javadoc.jar!/" name="javadoc_location"/>
diff --git a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
index 1bfbb1d0..9af66bb5 100755
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
   <wb-module deploy-name="booking-mvc">
     <property name="context-root" value="booking-mvc"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
@@ -100,7 +99,7 @@
     <dependent-module archiveName="spring-beans-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-binding-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-binding-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-context-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar">
@@ -118,10 +117,10 @@
     <dependent-module archiveName="spring-jdbc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-orm-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar">
@@ -148,21 +147,15 @@
     <dependent-module archiveName="spring-web-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-webmvc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="stax-api-1.0-2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-api-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="tiles-api-2.1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/tiles/tiles-api/2.1.3/tiles-api-2.1.3.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
@@ -183,8 +176,5 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index 98df10cc..fee152f4 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-mvc</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring MVC + Web Flow + JSP</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
 		<org.springsecurity-version>3.0.2.RELEASE</org.springsecurity-version>
diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath
index fe66f7c2..9778f4ce 100644
--- a/spring-webflow-samples/booking-portlet-faces/.classpath
+++ b/spring-webflow-samples/booking-portlet-faces/.classpath
@@ -83,24 +83,22 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar" sourcepath="M2_REPO/stax/stax/1.2.0/stax-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
index 2fd06f3a..feccd726 100644
--- a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
   <wb-module deploy-name="booking-portlet-faces">
     <property name="context-root" value="booking-portlet-faces"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
@@ -103,7 +102,7 @@
     <dependent-module archiveName="spring-beans-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-binding-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-binding-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-context-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar">
@@ -118,16 +117,16 @@
     <dependent-module archiveName="spring-expression-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-faces-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-faces/2.3.0.BUILD-SNAPSHOT/spring-faces-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-faces-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-faces/2.4.0.BUILD-SNAPSHOT/spring-faces-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-jdbc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-orm-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar">
@@ -139,7 +138,7 @@
     <dependent-module archiveName="spring-web-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-webmvc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar">
@@ -148,15 +147,9 @@
     <dependent-module archiveName="spring-webmvc-portlet-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="stax-api-1.0-2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-api-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="validation-api-1.0.0.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
@@ -165,7 +158,5 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index 6631bbc3..b18d73c6 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-portlet-faces</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Portlet MVC + Web Flow + JSF</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
diff --git a/spring-webflow-samples/booking-portlet-mvc/.classpath b/spring-webflow-samples/booking-portlet-mvc/.classpath
index 38c7e01d..6000c1ad 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.classpath
+++ b/spring-webflow-samples/booking-portlet-mvc/.classpath
@@ -74,23 +74,21 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/3.0.5.RELEASE/spring-tx-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" sourcepath="M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar" sourcepath="M2_REPO/stax/stax/1.2.0/stax-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
index 6d9b89e2..c0d3d84e 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
   <wb-module deploy-name="booking-portlet-mvc">
     <property name="context-root" value="booking-portlet-mvc"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
@@ -88,7 +87,7 @@
     <dependent-module archiveName="spring-beans-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-binding-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.3.0.BUILD-SNAPSHOT/spring-binding-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-binding-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-binding/2.4.0.BUILD-SNAPSHOT/spring-binding-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-context-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar">
@@ -106,10 +105,10 @@
     <dependent-module archiveName="spring-jdbc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-jdbc/3.0.5.RELEASE/spring-jdbc-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.3.0.BUILD-SNAPSHOT/spring-js-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js/2.4.0.BUILD-SNAPSHOT/spring-js-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.3.0.BUILD-SNAPSHOT/spring-js-resources-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-js-resources/2.4.0.BUILD-SNAPSHOT/spring-js-resources-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-orm-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-orm/3.0.5.RELEASE/spring-orm-3.0.5.RELEASE.jar">
@@ -121,7 +120,7 @@
     <dependent-module archiveName="spring-web-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="spring-webflow-2.3.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.3.0.BUILD-SNAPSHOT/spring-webflow-2.3.0.BUILD-SNAPSHOT.jar">
+    <dependent-module archiveName="spring-webflow-2.4.0.BUILD-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/webflow/spring-webflow/2.4.0.BUILD-SNAPSHOT/spring-webflow-2.4.0.BUILD-SNAPSHOT.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="spring-webmvc-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar">
@@ -130,15 +129,9 @@
     <dependent-module archiveName="spring-webmvc-portlet-3.0.5.RELEASE.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc-portlet/3.0.5.RELEASE/spring-webmvc-portlet-3.0.5.RELEASE.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="stax-api-1.0-2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="stax-api-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
     <dependent-module archiveName="validation-api-1.0.0.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
@@ -147,8 +140,5 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml
index acd4c5d6..b22b34fb 100644
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>booking-portlet-mvc</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Portlet MVC + Web Flow + JSP</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
diff --git a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
index c9b76ff8..0da81cfa 100644
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
   <wb-module deploy-name="jsf-booking">
     <property name="context-root" value="jsf-booking"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
@@ -99,7 +98,5 @@
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml
index 547bee1e..deeca6b4 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>jsf-booking</artifactId>
 	<packaging>war</packaging>
 	<name>Hotel Booking : Spring Framework + JSF</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<org.springframework-version>3.0.5.RELEASE</org.springframework-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
diff --git a/spring-webflow-samples/pom.xml b/spring-webflow-samples/pom.xml
index 4445aad6..fe578352 100644
--- a/spring-webflow-samples/pom.xml
+++ b/spring-webflow-samples/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-webflow-samples</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Web Flow Samples</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<modules>
 		<module>booking-mvc</module>
 		<module>booking-faces</module>
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index 34c064a4..991a64b3 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>spring-webflow</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Web Flow</name>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>2.4.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf
index b1c793ec..6291d5a2 100644
--- a/spring-webflow/template.mf
+++ b/spring-webflow/template.mf
@@ -3,8 +3,8 @@ Bundle-Name: Spring Web Flow
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.binding.*;version="[2.3.0, 2.4.0)",
- org.springframework.js.*;version="[2.3.0, 2.4.0)",
+ org.springframework.binding.*;version="[2.4.0, 2.5.0)",
+ org.springframework.js.*;version="[2.4.0, 2.5.0)",
  org.springframework.*;version="[3.0.5.RELEASE, 3.1.0)",
  org.springframework.orm.*;version="[3.0.5.RELEASE, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.5.RELEASE, 3.1.0)";resolution:=optional,