diff --git a/spring-binding/.classpath b/spring-binding/.classpath
index c0f54d82..76f31ad6 100644
--- a/spring-binding/.classpath
+++ b/spring-binding/.classpath
@@ -11,18 +11,18 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml
index cd698ecd..13de7703 100644
--- a/spring-binding/ivy.xml
+++ b/spring-binding/ivy.xml
@@ -23,10 +23,10 @@
-
-
-
-
+
+
+
+
diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml
index 07e73cef..9d0a911a 100644
--- a/spring-binding/pom.xml
+++ b/spring-binding/pom.xml
@@ -135,6 +135,6 @@
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
diff --git a/spring-faces/.classpath b/spring-faces/.classpath
index ce59bf97..38aad0e8 100644
--- a/spring-faces/.classpath
+++ b/spring-faces/.classpath
@@ -13,15 +13,15 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -38,7 +38,7 @@
-
+
-
\ No newline at end of file
+
diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index ce6036ab..f37f7c15 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -32,13 +32,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -75,7 +75,7 @@
-
+
diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml
index faabcf97..5b33a324 100644
--- a/spring-faces/pom.xml
+++ b/spring-faces/pom.xml
@@ -228,6 +228,6 @@
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
diff --git a/spring-js/.classpath b/spring-js/.classpath
index a30f30be..11ade04a 100644
--- a/spring-js/.classpath
+++ b/spring-js/.classpath
@@ -12,12 +12,12 @@
-
-
-
-
+
+
+
+
-
+
@@ -30,9 +30,9 @@
-
-
+
+
-
-
\ No newline at end of file
+
+
diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml
index 89be4978..b6521120 100644
--- a/spring-js/ivy.xml
+++ b/spring-js/ivy.xml
@@ -26,18 +26,18 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/spring-js/pom.xml b/spring-js/pom.xml
index 9378298e..ac7f2f39 100644
--- a/spring-js/pom.xml
+++ b/spring-js/pom.xml
@@ -143,6 +143,6 @@
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
diff --git a/spring-js/template.mf b/spring-js/template.mf
index 9e696226..9b13e7a8 100644
--- a/spring-js/template.mf
+++ b/spring-js/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring JS
Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
- org.springframework.*;version="[3.1.0.RELEASE, 3.2.0)",
+ org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.servlet;version="[2.4.0, 3.0.0)",
javax.servlet.http;version="[2.4.0, 3.0.0)",
diff --git a/spring-webflow-samples/booking-faces/.classpath b/spring-webflow-samples/booking-faces/.classpath
index 21ae14d1..abadb169 100644
--- a/spring-webflow-samples/booking-faces/.classpath
+++ b/spring-webflow-samples/booking-faces/.classpath
@@ -43,25 +43,25 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs
index 3de8692f..fc276c4b 100644
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 21 14:08:24 EST 2012
+#Mon Jan 28 11:42:26 EST 2013
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
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 cea44692..5d6718b6 100644
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
@@ -81,28 +81,28 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
-
+
uses
uses
-
+
uses
@@ -111,7 +111,7 @@
uses
-
+
uses
@@ -123,16 +123,16 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index c075635e..ed5bd463 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -8,7 +8,7 @@
Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces
2.3.2.BUILD-SNAPSHOT
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
3.1.3.RELEASE
1.5.10
2.1.7
@@ -63,6 +63,10 @@
commons-logging
commons-logging
+
+ org.springframework
+ spring-web
+
diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index 9250d992..63f19658 100644
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -49,26 +49,26 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
diff --git a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.jdt.core.prefs
index 0092150d..03809e7d 100644
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 21 14:08:22 EST 2012
+#Mon Jan 28 11:41:30 EST 2013
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
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 57d4c8e4..fcf1cd62 100644
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
@@ -84,25 +84,25 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
@@ -111,7 +111,7 @@
uses
-
+
uses
@@ -129,16 +129,16 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml
index d5829eb6..db9e88f7 100644
--- a/spring-webflow-samples/booking-mvc/pom.xml
+++ b/spring-webflow-samples/booking-mvc/pom.xml
@@ -8,7 +8,7 @@
Hotel Booking : Spring MVC + Web Flow + JSP
2.3.2.BUILD-SNAPSHOT
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
3.1.3.RELEASE
1.5.10
@@ -68,12 +68,22 @@
commons-logging
commons-logging
+
+ org.springframework
+ spring-web
+
org.springframework.security
spring-security-taglibs
${org.springsecurity-version}
+
+
+ org.springframework
+ spring-web
+
+
org.springframework.security
diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath
index 3bfe0dc6..9ffd0e4e 100644
--- a/spring-webflow-samples/booking-portlet-faces/.classpath
+++ b/spring-webflow-samples/booking-portlet-faces/.classpath
@@ -48,23 +48,23 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.jdt.core.prefs
index 3de8692f..fc276c4b 100644
--- a/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/booking-portlet-faces/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 21 14:08:24 EST 2012
+#Mon Jan 28 11:42:26 EST 2013
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
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 7b6c0c0d..77d8501d 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
@@ -93,28 +93,28 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
-
+
uses
uses
-
+
uses
@@ -123,22 +123,22 @@
uses
-
+
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml
index b33c798c..a7d44c05 100644
--- a/spring-webflow-samples/booking-portlet-faces/pom.xml
+++ b/spring-webflow-samples/booking-portlet-faces/pom.xml
@@ -8,7 +8,7 @@
Hotel Booking : Spring Portlet MVC + Web Flow + JSF
2.3.2.BUILD-SNAPSHOT
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
1.5.10
1.2.9
diff --git a/spring-webflow-samples/booking-portlet-mvc/.classpath b/spring-webflow-samples/booking-portlet-mvc/.classpath
index a4a69799..75b07df3 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.classpath
+++ b/spring-webflow-samples/booking-portlet-mvc/.classpath
@@ -43,22 +43,22 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.jdt.core.prefs
index 3de8692f..fc276c4b 100644
--- a/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/booking-portlet-mvc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 21 14:08:24 EST 2012
+#Mon Jan 28 11:42:26 EST 2013
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
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 8cbea9f2..7562f4fc 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
@@ -78,25 +78,25 @@
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
@@ -105,22 +105,22 @@
uses
-
+
uses
-
+
uses
-
+
uses
uses
-
+
uses
-
+
uses
diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml
index 208ce3de..151a9acd 100644
--- a/spring-webflow-samples/booking-portlet-mvc/pom.xml
+++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml
@@ -8,7 +8,7 @@
Hotel Booking : Spring Portlet MVC + Web Flow + JSP
2.3.2.BUILD-SNAPSHOT
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
1.5.10
diff --git a/spring-webflow-samples/jsf-booking/.classpath b/spring-webflow-samples/jsf-booking/.classpath
index a0ae0dce..87e16937 100644
--- a/spring-webflow-samples/jsf-booking/.classpath
+++ b/spring-webflow-samples/jsf-booking/.classpath
@@ -27,17 +27,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.core.prefs
index 3de8692f..fc276c4b 100644
--- a/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-webflow-samples/jsf-booking/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Dec 21 14:08:24 EST 2012
+#Mon Jan 28 11:42:26 EST 2013
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
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 ade803ce..7cdf1b74 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
@@ -63,31 +63,31 @@
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
-
+
uses
diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml
index 66aeaf43..56f7ad61 100644
--- a/spring-webflow-samples/jsf-booking/pom.xml
+++ b/spring-webflow-samples/jsf-booking/pom.xml
@@ -8,7 +8,7 @@
Hotel Booking : Spring Framework + JSF
2.3.2.BUILD-SNAPSHOT
- 3.2.0.RELEASE
+ 3.2.1.RELEASE
1.5.10
2.1.7
diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index 9fa592da..e39f1b32 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -18,14 +18,14 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -39,14 +39,14 @@
-
-
-
-
+
+
+
+
-
+
@@ -66,4 +66,4 @@
-
\ No newline at end of file
+
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 7ad6547c..c5ac8d3d 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -30,15 +30,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -52,9 +52,9 @@
-
-
-
+
+
+
diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml
index f47ea8a4..d6c8bc91 100644
--- a/spring-webflow/pom.xml
+++ b/spring-webflow/pom.xml
@@ -266,6 +266,6 @@
- 3.2.0.RELEASE
+ 3.2.1.RELEASE