Create Spring Web Flow 2.2 branch

build-spring-webflow/resources/changelog.txt

@@ -2,6 +2,10 @@ SPRING WEB FLOW CHANGELOG
 =========================
 http://www.springframework.org/webflow
 
+Changes in version 2.2.0.RELEASE ()
+-----------------------------------
+
+
 Changes in version 2.1.0.RELEASE (July 19, 2010)
 ------------------------------------------------
 * Extract JSF 2 methods from FlowApplication into Jsf2FlowApplication (SWF-1261).
@@ -39,8 +43,8 @@ Changes in version 2.1.0 M1 (May 7, 2010)
 * Integrate Spring type conversion and formatting (SWF-1234)
 * Update samples as reference apps for Web Flow on Spring 3 (SWF-1219)
 
-Changes in version 2.0.9 ()
--------------------------------------
+Changes in version 2.0.9 (Apr 14, 2010)
+---------------------------------------
 * ViewState now ignores case where 'model' expression fails to evaluate (SWF-1176)
 * Added calls to lock/unlock the coversation when a flow execution is launched (SWF-1213)
 * Added serialization methods to FlowFacesMessageAdapter as workaround for issue in MyFaces (SWF-1187)

build-spring-webflow/resources/readme.txt

@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.1.1
+SPRING WEB FLOW 2.2.0
 ----------------------
 http://www.springframework.org/webflow
 
@@ -49,21 +49,21 @@ The following jar files are included in the distribution.
 The contents of each jar and its dependencies are noted.
 Dependencies in [brackets] are optional, and are just necessary for certain functionality.
 
-* org.springframework.webflow-2.1.1.RELEASE.jar
+* org.springframework.webflow-2.2.0.RELEASE.jar
 - Contents: The Spring Web Flow system
 - Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-expression, spring-binding, spring-web, spring-webmvc-servlet, spring-js
                 [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
               
-* org.springframework.binding-2.1.1.RELEASE.jar
+* org.springframework.binding-2.2.0.RELEASE.jar
 - Contents: The Spring Data Binding framework, a utility library used by Web Flow
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-expression
                 [Log4J, OGNL, EL API]
 
-* org.springframework.js-2.1.1.RELEASE.jar
+* org.springframework.js-2.2.0.RELEASE.jar
 - Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
 - Dependencies: Dojo Toolkit
 
-* org.springframework.faces-2.1.1.RELEASE.jar
+* org.springframework.faces-2.2.0.RELEASE.jar
 - Contents: The Spring Faces module, containing Spring's integration with Java Server Faces (JSF) and additional JSF functionality.
 - Dependencies: spring-webflow, spring-js, JSF API
                                 
@@ -102,19 +102,19 @@ Then declare the following dependencies:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 If using JavaServerFaces:
@@ -122,7 +122,7 @@ If using JavaServerFaces:
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 To access jars using Ivy, add the following repositories to your Ivy config:
@@ -139,13 +139,13 @@ To access jars using Ivy, add the following repositories to your Ivy config:
 
 Then declare the following dependencies in your ivy.xml:
 
-<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.1.1.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.1.1.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.1.1.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.binding" rev="2.2.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.2.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.2.0.RELEASE" conf="compile->runtime" />
 
 If using JavaServerFaces:
 
-<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.1.1.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.2.0.RELEASE" conf="compile->runtime" />
 
 Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.
 	

build.properties

@@ -1,4 +1,4 @@
-version=2.1.1
+version=2.2.0
 release.type=integration
 natural.name=spring-webflow
 project.key=SWF

spring-binding/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>spring-binding</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Binding</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>

spring-faces/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>spring-faces</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Faces</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>

spring-faces/template.mf

@@ -3,11 +3,11 @@ Bundle-Name: Spring Faces
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.webflow.engine.builder.support;version="[2.1.0, 2.1.1)"
+ org.springframework.webflow.engine.builder.support;version="[2.2.0, 2.3.0)"
 Import-Template: 
- org.springframework.binding.*;version="[2.1.0, 2.1.1)",
- org.springframework.js.*;version="[2.1.0, 2.1.1)",
- org.springframework.webflow.*;version="[2.1.0, 2.1.1)",
+ org.springframework.binding.*;version="[2.2.0, 2.3.0)",
+ org.springframework.js.*;version="[2.2.0, 2.3.0)",
+ org.springframework.webflow.*;version="[2.2.0, 2.3.0)",
  org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.el;version="[1.0.0, 2.0.0)",

spring-js/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>spring-js</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring JavaScript</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>

spring-webflow-samples/booking-faces/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>

spring-webflow-samples/booking-mvc/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>

spring-webflow-samples/booking-portlet-faces/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-faces</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>

spring-webflow-samples/booking-portlet-mvc/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>booking-portlet-mvc</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.persistence</groupId>

spring-webflow-samples/jsf-booking/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.springframework.webflow.samples</groupId>
 	<artifactId>jsf-booking</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.faces</groupId>

spring-webflow/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>spring-webflow</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Web Flow</name>
-	<version>2.1.1.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>

spring-webflow/template.mf

@@ -3,8 +3,8 @@ Bundle-Name: Spring Web Flow
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.binding.*;version="[2.1.0, 2.1.1)",
- org.springframework.js.*;version="[2.1.0, 2.1.1)",
+ org.springframework.binding.*;version="[2.2.0, 2.3.0)",
+ org.springframework.js.*;version="[2.2.0, 2.3.0)",
  org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)",
  org.springframework.orm.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional,