diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/MANIFEST.MF b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/MANIFEST.MF
index 806e4e7d..b858958f 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Spring Travel Hotels Module
+Bundle-Name: Spring Travel Hotel Module
Bundle-SymbolicName: org.springframework.samples.springtravel.hotel
Bundle-Vendor: SpringSource
Import-Package: javax.sql
Export-Package: org.springframework.samples.springtravel.hotel
Import-Bundle: org.springframework.binding;version="[2.0.1, 3.0)",
org.springframework.faces;version="[2.0.1, 3.0)",
- org.springframework.security;version="2.0.0"
+ org.springframework.security;version="2.0.0",
org.springframework.webflow;version="[2.0.1, 3.0)",
- com.springsource.org.apache.log4j;version="1.2.15"
+ com.springsource.org.apache.log4j;version="1.2.15",
com.springsource.org.jboss.el;version="2.0.0"
Import-Library: org.hibernate.ejb;version="3.3.1",
org.springframework.spring;version="[2.5.4, 3.0)"
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/module-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/module-context.xml
index e7d0454b..3e6a30d7 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/module-context.xml
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/module-context.xml
@@ -1,7 +1,6 @@
-
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/osgi-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/osgi-context.xml
index 0735e41b..30807510 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel/src/main/resources/META-INF/spring/osgi-context.xml
@@ -8,6 +8,8 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
\ No newline at end of file
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 @@
+
+
+
+
+
+
+
+
+
+
+
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..15821c5d
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.project
@@ -0,0 +1,29 @@
+
+
+ org.springframework.samples.springtravel.webapp
+
+
+
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.springframework.ide.eclipse.core.springbuilder
+
+
+
+
+
+ org.springframework.ide.eclipse.core.springnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.wst.common.project.facet.core.nature
+
+
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..bca0008a
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Apr 30 15:14:56 BST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..fada7b5c
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
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..85931c4f
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/.springBeans
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+
+
+
+
+ src/main/webapp/META-INF/spring/module-context.xml
+ src/main/webapp/META-INF/spring/osgi-context.xml
+
+
+
+
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..c1cced83
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..af5acff2
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.springframework.samples.springtravel.webapp
+Bundle-Name: Spring Travel Web Application Module
+Platform-ModuleType: Web
+Web-ContextPath: springtravel-faces
+Web-DispatcherServletUrlPatterns: /spring/*
+Web-Servlets: FacesServlet;servlet-class:="javax.faces.webapp.FacesServlet";load-on-startup:="1";url-patterns:="*.faces",
+ ResourcesServlet;servlet-class:="org.springframework.js.resource.ResourceServlet";load-on-startup:="0";url-patterns:="/resources/*"
+Web-FilterMappings: springSecurityFilterChain;url-patterns:="/*"
+Web-ContextParams: javax.faces.DEFAULT_SUFFIX;param-value:=".xhtml",
+ facelets.DEVELOPMENT;param-value:="true",
+ facelets.REFRESH_PERIOD;param-value:="1"
+Web-SessionTimeout: 5
+Web-WelcomeFiles: index.html
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml
new file mode 100644
index 00000000..b1119a9b
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml
new file mode 100644
index 00000000..1fa90c98
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 00000000..8a0d7056
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ com.sun.facelets.FaceletViewHandler
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/intro.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/intro.xhtml
new file mode 100644
index 00000000..0180ed75
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/intro.xhtml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
Welcome to Spring Travel
+
+ This reference application illustrates how to use Spring MVC, Spring Web Flow, and Spring Faces
+ together to power rich web applications based on Spring and JavaServerFaces technology.
+
+
+ The key features illustrated in this sample include:
+
+
+ - A declarative navigation model enabling full browser button support and dynamic navigation rules
+ - A fine-grained state management model, including support for ConversationScope and ViewScope
+ - Modularization of web application functionality by domain use case, illustrating project structure best-practices
+ - Managed persistence contexts with the Java Persistence API (JPA)
+ - Unified Expression Language (EL) integration
+ - Spring Security integration
+ - Declarative page authoring with Facelets, including applying reusable page layouts
+ - A lightweight component library for Ajax and client-side validation that employs progressive enhancement techniques
+ - Exception handling support across all layers of the application
+ - Spring IDE tooling integration, with support for graphical flow modeling and visualization
+
+
+ Start your Spring Travel experience
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/layouts/standard.xhtml
new file mode 100644
index 00000000..5bf89d13
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/layouts/standard.xhtml
@@ -0,0 +1,63 @@
+
+
+
+
+
+ Spring Faces: Hotel Booking Sample Application
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/bg.gif b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/bg.gif
new file mode 100644
index 00000000..013cfa6f
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/bg.gif differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/btn.bg.gif
new file mode 100644
index 00000000..87256cf4
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/btn.bg.gif differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/diplomat.jpg b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/diplomat.jpg
new file mode 100644
index 00000000..e1d0c9cd
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/diplomat.jpg differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/header.jpg b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/header.jpg
new file mode 100644
index 00000000..0be0d4d7
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/header.jpg differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/input.bg.gif
new file mode 100644
index 00000000..8ebf87e3
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/input.bg.gif differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/powered-by-spring.png b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/powered-by-spring.png
new file mode 100644
index 00000000..e773b170
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/powered-by-spring.png differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/th.bg.gif
new file mode 100644
index 00000000..4663cf51
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/th.bg.gif differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/tse.gif b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/tse.gif
new file mode 100644
index 00000000..b1fa98cf
Binary files /dev/null and b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/images/tse.gif differ
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/index.html b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/index.html
new file mode 100644
index 00000000..adf221b4
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/index.html
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/styles/booking.css b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/styles/booking.css
new file mode 100644
index 00000000..a5f814e8
--- /dev/null
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/styles/booking.css
@@ -0,0 +1,154 @@
+ a, a:visited, a:link, a:active {
+ color: #59924B;
+ background-color: transparent;
+ text-decoration: none;
+ font-weight: bold;
+ }
+
+ a:hover {
+ color: white;
+ background-color: #65a242;
+ text-decoration: none;
+ font-weight: bold;
+ }
+
+ body.spring {
+ background-color: #9cac7c;
+ }
+
+ form div,
+ form p {
+ padding: 0px;
+ margin: 0 0 .5em 0;
+ }
+
+ #header.spring {
+ margin: 0 0 1em 0;
+ padding: 0px 0px;
+ background-color : #414f23;
+ }
+
+ #branding.spring {
+ float: none;
+ width: 100%;
+ margin: 10px 0 0 0;
+ padding: 0 0 0 0;
+ text-align: none;
+ }
+
+ #welcome {
+ padding: 10px 10px;
+ }
+
+ #welcome div.left {
+ float: left;
+ }
+
+ #welcome div.right {
+ float: right;
+ }
+
+ #content.spring {
+ width: 740px;
+ background: #fff url(../images/bg.gif) 0 0 repeat;
+ margin-bottom: 0px;
+ }
+
+ #content.spring input[type="submit"], input[type="button"], button {
+ font-size: 1em;
+ font-weight: bold;
+ color: #fff;
+ background: #fff url(../images/btn.bg.gif) 0 0 repeat-x;
+ border-style: none;
+ padding: 2px 2px 2px 2px;
+ }
+
+ #local.spring{
+ width: 215px;
+ }
+
+ #footer.spring {
+ padding: 25px 0;
+ background-color : white;
+ border-top: 1px solid #C3BBB6;
+ }
+
+ #footer.spring img {
+ float: right;
+ padding-right: 20px;
+ }
+
+ .errors {
+ font-weight: bold;
+ text-align: left;
+ color: #600;
+ }
+
+ .errors ul {
+ list-style: none;
+ }
+
+ .section {
+ text-align: left;
+ width: 505px;
+ float: left;
+ margin-bottom: 5px;
+ }
+
+ .field {
+ float:left;
+ }
+
+ .field .label {
+ float: left;
+ padding-top: 5px;
+ padding-right: 5px;
+ font-weight: bold;
+ width: 150px;
+ text-align: right;
+ }
+
+ .field .input {
+ float: left;
+ width: 250px;
+ text-align: left;
+ }
+
+ .field .output {
+ float: left;
+ width: 250px;
+ padding-top: 5px;
+ text-align: left;
+ }
+
+ .buttonGroup {
+ clear: both;
+ text-align: right;
+ }
+
+ .buttonGroup input[type="submit"], .buttonGroup input[type="button"], .buttonGroup button, .buttonGroup a {
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+
+ .summary {
+ width: 100%;
+ border: 1px solid #414f23;
+ border-collapse: collapse;
+ }
+
+ .summary thead th {
+ border-left: 1px solid #414f23;
+ background: #fff url(../images/th.bg.gif) 0 100% repeat-x;
+ border-bottom: 1px solid #414f23;
+ padding: 6px;
+ text-align: left;
+ font-size: small;
+ }
+
+ .summary tbody td {
+ border-left: 1px solid #9cac7c;
+ padding: 4px;
+ border-bottom: 1px solid #9cac7c;
+ font-size: 8pt;
+ }
\ No newline at end of file