From 07d7b743cc1948d11ef1495d5b5878ccd05c0e4f Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 19 Jul 2010 13:47:03 +0000
Subject: [PATCH] Update changelog and readme for 2.1.1 release

---
 build-spring-webflow/resources/changelog.txt |  9 +++++++
 build-spring-webflow/resources/readme.txt    | 28 ++++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt
index 66492f49..d09b25cb 100644
--- a/build-spring-webflow/resources/changelog.txt
+++ b/build-spring-webflow/resources/changelog.txt
@@ -2,6 +2,15 @@ SPRING WEB FLOW CHANGELOG
 =========================
 http://www.springframework.org/webflow
 
+Changes in version 2.1.0.RELEASE (July 19, 2010)
+------------------------------------------------
+* Extract JSF 2 methods from FlowApplication into Jsf2FlowApplication (SWF-1261).
+* Fix handling of cascaded attributes in AjaxTilesView (SWF-1053).
+* Document DataModel implementations (SWF-1358)
+* Remove Dojo files from svn and replace with script to put together custom Dojo build (SWF-1362).
+* Remove compressed Spring.js and Spring-Dojo.js files from svn and compress during the build (SWF-1363).
+* Minor JavaScript fixes (SWF-1268, SWF-1358).
+
 Changes in version 2.1.0.RELEASE (June 17, 2010)
 ------------------------------------------------
 * Upgrade to Spring 3.0.3
diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt
index 2a80ef2a..0f7a8a3a 100644
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.1.0
+SPRING WEB FLOW 2.1.1
 ----------------------
 http://www.springframework.org/webflow
 
@@ -20,7 +20,7 @@ It is a powerful controller engine that addresses the "C" in MVC.
 
 2. RELEASE NOTES
 ----------------
-Spring Web Flow 2.1 requires Java SE 1.5 and Spring Framework 3.0.0 or above to run.
+Spring Web Flow 2.1.x requires Java SE 1.5 and Spring Framework 3.0.0 or above to run.
 
 Java SE 5.0 with Ant 1.7 is also required to build.
 
@@ -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.0.RELEASE.jar
+* org.springframework.webflow-2.1.1.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.0.RELEASE.jar
+* org.springframework.binding-2.1.1.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.0.RELEASE.jar
+* org.springframework.js-2.1.1.RELEASE.jar
 - Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
 - Dependencies: Dojo Toolkit
 
-* org.springframework.faces-2.1.0.RELEASE.jar
+* org.springframework.faces-2.1.1.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.0.RELEASE</version>
+    <version>2.1.1.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.1.0.RELEASE</version>
+    <version>2.1.1.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.1.0.RELEASE</version>
+    <version>2.1.1.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.0.RELEASE</version>
+    <version>2.1.1.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.0.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.1.0.RELEASE" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.1.0.RELEASE" conf="compile->runtime" />
+<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" />
 
 If using JavaServerFaces:
 
-<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.1.0.RELEASE" conf="compile->runtime" />
+<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="2.1.1.RELEASE" conf="compile->runtime" />
 
 Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.