SWF-1382 Clarify docs for file uploads wrt JSF

build-spring-webflow/resources/changelog.txt

@@ -2,8 +2,16 @@ SPRING WEB FLOW CHANGELOG
 =========================
 http://www.springframework.org/webflow
 
-Changes in version 2.2.0.RC1 (Sep 22)
--------------------------------------
+Changes in version 2.2.0.RELEASE (Oct 11, 2010)
+-----------------------------------------------
+[SWF-1374] - Update documentation for 2.2.0 release
+[SWF-1382] - Clarify documentation in regards to file upload support.
+[SWF-1404] - Deprecate the ResourcesServlet
+[SWF-1271] - datePattern attribute not honored in Spring JS decorator for Dojo DateTextBox
+[SWF-1402] - FlowViewResponseStateManager should call delegate isPostback()
+
+Changes in version 2.2.0.RC1 (Sep 22, 2010)
+-------------------------------------------
 [SWF-1333] - Spring security tag support for JSF/Facelets
 [SWF-1368] - Build the Web Flow booking reference application with PrimeFaces components
 [SWF-1379] - Provide support for Portlet API 2.0 and JSF 1.2
@@ -19,8 +27,8 @@ Changes in version 2.2.0.RC1 (Sep 22)
 [SWF-1389] - MessageContextErrors doesn't obey the Errors contract
 [SWF-1378] - org.springframework.faces.webflow.FlowResourceResolver incompatible with JSF 1.2
 
-Changes in version 2.2.0.M1 (Aug 5)
------------------------------------
+Changes in version 2.2.0.M1 (Aug 5, 2010)
+-----------------------------------------
 
 [SWF-1365] - Add support for partial state saving in JSF 2
 [SWF-1366] - Add support for handling JSF 2 resource requests

build-spring-webflow/resources/readme.txt

@@ -35,7 +35,8 @@ Release distribution contents:
 "projects/spring-build" is the master build system used by all Spring projects, including Spring Web Flow
 "projects/spring-binding" contains buildable Spring Data Binding project sources, a utility library used by SWF
 "projects/spring-faces" contains buildable Spring Faces project sources, a library containing SWF's JSF integration
-"projects/spring-js" contains buildable Spring JavaScript project sources, a library containing client-side Ajax and Dojo integration
+"projects/spring-js" contains buildable Spring JavaScript project sources
+"projects/spring-js-resources" bundles library containing client-side Ajax and Dojo integration
 "projects/spring-webflow" contains buildable Spring Web Flow project sources
 "projects/spring-webflow-samples" contains buildable Spring Web Flow sample application sources
 
@@ -49,23 +50,27 @@ 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.2.0.RC1.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
+- Dependencies: Commons Logging, spring-core, spring-beans, spring-context, spring-expression, spring-binding, spring-web, spring-web-servlet, spring-js
                 [Log4J, Xerces, XML APIs, OGNL, EL API, JPA API, Hibernate, Spring Security, Servlet API, Portlet API, JUnit]
               
-* org.springframework.binding-2.2.0.RC1.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.2.0.RC1.jar
-- Contents: The Spring JavaScript module, containing Spring's Dojo integration and additional JavaScript functionality.
-- Dependencies: Dojo Toolkit
+* org.springframework.js-2.2.0.RELEASE.jar
+- Contents: The Spring JavaScript module
+- Dependencies: spring-beans, spring-core, spring-context, spring-web, spring-web-servlet
 
-* org.springframework.faces-2.2.0.RC1.jar
+* org.springframework.js.resources-2.2.0.RELEASE.jar
+- Contents: Spring's custom Dojo build and client-side Dojo integration files.
+- Dependencies: 
+
+* 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
+- Dependencies: spring-webflow, spring-js, spring-js-resources, JSF API
                                 
 For an exact list of project dependencies, see each project's ivy file at "projects/${project_name}/ivy.xml".
 
@@ -97,32 +102,34 @@ To access jars using Maven, add the following repositories to your Maven pom:
     <url>http://repository.springsource.com/maven/bundles/external</url>
 </repository>
 
-Then declare the following dependencies:
+Then declare the following dependencies (note that many times it's sufficient to include
+org.springframework.webflow only, which will give you org.springframework.binding, 
+org.springframework.js, and org.springframework.js via transitive dependencies):
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.binding</artifactId>
-    <version>2.2.0.RC1</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.js</artifactId>
-    <version>2.2.0.RC1</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.webflow</artifactId>
-    <version>2.2.0.RC1</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
-If using JavaServerFaces:
+If using JavaServerFaces all you need to include is:
 
 <dependency>
     <groupId>org.springframework.webflow</groupId>
     <artifactId>org.springframework.faces</artifactId>
-    <version>2.2.0.RC1</version>
+    <version>2.2.0.RELEASE</version>
 </dependency> 
 
 To access jars using Ivy, add the following repositories to your Ivy config:
@@ -139,13 +146,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.2.0.RC1" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.js" rev="2.2.0.RC1" conf="compile->runtime" />
-<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="2.2.0.RC1" 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.2.0.RC1" 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.
 	

spring-webflow-reference/src/actions.xml

@@ -408,7 +408,14 @@ public class PrintBoardingPassAction extends AbstractAction {
 				Another common task is to use Web Flow to handle multipart file uploads in combination with Spring MVC's 
 				<code>MultipartResolver</code>.  Once the resolver is set up correctly <ulink url="http://static.springsource.org/spring/docs/2.5.x/reference/mvc.html#mvc-multipart">as described here</ulink> and the submitting
 				HTML form is configured with <code>enctype="multipart/form-data"</code>, you can easily handle the file upload in a 
-				transition action.  Given a form such as:     
+				transition action.  
+			</para>
+			<para>
+				Note that the File Upload example below below is not relevant when using Web Flow with JSF.
+				Check the documentation of your JSF component library to see what file upload components it provides. 
+			</para>
+			<para>
+				Given a form such as:     
 			</para>
 			<programlisting language="xml"><![CDATA[
 <form:form modelAttribute="fileUploadHandler" enctype="multipart/form-data">