diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt index 144e4d9f..21831801 100644 --- a/build-spring-webflow/resources/changelog.txt +++ b/build-spring-webflow/resources/changelog.txt @@ -4,6 +4,7 @@ http://www.springframework.org/webflow Changes in version 2.3.1.RELEASE ----------------------------------------------- +Upgrade Spring to version 3.1.1 Upgrade JSF Mojarra version to 2.1.7 Modify Jsf2FlowFacesContext.isValidationFailed() to check Web Flow's MessageContext for errors Recognize class-level bean validation messages in BindingResult.getGlobalErrors() diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt index 64587975..340818a5 100644 --- a/build-spring-webflow/resources/readme.txt +++ b/build-spring-webflow/resources/readme.txt @@ -89,8 +89,8 @@ For milestones and snapshots only (and for Ivy dependencies) you'll need to use SpringSource repository. Add the following repository to your Maven pom.xml: - spring-repository - Spring project snapshots, milestones, and releases + springsource-repository + Spring project releases, milestones, and snapshots http://repo.springsource.org/snapshot @@ -126,27 +126,27 @@ If using JSF all you need to include is: 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: - + -For more information see the SpringSource Repository FAQ: +For more information see the reference documentation and the SpringSource Repository FAQ: https://github.com/SpringSource/spring-framework/wiki/SpringSource-repository-FAQ 6. ADDITIONAL RESOURCES diff --git a/spring-webflow-reference/src/overview.xml b/spring-webflow-reference/src/overview.xml index c7c994c3..edad6d6f 100644 --- a/spring-webflow-reference/src/overview.xml +++ b/spring-webflow-reference/src/overview.xml @@ -48,166 +48,97 @@ How to access Web Flow artifacts from Maven Central - Each jar in the Web Flow distribution is available in the Maven Central Repository. + Each jar in the Web Flow distribution is available in the Maven Central Repository. This allows you to easily integrate Web Flow into your application if you are already using Maven as the build system for your web development project. - To access Web Flow jars from Maven Central, declare the following dependency in your pom (also adds "spring-binding", "spring-js", and "spring-js-resources"): + To access Web Flow jars from Maven Central, declare the following dependency in your pom (includes transitive dependencies "spring-binding" and "spring-js"): org.springframework.webflow spring-webflow - 2.3.1.RELEASE + x.y.z.RELEASE ]]> - If using JavaServer Faces, declare the following dependency in your pom (also adds the above dependencies): + If using JavaServer Faces, declare the following dependency in your pom (includes transitive dependencies "spring-binding", "spring-webflow" and "spring-js"): org.springframework.webflow spring-faces - 2.3.1.RELEASE + x.y.z.RELEASE ]]> - - - How to access Web Flow artifacts from the SpringSource Bundle Repository + + + How to access Web Flow artifacts with Ivy - Each jar in the Web Flow distribution is also available in the SpringSource Enterprise Bundle Repository. - Use this repository when you wish to run Spring Web Flow in an OSGi environment such as the SpringSource dm Server. - All jars obtained from the SpringSource Bundle Repository are OSGi-ready. + To access Spring Web Flow jars with Ivy, add the following repositories to your Ivy config: - - Accessing Web Flow bundles with Maven - - To access bundles using Maven, add the following repositories to your Maven pom: - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Releases - http://repository.springsource.com/maven/bundles/release - - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Releases - http://repository.springsource.com/maven/bundles/external -]]> - - - Then declare the following dependency: - - - org.springframework.webflow - org.springframework.webflow - 2.3.1.RELEASE -]]> - - - And if using JavaServer Faces: - - - org.springframework.webflow - org.springframework.faces - 2.3.1.RELEASE -]]> - - - Note the Web Flow artifacts in the SpringSource Bundle Repository are indexed under different ids because their transitive dependencies are different than the Maven Central artifacts. - The difference is the transitive jars such as commons-logging have been patched by SpringSource to add the metadata required to make them OSGi-compatible. - - - - Accessing Web Flow bundles with Ivy - - To access bundles using Ivy, add the following repositories to your Ivy config: - + [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> + [organisation]/[module]/[revision]/[artifact]-[revision].[ext]" /> ]]> - - Then declare the following dependencies (also adds "org.springframework.binding", - "org.springframework.js", and "org.springframework.spring.js"): - + + To access Spring Web Flow jars as well as 3rd party dependencies with Ivy, add the following repository to your Ivy config: + + + +]]> + + + Then declare the following dependencies in your ivy.xml: + + runtime" /> + ]]> - - - And if using JavaServerFaces: - - runtime" />]]> + + + If using JavaServer Faces, declare the following dependency in your pom (also adds the above dependencies): + + runtime" />]]> - - - - Accessing the dm Server Web Flow library - - A dm Server library for Web Flow is also available if you are deploying to a dm Server environment. - Import this library in your MANIFEST.mf to automatically import all Web Flow bundles. - To access the library, add the following repository: - - - com.springsource.repository.libraries.release - SpringSource Enterprise Bundle Repository - SpringSource Library Releases - http://repository.springsource.com/maven/libraries/release -]]> - - - And declare the following dependency: - - - org.springframework.webflow - org.springframework.webflow-library - libd - 2.3.1.RELEASE -]]> - - + rev="x.y.z.RELEASE" conf="compile->runtime" />]]> + - How to access nightly builds + How to access nightly builds and milestone releases - Nightly snapshots of Web Flow development branches are available using Maven, and distribution zips are also available for download. + Nightly snapshots of Web Flow development branches are available using Maven. These snapshot builds are useful for testing out fixes you depend on in advance of the next release, and provide a convenient way for you to provide feedback about whether a fix meets your needs. - - If using Maven, you may obtain snapshots from either the SpringSource-managed Maven Central-compatible repository or the SpringSource Enterprise Bundle Repository. - Use the Maven Central-compatible snapshot repository when your project obtains its other open source dependencies from Maven Central. - Use the Spring Source Enterprise Bundle Snapshot Repository when you wish to run Web Flow in an OSGi environment. - - Accessing snapshots from the Maven-central compatible repository + Accessing snapshots and milestones with Maven - Add the following repository your pom: + For milestones and snapshots you'll need to use the SpringSource repository. + Add the following repository to your Maven pom.xml: - org.springsource.maven.snapshot - SpringSource Maven Central-compatible Snapshot Repository - http://maven.springframework.org/snapshot + springsource-repository + Spring project snapshots, milestones, and releases + http://repo.springsource.org/snapshot ]]> @@ -243,56 +174,5 @@ ]]> - - Accessing snapshots from the SpringSource Enterprise Bundle Repository - - Add the following repository your pom: - - - com.springsource.repository.bundles.snapshot - SpringSource Enterprise Bundle Snapshot Repository - http://repository.springsource.com/maven/bundles/snapshot -]]> - - - Then declare the following dependencies: - - - org.springframework.webflow - org.springframework.binding - x.y.z.BUILD-SNAPSHOT - - - - org.springframework.webflow - org.springframework.js - x.y.z.BUILD-SNAPSHOT - - - - org.springframework.webflow - org.springframework.webflow - x.y.z.BUILD-SNAPSHOT -]]> - - - And if using JavaServerFaces: - - - org.springframework.webflow - org.springframework.faces - x.y.z.BUILD-SNAPSHOT -]]> - - - - Accessing snapshot distribution archives - - Get the snapshot zip with the most recent CI build number from the Web Flow snapshot download area. - -