diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml
index b8993b4b..69ac1e5d 100644
--- a/build-spring-webflow/build.xml
+++ b/build-spring-webflow/build.xml
@@ -8,8 +8,6 @@
-
-
diff --git a/spring-webflow-samples/booking-faces/.classpath b/spring-webflow-samples/booking-faces/.classpath
index c84dc702..235e82cb 100755
--- a/spring-webflow-samples/booking-faces/.classpath
+++ b/spring-webflow-samples/booking-faces/.classpath
@@ -1,14 +1,97 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/.project b/spring-webflow-samples/booking-faces/.project
index 673d4439..0af1c9c2 100755
--- a/spring-webflow-samples/booking-faces/.project
+++ b/spring-webflow-samples/booking-faces/.project
@@ -1,42 +1,30 @@
-
- swf-booking-faces
- Spring Web Flow Number Guess JSF Example
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.springframework.ide.eclipse.core.springbuilder
-
-
-
-
- org.hibernate.eclipse.console.hibernateBuilder
-
-
-
-
-
- org.springframework.ide.eclipse.core.springnature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jem.workbench.JavaEMFNature
- org.hibernate.eclipse.console.hibernateNature
-
-
+ booking-faces
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+ org.eclipse.wst.validation.validationbuilder
+
+
+ org.springframework.ide.eclipse.core.springbuilder
+
+
+ org.hibernate.eclipse.console.hibernateBuilder
+
+
+
+ org.springframework.ide.eclipse.core.springnature
+ org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
+ org.eclipse.jem.workbench.JavaEMFNature
+ org.hibernate.eclipse.console.hibernateNature
+
+
\ No newline at end of file
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 cc2d7884..3d6640f9 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,12 +1,169 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+
+
diff --git a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
index cddf50bf..b325ba9f 100755
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
deleted file mode 100755
index fdfe212b..00000000
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index 61537142..77ae4862 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -5,225 +5,217 @@
org.springframework.webflow.samples
booking-faces
war
+ Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces
2.3.0.BUILD-SNAPSHOT
+
+ 3.0.5.RELEASE
+ 3.0.2.RELEASE
+ 1.5.10
+ 2.0.3
+ 2.2.RC1
+
+
- javax.persistence
- com.springsource.javax.persistence
- 1.0.0
+ org.springframework
+ spring-context
+ ${org.springframework-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
- javax.servlet
- com.springsource.javax.servlet.jsp.jstl
- 1.2.0
+ org.springframework
+ spring-jdbc
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-orm
+ ${org.springframework-version}
- javax.transaction
- com.springsource.javax.transaction
- 1.1.0
+ org.springframework
+ spring-webmvc
+ ${org.springframework-version}
- org.apache.log4j
- com.springsource.org.apache.log4j
- 1.2.15
+ org.springframework.webflow
+ spring-faces
+ ${project.version}
- org.hibernate
- com.springsource.org.hibernate
- 3.2.6.ga
+ org.springframework.security
+ spring-security-web
+ ${org.springsecurity-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
- org.hibernate
- com.springsource.org.hibernate.annotations
- 3.3.0.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.ejb
- 3.3.1.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.validator
- 4.1.0.GA
-
+ org.springframework.security
+ spring-security-config
+ ${org.springsecurity-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
+
+
org.hsqldb
- com.springsource.org.hsqldb
- 1.8.0.9
+ hsqldb
+ 1.8.0.10
+ runtime
- joda-time
- joda-time
- 1.6
-
-
- org.slf4j
- com.springsource.slf4j.log4j
- 1.5.6
-
-
- org.springframework
- org.springframework.aop
- ${spring.version}
-
-
- org.springframework
- org.springframework.beans
- ${spring.version}
-
-
- org.springframework
- org.springframework.context
- ${spring.version}
-
-
- org.springframework
- org.springframework.core
- ${spring.version}
-
-
- org.springframework
- org.springframework.expression
- ${spring.version}
-
-
- org.springframework
- org.springframework.jdbc
- ${spring.version}
-
-
- org.springframework
- org.springframework.orm
- ${spring.version}
-
-
- org.springframework
- org.springframework.transaction
- ${spring.version}
-
-
- org.springframework
- org.springframework.web
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.servlet
- ${spring.version}
-
-
- org.springframework.security
- org.springframework.security.core
- 3.0.2.RELEASE
-
-
- org.springframework.security
- org.springframework.security.config
- 3.0.2.RELEASE
-
-
- org.springframework.security
- org.springframework.security.web
- 3.0.2.RELEASE
-
-
- org.springframework.webflow
- org.springframework.faces
- ${project.version}
-
-
- org.springframework.webflow
- org.springframework.js
- ${project.version}
-
-
- org.springframework.webflow
- org.springframework.webflow
- ${project.version}
+ org.hibernate
+ hibernate-entitymanager
+ 3.5.0-Final
+
com.sun.faces
jsf-api
- 2.0.3
+ ${jsf-version}
com.sun.faces
jsf-impl
- 2.0.3
+ ${jsf-version}
org.primefaces
primefaces
- 2.2.M1-SNAPSHOT
-
-
+ ${primefaces-version}
+
+
+
+ org.slf4j
+ slf4j-api
+ ${org.slf4j-version}
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${org.slf4j-version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${org.slf4j-version}
+ runtime
+
+
+ log4j
+ log4j
+ 1.2.15
+
+
+ javax.mail
+ mail
+
+
+ javax.jms
+ jms
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ com.sun.jmx
+ jmxri
+
+
+ runtime
+
+
javax.servlet
- com.springsource.javax.servlet
- 2.4.0
+ servlet-api
+ 2.5
provided
+
+
+ org.hibernate
+ hibernate-validator
+ 4.0.2.GA
+
- javax.xml.bind
- com.springsource.javax.xml.bind
- 2.2.0
- provided
-
-
- com.sun.xml
- com.springsource.com.sun.xml.bind
- 2.2.0
- provided
-
-
+ javax.xml.bind
+ jaxb-api
+ 2.1
+
+
org.easymock
- com.springsource.org.easymock
- 2.3.0
+ easymock
+ 2.5.2
test
- org.junit
- com.springsource.junit
+ junit
+ junit
3.8.2
test
org.springframework
- org.springframework.test
- ${spring.version}
+ spring-test
+ ${org.springframework-version}
test
+
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Releases
- http://repository.springsource.com/maven/bundles/release
+ org.maven.central
+ Maven Central Repository
+ http://repo1.maven.org/maven2
+ false
+
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Releases
- http://repository.springsource.com/maven/bundles/external
+ org.springframework.maven.snapshot
+ Spring Maven Snapshot Repository
+ http://maven.springframework.org/snapshot
+ false
+ true
-
- com.springsource.repository.bundles.snapshot
- SpringSource Enterprise Bundle Repository - Snapshot Releases
- http://repository.springsource.com/maven/bundles/snapshot
+
+
+ org.springframework.maven.milestone
+ Spring Maven Milestone Repository
+ http://maven.springframework.org/milestone
+ false
+
java.net.release
Repository for Projects On Hosted on java.net
http://download.java.net/maven/2
+
- prime-repo
+ primefaces
Prime Technology Maven Repository
http://repository.prime.com.tr
default
@@ -240,9 +232,26 @@
1.5
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ junit:junit
+
+ **/*Tests.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+ true
+ false
+ 2.0
+
+
-
- 3.0.4.RELEASE
-
diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index 275fd7fb..5d7401e6 100755
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -1,14 +1,132 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/.project b/spring-webflow-samples/booking-mvc/.project
index ede89928..a43d3aa9 100755
--- a/spring-webflow-samples/booking-mvc/.project
+++ b/spring-webflow-samples/booking-mvc/.project
@@ -1,42 +1,30 @@
-
- swf-booking-mvc
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.springframework.ide.eclipse.core.springbuilder
-
-
-
-
- org.hibernate.eclipse.console.hibernateBuilder
-
-
-
-
-
- org.springframework.ide.eclipse.core.springnature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jem.workbench.JavaEMFNature
- org.hibernate.eclipse.console.hibernateNature
-
-
+ booking-mvc
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+ org.eclipse.wst.validation.validationbuilder
+
+
+ org.springframework.ide.eclipse.core.springbuilder
+
+
+ org.hibernate.eclipse.console.hibernateBuilder
+
+
+
+ org.springframework.ide.eclipse.core.springnature
+ org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
+ org.eclipse.jem.workbench.JavaEMFNature
+ org.hibernate.eclipse.console.hibernateNature
+
+
\ No newline at end of file
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 297ca111..9edf2f8f 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,10 +1,187 @@
-
-
-
-
-
-
-
+
+
+
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+
+
diff --git a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
index cddf50bf..b325ba9f 100755
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
deleted file mode 100755
index 9ba51901..00000000
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index 8fefcae2..aaf7ff42 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -5,227 +5,243 @@
org.springframework.webflow.samples
booking-mvc
war
+ Hotel Booking : Spring MVC + Web Flow + JSP
2.3.0.BUILD-SNAPSHOT
+
+ 3.0.5.RELEASE
+ 2.3.0.BUILD-SNAPSHOT
+ 3.0.2.RELEASE
+ 1.5.10
+
+
- javax.persistence
- com.springsource.javax.persistence
- 1.0.0
-
-
- javax.servlet
- com.springsource.javax.servlet.jsp.jstl
- 1.1.2
-
-
- javax.transaction
- com.springsource.javax.transaction
- 1.1.0
-
-
- org.apache.log4j
- com.springsource.org.apache.log4j
- 1.2.15
-
-
- org.apache.taglibs
- com.springsource.org.apache.taglibs.standard
- 1.1.2
-
-
- org.apache.tiles
- com.springsource.org.apache.tiles
- 2.1.2.osgi
-
-
- org.apache.tiles
- com.springsource.org.apache.tiles.core
- 2.1.2.osgi
-
-
- org.apache.tiles
- com.springsource.org.apache.tiles.jsp
- 2.1.2
-
-
- org.apache.tiles
- com.springsource.org.apache.tiles.servlet
- 2.1.2
-
-
- org.hibernate
- com.springsource.org.hibernate
- 3.2.6.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.annotations
- 3.3.0.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.ejb
- 3.3.1.ga
-
-
- org.hsqldb
- com.springsource.org.hsqldb
- 1.8.0.9
-
-
- joda-time
- joda-time
- 1.6
+ org.springframework
+ spring-context
+ ${org.springframework-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework
- org.springframework.aop
- ${spring.version}
+ spring-jdbc
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-orm
+ ${org.springframework-version}
org.springframework
- org.springframework.beans
- ${spring.version}
-
-
- org.springframework
- org.springframework.context
- ${spring.version}
-
-
- org.springframework
- org.springframework.context.support
- ${spring.version}
-
-
- org.springframework
- org.springframework.core
- ${spring.version}
-
-
- org.springframework
- org.springframework.expression
- ${spring.version}
-
-
- org.springframework
- org.springframework.jdbc
- ${spring.version}
-
-
- org.springframework
- org.springframework.orm
- ${spring.version}
-
-
- org.springframework
- org.springframework.transaction
- ${spring.version}
-
-
- org.springframework
- org.springframework.web
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.servlet
- ${spring.version}
-
-
- org.springframework.security
- org.springframework.security.core
- 3.0.2.RELEASE
-
-
- org.springframework.security
- org.springframework.security.config
- 3.0.2.RELEASE
-
-
- org.springframework.security
- org.springframework.security.taglibs
- 3.0.2.RELEASE
+ spring-webmvc
+ ${org.springframework-version}
org.springframework.webflow
- org.springframework.js
+ spring-webflow
${project.version}
org.springframework.webflow
- org.springframework.webflow
+ spring-js
${project.version}
-
- org.hibernate
- com.springsource.org.hibernate.validator
- 4.1.0.GA
+ org.springframework.security
+ spring-security-web
+ ${org.springsecurity-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.springframework.security
+ spring-security-taglibs
+ ${org.springsecurity-version}
+
+
+ org.springframework.security
+ spring-security-config
+ ${org.springsecurity-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+ ${org.slf4j-version}
org.slf4j
- com.springsource.slf4j.log4j
- 1.5.6
+ jcl-over-slf4j
+ ${org.slf4j-version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${org.slf4j-version}
+ runtime
+
+
+ log4j
+ log4j
+ 1.2.15
+
+
+ javax.mail
+ mail
+
+
+ javax.jms
+ jms
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ com.sun.jmx
+ jmxri
+
+
+ runtime
+
+
+
+ org.hsqldb
+ hsqldb
+ 1.8.0.10
+ runtime
+
+
+ org.hibernate
+ hibernate-entitymanager
+ 3.5.0-Final
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+ provided
+
+
+ javax.servlet.jsp
+ jsp-api
+ 2.1
+ provided
+
+
+ javax.servlet
+ jstl
+ 1.2
+
+
+
+ org.apache.tiles
+ tiles-jsp
+ 2.1.3
+
+
+
+ commons-logging
+ commons-logging-api
+
+
+
+
+
+ org.hibernate
+ hibernate-validator
+ 4.1.0.Beta1
+
+ javax.xml.bind
+ jaxb-api
+ 2.1
+
+
- javax.xml.bind
- com.springsource.javax.xml.bind
- 2.2.0
-
-
-
- javax.servlet
- com.springsource.javax.servlet
- 2.4.0
- provided
+ joda-time
+ joda-time
+ 1.6
- javax.servlet
- com.springsource.javax.servlet.jsp
- 2.1.0
- provided
-
-
+ joda-time
+ joda-time-jsptags
+ 1.0.2
+ runtime
+
+
org.easymock
- com.springsource.org.easymock
- 2.3.0
+ easymock
+ 2.5.2
test
- org.junit
- com.springsource.junit
+ junit
+ junit
3.8.2
test
org.springframework
- org.springframework.test
- ${spring.version}
+ spring-test
+ ${org.springframework-version}
test
+
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Releases
- http://repository.springsource.com/maven/bundles/release
+ org.maven.central
+ Maven Central Repository
+ http://repo1.maven.org/maven2
+ false
+
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Releases
- http://repository.springsource.com/maven/bundles/external
+ org.springframework.maven.snapshot
+ Spring Maven Snapshot Repository
+ http://maven.springframework.org/snapshot
+ false
+ true
+
+
+ org.springframework.maven.milestone
+ Spring Maven Milestone Repository
+ http://maven.springframework.org/milestone
+ false
+
+
- com.springsource.repository.bundles.snapshot
- SpringSource Enterprise Bundle Repository - Snapshot Releases
- http://repository.springsource.com/maven/bundles/snapshot
+ org.jboss.repository
+ JBoss Maven Repository
+ http://repository.jboss.org/maven2
+ false
@@ -239,9 +255,26 @@
1.5
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ junit:junit
+
+ **/*Tests.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+ true
+ false
+ 2.0
+
+
-
- 3.0.4.RELEASE
-
diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath
index eaec100b..fe66f7c2 100644
--- a/spring-webflow-samples/booking-portlet-faces/.classpath
+++ b/spring-webflow-samples/booking-portlet-faces/.classpath
@@ -1,13 +1,106 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/.project b/spring-webflow-samples/booking-portlet-faces/.project
index 208c4fed..bfec2225 100644
--- a/spring-webflow-samples/booking-portlet-faces/.project
+++ b/spring-webflow-samples/booking-portlet-faces/.project
@@ -1,42 +1,30 @@
-
- swf-booking-portlet-faces
- Spring Web Flow Faces Portlet Example
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.springframework.ide.eclipse.core.springbuilder
-
-
-
-
- org.hibernate.eclipse.console.hibernateBuilder
-
-
-
-
-
- org.springframework.ide.eclipse.core.springnature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jem.workbench.JavaEMFNature
- org.hibernate.eclipse.console.hibernateNature
-
-
+ booking-portlet-faces
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+ org.eclipse.wst.validation.validationbuilder
+
+
+ org.springframework.ide.eclipse.core.springbuilder
+
+
+ org.hibernate.eclipse.console.hibernateBuilder
+
+
+
+ org.springframework.ide.eclipse.core.springnature
+ org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
+ org.eclipse.jem.workbench.JavaEMFNature
+ org.hibernate.eclipse.console.hibernateNature
+
+
\ 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 f5560e71..7e2fdf22 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,11 +1,169 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+
+
diff --git a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
index cddf50bf..b325ba9f 100644
--- a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/ivy.xml b/spring-webflow-samples/booking-portlet-faces/ivy.xml
deleted file mode 100644
index 5abf4b36..00000000
--- a/spring-webflow-samples/booking-portlet-faces/ivy.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index d97b8ef3..6631bbc3 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -5,192 +5,193 @@
org.springframework.webflow.samples
booking-portlet-faces
war
+ Hotel Booking : Spring Portlet MVC + Web Flow + JSF
2.3.0.BUILD-SNAPSHOT
+
+ 3.0.5.RELEASE
+ 1.5.10
+ 1.2.9
+
+
- com.sun.facelets
- com.springsource.com.sun.facelets
- 1.1.14
+ org.springframework
+ spring-context
+ ${org.springframework-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
- javax.persistence
- com.springsource.javax.persistence
- 1.0.0
+ org.springframework
+ spring-jdbc
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-orm
+ ${org.springframework-version}
- javax.servlet
- com.springsource.javax.servlet.jsp.jstl
- 1.1.2
+ org.springframework
+ spring-webmvc
+ ${org.springframework-version}
- javax.transaction
- com.springsource.javax.transaction
- 1.1.0
+ org.springframework
+ spring-webmvc-portlet
+ ${org.springframework-version}
- org.apache.log4j
- com.springsource.org.apache.log4j
- 1.2.15
-
-
- org.apache.taglibs
- com.springsource.org.apache.taglibs.standard
- 1.1.2
-
-
- org.hibernate
- com.springsource.org.hibernate
- 3.2.6.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.annotations
- 3.3.0.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.ejb
- 3.3.1.ga
+ org.springframework.webflow
+ spring-faces
+ ${project.version}
+
org.hsqldb
- com.springsource.org.hsqldb
- 1.8.0.9
+ hsqldb
+ 1.8.0.10
+ runtime
- joda-time
- joda-time
- 1.6
+ org.hibernate
+ hibernate-entitymanager
+ 3.5.0-Final
+
+
+
+ org.apache.myfaces.core
+ myfaces-api
+ ${myfaces.core-version}
- org.springframework
- org.springframework.aop
- ${spring.version}
+ org.apache.myfaces.core
+ myfaces-impl
+ ${myfaces.core-version}
- org.springframework
- org.springframework.beans
- ${spring.version}
+ com.sun.facelets
+ jsf-facelets
+ 1.1.14
+
+
+
+ org.slf4j
+ slf4j-api
+ ${org.slf4j-version}
- org.springframework
- org.springframework.context
- ${spring.version}
+ org.slf4j
+ jcl-over-slf4j
+ ${org.slf4j-version}
- org.springframework
- org.springframework.core
- ${spring.version}
+ org.slf4j
+ slf4j-log4j12
+ ${org.slf4j-version}
+ runtime
- org.springframework
- org.springframework.expression
- ${spring.version}
+ log4j
+ log4j
+ 1.2.15
+
+
+ javax.mail
+ mail
+
+
+ javax.jms
+ jms
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ com.sun.jmx
+ jmxri
+
+
+ runtime
+
- org.springframework
- org.springframework.jdbc
- ${spring.version}
-
-
- org.springframework
- org.springframework.orm
- ${spring.version}
-
-
- org.springframework
- org.springframework.transaction
- ${spring.version}
-
-
- org.springframework
- org.springframework.web
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.portlet
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.servlet
- ${spring.version}
-
-
- org.springframework.webflow
- org.springframework.faces
- ${project.version}
-
-
- org.springframework.webflow
- org.springframework.webflow
- ${project.version}
-
-
- org.apache.myfaces
- com.springsource.org.apache.myfaces.javax.faces
- 1.2.2
-
-
- org.apache.myfaces
- com.springsource.org.apache.myfaces
- 1.2.2
-
-
- org.apache.myfaces.portlet-bridge
- portlet-bridge-api
- 2.0.0-alpha-2
-
-
- org.apache.myfaces.portlet-bridge
- portlet-bridge-impl
- 2.0.0-alpha-2
-
-
-
- javax.el
- com.springsource.javax.el
- 1.0.0
+ javax.servlet
+ servlet-api
+ 2.5
provided
javax.portlet
- com.springsource.javax.portlet
- 2.0.0
+ portlet-api
+ 2.0
provided
+
+
+
+ org.hibernate
+ hibernate-validator
+ 4.0.2.GA
+
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.1
+
+
+
+ org.easymock
+ easymock
+ 2.5.2
+ test
- javax.servlet
- com.springsource.javax.servlet
- 2.4.0
- provided
-
-
-
- org.junit
- com.springsource.junit
+ junit
+ junit
3.8.2
test
org.springframework
- org.springframework.test
- ${spring.version}
+ spring-test
+ ${org.springframework-version}
test
+
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Releases
- http://repository.springsource.com/maven/bundles/release
+ org.maven.central
+ Maven Central Repository
+ http://repo1.maven.org/maven2
+ false
+
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Releases
- http://repository.springsource.com/maven/bundles/external
+ org.springframework.maven.snapshot
+ Spring Maven Snapshot Repository
+ http://maven.springframework.org/snapshot
+ false
+ true
+
+
+ org.springframework.maven.milestone
+ Spring Maven Milestone Repository
+ http://maven.springframework.org/milestone
+ false
+
booking-portlet-faces
@@ -203,10 +204,26 @@
1.5
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ junit:junit
+
+ **/*Tests.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+ true
+ false
+ 2.0
+
+
-
- 3.0.4.RELEASE
- 1.2.0.09
-
diff --git a/spring-webflow-samples/booking-portlet-mvc/.classpath b/spring-webflow-samples/booking-portlet-mvc/.classpath
index af5e02d3..38c7e01d 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.classpath
+++ b/spring-webflow-samples/booking-portlet-mvc/.classpath
@@ -1,13 +1,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/.project b/spring-webflow-samples/booking-portlet-mvc/.project
index 0e42fca4..c2d81b7b 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.project
+++ b/spring-webflow-samples/booking-portlet-mvc/.project
@@ -1,42 +1,30 @@
-
- swf-booking-portlet-mvc
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.springframework.ide.eclipse.core.springbuilder
-
-
-
-
- org.hibernate.eclipse.console.hibernateBuilder
-
-
-
-
-
- org.springframework.ide.eclipse.core.springnature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jem.workbench.JavaEMFNature
- org.hibernate.eclipse.console.hibernateNature
-
-
+ booking-portlet-mvc
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+ org.eclipse.wst.validation.validationbuilder
+
+
+ org.springframework.ide.eclipse.core.springbuilder
+
+
+ org.hibernate.eclipse.console.hibernateBuilder
+
+
+
+ org.springframework.ide.eclipse.core.springnature
+ org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
+ org.eclipse.jem.workbench.JavaEMFNature
+ org.hibernate.eclipse.console.hibernateNature
+
+
\ 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 9ed3bfbd..1c3d8695 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,11 +1,151 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+
+
diff --git a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
index cddf50bf..b325ba9f 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml
deleted file mode 100644
index 9373eb7f..00000000
--- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml
index 18270a0d..dece3c20 100644
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -5,180 +5,199 @@
org.springframework.webflow.samples
booking-portlet-mvc
war
+ Hotel Booking : Spring Portlet MVC + Web Flow + JSP
2.3.0.BUILD-SNAPSHOT
+
+ 3.0.5.RELEASE
+ 2.3.0.BUILD-SNAPSHOT
+ 1.5.10
+
+
- javax.persistence
- com.springsource.javax.persistence
- 1.0.0
-
-
- javax.transaction
- com.springsource.javax.transaction
- 1.1.0
-
-
- org.aopalliance
- com.springsource.org.aopalliance
- 1.0.0
-
-
- org.apache.log4j
- com.springsource.org.apache.log4j
- 1.2.15
-
-
- org.hibernate
- com.springsource.org.hibernate
- 3.2.6.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.annotations
- 3.3.0.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.ejb
- 3.3.1.ga
-
-
- org.hsqldb
- com.springsource.org.hsqldb
- 1.8.0.9
-
-
- joda-time
- joda-time
- 1.6
+ org.springframework
+ spring-context
+ ${org.springframework-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework
- org.springframework.aop
- ${spring.version}
+ spring-jdbc
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-orm
+ ${org.springframework-version}
org.springframework
- org.springframework.beans
- ${spring.version}
+ spring-webmvc
+ ${org.springframework-version}
org.springframework
- org.springframework.context
- ${spring.version}
-
-
- org.springframework
- org.springframework.core
- ${spring.version}
-
-
- org.springframework
- org.springframework.expression
- ${spring.version}
-
-
- org.springframework
- org.springframework.jdbc
- ${spring.version}
-
-
- org.springframework
- org.springframework.orm
- ${spring.version}
-
-
- org.springframework
- org.springframework.transaction
- ${spring.version}
-
-
- org.springframework
- org.springframework.web
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.portlet
- ${spring.version}
-
-
- org.springframework
- org.springframework.web.servlet
- ${spring.version}
+ spring-webmvc-portlet
+ ${org.springframework-version}
org.springframework.webflow
- org.springframework.js
+ spring-webflow
${project.version}
org.springframework.webflow
- org.springframework.webflow
+ spring-js
${project.version}
-
+
- org.hibernate
- com.springsource.org.hibernate.validator
- 4.1.0.GA
+ org.slf4j
+ slf4j-api
+ ${org.slf4j-version}
org.slf4j
- com.springsource.slf4j.log4j
- 1.5.6
+ jcl-over-slf4j
+ ${org.slf4j-version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${org.slf4j-version}
+ runtime
+
+
+ log4j
+ log4j
+ 1.2.15
+
+
+ javax.mail
+ mail
+
+
+ javax.jms
+ jms
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ com.sun.jmx
+ jmxri
+
+
+ runtime
+
+
+
+ org.hsqldb
+ hsqldb
+ 1.8.0.10
+ runtime
+
+
+ org.hibernate
+ hibernate-entitymanager
+ 3.5.0-Final
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+ provided
+
+
+ javax.portlet
+ portlet-api
+ 2.0
+ provided
+
+
+ javax.servlet
+ jstl
+ 1.2
+
+
+
+ org.hibernate
+ hibernate-validator
+ 4.1.0.Beta1
+
+ javax.xml.bind
+ jaxb-api
+ 2.1
+
+
- javax.xml.bind
- com.springsource.javax.xml.bind
- 2.2.0
-
-
-
- javax.portlet
- com.springsource.javax.portlet
- 2.0.0
- provided
+ joda-time
+ joda-time
+ 1.6
- javax.servlet
- com.springsource.javax.servlet
- 2.4.0
- provided
-
-
+ joda-time
+ joda-time-jsptags
+ 1.0.2
+ runtime
+
+
- org.junit
- com.springsource.junit
+ org.easymock
+ easymock
+ 2.5.2
+ test
+
+
+ junit
+ junit
3.8.2
test
org.springframework
- org.springframework.test
- ${spring.version}
+ spring-test
+ ${org.springframework-version}
test
+
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource
- Releases
- http://repository.springsource.com/maven/bundles/release
+ org.maven.central
+ Maven Central Repository
+ http://repo1.maven.org/maven2
+ false
+
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Releases
-
- http://repository.springsource.com/maven/bundles/external
-
+ org.springframework.maven.snapshot
+ Spring Maven Snapshot Repository
+ http://maven.springframework.org/snapshot
+ false
+ true
+
+
+ org.springframework.maven.milestone
+ Spring Maven Milestone Repository
+ http://maven.springframework.org/milestone
+ false
+
booking-portlet-mvc
@@ -191,9 +210,26 @@
1.5
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ junit:junit
+
+ **/*Tests.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+ true
+ false
+ 2.0
+
+
-
- 3.0.4.RELEASE
-
diff --git a/spring-webflow-samples/jsf-booking/.classpath b/spring-webflow-samples/jsf-booking/.classpath
index 586c7ad0..65c3eeb3 100644
--- a/spring-webflow-samples/jsf-booking/.classpath
+++ b/spring-webflow-samples/jsf-booking/.classpath
@@ -1,10 +1,63 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/jsf-booking/.project b/spring-webflow-samples/jsf-booking/.project
index 5e1f1505..43adbb42 100644
--- a/spring-webflow-samples/jsf-booking/.project
+++ b/spring-webflow-samples/jsf-booking/.project
@@ -1,6 +1,6 @@
jsf-booking
- Spring Web Flow Number Guess JSF Example
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
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 b803eef1..b2afd169 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,12 +1,103 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+
+
diff --git a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml
index cddf50bf..b325ba9f 100644
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/jsf-booking/ivy.xml b/spring-webflow-samples/jsf-booking/ivy.xml
deleted file mode 100644
index 05d1f22a..00000000
--- a/spring-webflow-samples/jsf-booking/ivy.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 3f6cfb3d..547bee1e 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -5,146 +5,157 @@
org.springframework.webflow.samples
jsf-booking
war
+ Hotel Booking : Spring Framework + JSF
2.3.0.BUILD-SNAPSHOT
+
+ 3.0.5.RELEASE
+ 1.5.10
+ 2.0.3
+
+
- javax.faces
+ org.springframework
+ spring-context
+ ${org.springframework-version}
+
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ org.springframework
+ spring-jdbc
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-orm
+ ${org.springframework-version}
+
+
+ org.springframework
+ spring-web
+ ${org.springframework-version}
+
+
+
+ org.hsqldb
+ hsqldb
+ 1.8.0.10
+ runtime
+
+
+ org.hibernate
+ hibernate-entitymanager
+ 3.5.0-Final
+
+
+
+ com.sun.faces
jsf-api
- 2.0
+ ${jsf-version}
com.sun.faces
jsf-impl
- 2.0.2
+ ${jsf-version}
+
+
+
+ org.slf4j
+ slf4j-api
+ ${org.slf4j-version}
- javax.persistence
- com.springsource.javax.persistence
- 1.0.0
+ org.slf4j
+ jcl-over-slf4j
+ ${org.slf4j-version}
- javax.servlet
- com.springsource.javax.servlet.jsp.jstl
- 1.2.0
+ org.slf4j
+ slf4j-log4j12
+ ${org.slf4j-version}
+ runtime
- javax.transaction
- com.springsource.javax.transaction
- 1.1.0
-
-
- org.apache.log4j
- com.springsource.org.apache.log4j
+ log4j
+ log4j
1.2.15
+
+
+ javax.mail
+ mail
+
+
+ javax.jms
+ jms
+
+
+ com.sun.jdmk
+ jmxtools
+
+
+ com.sun.jmx
+ jmxri
+
+
+ runtime
-
- org.hibernate
- com.springsource.org.hibernate
- 3.2.6.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.annotations
- 3.3.0.ga
-
-
- org.hibernate
- com.springsource.org.hibernate.ejb
- 3.3.1.ga
-
-
- org.hsqldb
- com.springsource.org.hsqldb
- 1.8.0.9
-
-
- joda-time
- joda-time
- 1.6
-
-
- org.springframework
- org.springframework.aop
- ${spring.version}
-
-
- org.springframework
- org.springframework.beans
- ${spring.version}
-
-
- org.springframework
- org.springframework.context
- ${spring.version}
-
-
- org.springframework
- org.springframework.core
- ${spring.version}
-
-
- org.springframework
- org.springframework.expression
- ${spring.version}
-
-
- org.springframework
- org.springframework.jdbc
- ${spring.version}
-
-
- org.springframework
- org.springframework.orm
- ${spring.version}
-
-
- org.springframework
- org.springframework.transaction
- ${spring.version}
-
-
- org.springframework
- org.springframework.web
- ${spring.version}
-
-
+
javax.servlet
- com.springsource.javax.servlet
- 2.4.0
+ servlet-api
+ 2.5
provided
+
- javax.el
- com.springsource.javax.el
- 1.0.0
- provided
+ org.easymock
+ easymock
+ 2.5.2
+ test
-
- org.junit
- com.springsource.junit
+ junit
+ junit
3.8.2
test
org.springframework
- org.springframework.test
- ${spring.version}
+ spring-test
+ ${org.springframework-version}
test
+
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Releases
- http://repository.springsource.com/maven/bundles/release
+ org.maven.central
+ Maven Central Repository
+ http://repo1.maven.org/maven2
+ false
+
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Releases
- http://repository.springsource.com/maven/bundles/external
+ org.springframework.maven.snapshot
+ Spring Maven Snapshot Repository
+ http://maven.springframework.org/snapshot
+ false
+ true
+
+
+ org.springframework.maven.milestone
+ Spring Maven Milestone Repository
+ http://maven.springframework.org/milestone
+ false
+
+
java.net.release
Repository for Projects On Hosted on java.net
@@ -162,9 +173,26 @@
1.5
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ junit:junit
+
+ **/*Tests.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+ true
+ false
+ 2.0
+
+
-
- 3.0.4.RELEASE
-
diff --git a/spring-webflow-samples/pom.xml b/spring-webflow-samples/pom.xml
new file mode 100644
index 00000000..4445aad6
--- /dev/null
+++ b/spring-webflow-samples/pom.xml
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ org.springframework.webflow
+ spring-webflow-samples
+ pom
+ Spring Web Flow Samples
+ 2.3.0.BUILD-SNAPSHOT
+
+ booking-mvc
+ booking-faces
+ booking-portlet-mvc
+ booking-portlet-faces
+ jsf-booking
+
+
diff --git a/spring-webflow-samples/readme.txt b/spring-webflow-samples/readme.txt
index ee664af9..897b4e26 100644
--- a/spring-webflow-samples/readme.txt
+++ b/spring-webflow-samples/readme.txt
@@ -1,10 +1,10 @@
/*
- * spring-webflow-samples
- * ----------------------
- * booking-mvc: Hotel Booking Reference App (Spring MVC + Web Flow + JSP version)
- * booking-faces: Hotel Booking Reference App (Spring MVC + Web Flow + JavaServerFaces version)
- * booking-portlet-mvc: Hotel Booking Reference App (Spring Portlet MVC + Web Flow + JSP version)
- * booking-portlet-faces: Hotel Booking Reference App (Spring Portlet MVC + Web Flow + JavaServerFaces version)
+ * Hotel Booking Reference App Versions
+ * ------------------------------------
+ * booking-mvc: Spring MVC + Web Flow + JSP
+ * booking-faces: Spring MVC + Web Flow + JavaServerFaces
+ * booking-portlet-mvc: Spring Portlet MVC + Web Flow + JSP version
+ * booking-portlet-faces: Spring Portlet MVC + Web Flow + JavaServerFaces version
* jsf-booking: Traditional JSF-based implementation; here to support comparison with "booking-faces"
*/
@@ -15,20 +15,17 @@ Sample pre-requisites:
To build the samples:
---------------------
-1. cd into the directory of the sample you are interested in building.
+Running 'mvn package' from the this directory builds all samples.
+You can find .war files under the appropriate '/target' directory.
+Samples can be built individually by running 'mvn package' from the sample sub-directory.
-2. run 'ant jar' to build the sample. The built .war file is placed in the 'target/artifacts' directory.
+To import the samples into Eclipse:
+-----------------------------------
+Fulfill the requirements below and then import all existing projects found under this directory:
-To import Web Flow projects into Eclipse:
------------------------------------------
-1. Use the SpringSource Tool Suite or Eclipse IDE for Java EE Developers
- Creating a dedicated workspace for importing Web Flow projects is recommended.
+1. Run 'mvn test' once from the command line in order to download required dependencies via Maven.
-2. Use the 'File -> Import -> Existing Projects into Workspace' wizard to import the Web Flow projects into Eclipse.
+2. Define an M2_REPO classpath variable in your Eclipse preferences pointing to your local Maven
+repository. Note that this step can be skipped if using the SpringSource Tool Suite.
-3. The projects will not compile initially as Eclipse will not be able to find dependent libraries.
- To compile, define a IVY_CACHE classpath variable pointing to the local artifact repository created by the Web Flow build.
- To do this, access 'Preferences -> Java -> Build Path -> Classpath Variables'.
- Then select 'New...'; enter IVY_CACHE for the Name and select the 'projects/ivy-cache/repository' Folder as the path.
-
-3. After the projects compile within Eclipse, run a sample web project on your local server by right-clicking on it and selecting 'Run on Server'.
\ No newline at end of file
+To deploy a project, right-click on it and select 'Run on Server'.