diff --git a/build-spring-webflow/readme.txt b/build-spring-webflow/readme.txt
index 59c010d1..06572d26 100644
--- a/build-spring-webflow/readme.txt
+++ b/build-spring-webflow/readme.txt
@@ -1,7 +1,7 @@
This is where the master build that creates releases of Spring Web Flow resides. The build system is based on spring-build, which is linked in using an SVN external to https://src.springframework.org/svn/spring-build.
USERS
-- To build all Spring Web Flow projects:
+- To build all Spring Web Flow projects, including samples:
1. From this directory, run:
ant
diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt
index 2b579aaf..995eed73 100644
--- a/build-spring-webflow/resources/changelog.txt
+++ b/build-spring-webflow/resources/changelog.txt
@@ -2,6 +2,32 @@ SPRING WEB FLOW CHANGELOG
=========================
http://www.springframework.org/webflow
+Changes in version 2.0.1 (13.05.2008)
+-------------------------------------
+New Features
+
+Improvements
+* Added a Bundle-Name: entry to each project's manifest for improved OSGi compliance.
+* Changed to use the ClassLoader of a flow's ApplicationContext when deserializing a FlowExecution, allowing for more a modular usage of SWF when running in a OSGi environment.
+* Co-located FlowExecution creation and state restoration logic inside a FlowExecutionFactory, a design improvement eliminating the need for a separate FlowExecutionStateRestorer.
+* Reduced the size a persistent flow execution by removing the need to store the id of the root flow definition with each FlowExecutionSnapshot.
+* Simplified the Converter interface and implementation contract by allowing Converters to throw any Exception to report type conversion failures.
+ The ConversionExecutor now cares for wrapping any exception in a ConversionExecutionException providing full context about the conversion attempt.
+ This change will effect any custom Converter implementations extending from AbstractConverter.
+ Please see the existing converters in the org.springframework.binding.converters package for examples of refined Converter implementations.
+* Improved booking samples by removing the unnecessary dispatcher-servlet-config.xml file and favoring configuration driven by a single master Spring configuration file.
+
+Bug Fixes
+* Fixed a bug preventing the handling of NumberFormatExceptions when binding to number properties using the default NumberFormatter.
+* Fixed a bug preventing the loading of externalized flow definition resources in a EAR environment, for example, in Web Logic.
+* Fixed a bug requiring Spring Portlet MVC in the classpath even in a Servlet-based web application when running on a Portal server.
+* Fixed a bug preventing generic use of javax.faces.model.DataModel as the target type of a List conversion.
+
+Documentation
+* Added documentation on FlowHandler and externalRedirect: redirect prefixes.
+* Clarified the conversation-scoped and view-state managed persistence context patterns will be considered for implementation in future Web Flow releases.
+* Removed unnecessary note about special Spring MVC and JSF model binding semantics; the semantics should be equal between view technologies, even if the underlying technologies differ.
+
Changes in version 2.0.0 (29.04.2008)
-------------------------------------
New Features
diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt
index 87516fc7..402d11ac 100644
--- a/build-spring-webflow/resources/readme.txt
+++ b/build-spring-webflow/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB FLOW 2.0.0 (April 2008)
+SPRING WEB FLOW 2.0.1 (May 2008)
----------------------------------
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.0.0 requires Java SE 1.4 and Spring Framework 2.5.4 or above to run.
+Spring Web Flow 2.0.1 requires Java SE 1.4 and Spring Framework 2.5.4 or above to run.
Java SE 5.0 with Ant 1.7 is 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.0.0.RELEASE.jar
+* org.springframework.webflow-2.0.1.RELEASE.jar
- Contents: The Spring Web Flow system
- Dependencies: Commons Logging, spring-core, spring-beans, spring-context, 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.0.0.RELEASE.jar
+* org.springframework.binding-2.0.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
[Log4J, OGNL, EL API]
-* org.springframework.js-2.0.0.RELEASE.jar
+* org.springframework.js-2.0.1.RELEASE.jar
- Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
- Dependencies: Dojo Toolkit 1.1
-* org.springframework.faces-2.0.0.RELEASE.jar
+* org.springframework.faces-2.0.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
@@ -101,19 +101,19 @@ Then declare the following dependencies:
org.springframework.webflow
org.springframework.binding
- 2.0.0.RELEASE
+ 2.0.1.RELEASE
org.springframework.webflow
org.springframework.js
- 2.0.0.RELEASE
+ 2.0.1.RELEASE
org.springframework.webflow
org.springframework.webflow
- 2.0.0.RELEASE
+ 2.0.1.RELEASE
If using JavaServerFaces:
@@ -121,7 +121,7 @@ If using JavaServerFaces:
org.springframework.webflow
org.springframework.faces
- 2.0.0.RELEASE
+ 2.0.1.RELEASE
To access jars using Ivy, add the following repositories to your Ivy config:
@@ -138,13 +138,13 @@ To access jars using Ivy, add the following repositories to your Ivy config:
Then declare the following dependencies in your ivy.xml:
-
-
-
+
+
+
If using JavaServerFaces:
-
+
Refer to the reference documentation for more coverage on obtaining Web Flow jars using Maven or Ivy.
diff --git a/build.properties b/build.properties
index 65e41a0c..d8fa5fa9 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.0.0
+version=2.0.1
release.type=integration
natural.name=spring-webflow
project.key=SWF