diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath
new file mode 100644
index 00000000..c32daf65
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.springsource.platform.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project
new file mode 100644
index 00000000..3081d219
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.samples.springtravel.hotel</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.platform.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans
new file mode 100644
index 00000000..f54b2155
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/.springBeans
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.5.v200805211800]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/main/resources/META-INF/spring/module-context.xml</config>
+		<config>src/main/resources/META-INF/spring/osgi-context.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml
new file mode 100644
index 00000000..1fdc0b8f
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.samples.springtravel.hotel">
+
+    <property name="source.version" value="1.5"/>
+    <property name="ivy.cache.dir" value="${basedir}/../../../ivy-cache"/>
+    <property name="integration.repo.dir" value="${basedir}/../../../integration-repo"/>	
+	<property file="${basedir}/../../../build.properties"/>
+	<import file="${basedir}/../../../spring-build/standard/default.xml"/>
+
+</project>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml
new file mode 100644
index 00000000..cf5f877b
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/ivy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="2.0">
+	
+	<info organisation="org.springframework.samples" module="${ant.project.name}">
+		<ivyauthor name="Colin Yates" />
+		<ivyauthor name="Keith Donald" />
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml" />
+	</configurations>
+
+	<publications>
+ 		<artifact name="${ant.project.name}" />
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar" />
+	</publications>
+
+	<dependencies>
+		<dependency org="org.springframework.samples" name="org.springframework.samples.springtravel.resource" rev="latest.integration" conf="compile->runtime" />
+		<dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="provided->runtime" />
+		<dependency	org="javax.el" name="com.springsource.javax.el" rev="2.1.0" conf="provided->runtime" />
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->runtime" />
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->runtime" />
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="provided->runtime" />
+		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime" />
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="provided->runtime" />
+		<dependency org="org.hibernate" name="org.hibernate.ejb-library" rev="3.3.1.ga" conf="provided->runtime" />
+		<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="provided->runtime" />
+		<dependency org="org.springframework" name="org.springframework.spring-library" rev="2.5.4.A" conf="provided->runtime" />
+		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.0.A" conf="provided->runtime" />
+		<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="provided->jsf12" />		
+		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="provided->runtime" />
+		<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="provided->runtime" />
+		
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime" />
+
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java
deleted file mode 100644
index fb03f1e8..00000000
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/java/org/springframework/samples/springtravel/hotel/HotelFlowHandlerAdapter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.springframework.samples.springtravel.hotel;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.webflow.context.servlet.ServletExternalContext;
-import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter;
-import org.springframework.webflow.mvc.servlet.MvcExternalContext;
-
-public class HotelFlowHandlerAdapter extends FlowHandlerAdapter {
-
-	@Override
-	protected boolean isContextRequired() {
-		// the context will not be a WebApplicationContext in an OSGi environment
-		return false;
-	}
-
-	@Override
-	protected ServletExternalContext createServletExternalContext(HttpServletRequest request, HttpServletResponse response) {
-		ServletExternalContext context = new MvcExternalContext(request.getSession().getServletContext(), request, response, getFlowUrlHandler());
-		context.setAjaxRequest(getAjaxHandler().isAjaxRequest(request, response));
-		return context;
-	}
-}
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath
new file mode 100644
index 00000000..c32daf65
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.springsource.platform.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project
new file mode 100644
index 00000000..8c898a9a
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.samples.springtravel.resource</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.platform.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans
new file mode 100644
index 00000000..4a47426b
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.5.v200805211800]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml
new file mode 100644
index 00000000..1c06e6c4
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.samples.springtravel.resource">
+
+    <property name="source.version" value="1.5"/>
+    <property name="ivy.cache.dir" value="${basedir}/../../../ivy-cache"/>
+    <property name="integration.repo.dir" value="${basedir}/../../../integration-repo"/>	
+	<property file="${basedir}/../../../build.properties"/>
+	<import file="${basedir}/../../../spring-build/standard/default.xml"/>
+
+</project>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml
new file mode 100644
index 00000000..f8390d83
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/ivy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="2.0">
+	
+	<info organisation="org.springframework.samples" module="${ant.project.name}">
+		<ivyauthor name="Colin Yates" />
+		<ivyauthor name="Keith Donald" />
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.spring-library" rev="2.5.4.A" conf="provided->runtime" />
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath
new file mode 100644
index 00000000..a6c9b671
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.springsource.platform.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project
new file mode 100644
index 00000000..6f2f3876
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.samples.springtravel.webapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.platform.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans
new file mode 100644
index 00000000..4a47426b
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.5.v200805211800]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml
new file mode 100644
index 00000000..ebbfcf51
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.samples.springtravel.webapp" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<property file="${basedir}/../../../build.properties"/>
+	<property file="${basedir}/../../../build.versions"/>
+	<import file="${basedir}/../../../spring-build/web-module/default.xml"/>
+	
+</project>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml
new file mode 100644
index 00000000..660eec3e
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.samples" module="${ant.project.name}">
+		<ivyauthor name="Keith Donald"/>
+		<ivyauthor name=""/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml
new file mode 100644
index 00000000..c362e3b6
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:tx="http://www.springframework.org/schema/tx"
+	    xmlns:webflow="http://www.springframework.org/schema/webflow-config"
+   	    xmlns:faces="http://www.springframework.org/schema/faces"
+		xsi:schemaLocation="
+			http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/tx
+			http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+           	http://www.springframework.org/schema/webflow-config
+           	http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
+           	http://www.springframework.org/schema/faces
+           	http://www.springframework.org/schema/faces/spring-faces-2.0.xsd">
+
+	<!-- Maps request URIs to controllers -->			
+	<bean id="hotelHandlerMappings" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="mappings">
+			<value>
+				/hotel/search=flowController
+				/hotel/booking=flowController
+			</value>
+		</property>
+		<property name="order" value="0"/>
+	</bean>
+
+	<!-- Handles requests mapped to the Spring Web Flow system -->
+	<bean id="flowController" class="org.springframework.webflow.mvc.servlet.FlowController">
+		<property name="flowExecutor" ref="flowExecutor"/>
+	</bean>
+
+	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
+	<webflow:flow-executor id="flowExecutor">
+		<webflow:flow-execution-listeners>
+			<webflow:listener ref="jpaFlowExecutionListener" />
+			<webflow:listener ref="securityFlowExecutionListener" />
+		</webflow:flow-execution-listeners>
+	</webflow:flow-executor>
+	
+	<!-- The registry of executable flow definitions in this module -->
+	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices">
+		<webflow:flow-location path="classpath:org/springframework/samples/springtravel/hotel/search/search.xml" />
+		<webflow:flow-location path="classpath:org/springframework/samples/springtravel/hotel/booking/booking.xml" />
+	</webflow:flow-registry>
+	
+	<!-- Enables the flow JSF integration -->
+	<faces:flow-builder-services id="facesFlowBuilderServices" />
+
+	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
+	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
+		<constructor-arg ref="entityManagerFactory" />
+		<constructor-arg ref="transactionManager" />
+	</bean>
+	
+	<!-- Installs a listener to apply Spring Security authorities -->
+	<bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project
new file mode 100644
index 00000000..0676ec6d
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.samples.springtravel</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans
new file mode 100644
index 00000000..4a47426b
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.5.v200805211800]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml
new file mode 100644
index 00000000..5be69208
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.samples.springtravel">
+
+    <path id="bundles">
+        <pathelement location="../org.springframework.samples.springtravel.resource" />
+        <pathelement location="../org.springframework.samples.springtravel.hotel" />
+        <pathelement location="../org.springframework.samples.springtravel.webapp" />
+    </path>
+
+    <property file="${basedir}/../../../build.properties" />
+    <property file="${basedir}/../../../build.versions" />
+    <import file="${basedir}/../../../spring-build/par/default.xml" />
+
+</project>
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml
new file mode 100644
index 00000000..df224c27
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/par.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<com.springsource.platform.ide.par:Par xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:com.springsource.platform.ide.par="http:///com/springsource/platform/ide/par.ecore">
+  <bundle symbolicName="org.springframework.samples.springtravel.resource"/>
+  <bundle symbolicName="org.springframework.samples.springtravel.user"/>
+  <bundle symbolicName="org.springframework.samples.springtravel.hotel"/>
+  <bundle symbolicName="org.springframework.samples.springtravel.webapp"/>
+</com.springsource.platform.ide.par:Par>
diff --git a/spring-webflow-samples/spring-travel-platform/readme.txt b/spring-webflow-samples/spring-travel-platform/readme.txt
new file mode 100644
index 00000000..c8b19eef
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/readme.txt
@@ -0,0 +1,3 @@
+This directory contains a flavor of the Spring Travel Application that has been designed a set of OSGi bundles.  In addition, the bundles have been packaged together as a .PAR for convenient deployment to the SpringSource Application Platform.
+
+Please note: THIS SAMPLE IS CURRENTLY A WORK IN PROGRESS.  It is not fully functional as of this time, but is expected to be fully functional in the next Web Flow release and by the time version 1.0 of the SpringSource Application Platform is generally available.