diff --git a/spring-webflow-reference/src/defining-flows.xml b/spring-webflow-reference/src/defining-flows.xml index 2dc7701d..d8ffab55 100644 --- a/spring-webflow-reference/src/defining-flows.xml +++ b/spring-webflow-reference/src/defining-flows.xml @@ -6,7 +6,7 @@ This chapter begins the Users Section. It shows how to implement flows using the flow definition language. - By the end of this chapter, you should have a good understanding of language constructs and capable of authoring a flow definition. + By the end of this chapter you should have a good understanding of language constructs, and be capable of authoring a flow definition. @@ -173,7 +173,7 @@ evaluate - The action element you will use the most often is the evaluate element. + The action element you will use most often is the evaluate element. Use the evaluate element to evaluate an expression at a point within your flow. With this single tag you can invoke methods on Spring beans or any other flow variable. For example: @@ -263,7 +263,7 @@ public interface FlowOutcome { input - Use the input element to declare a flow input attribute: + Use the input element to declare a flow input attribute: ]]> @@ -296,7 +296,7 @@ public interface FlowOutcome { - Use the required attribute to enforce the input is not null or empty: + Use the required attribute to enforce the input is not null or empty: ]]> @@ -374,7 +374,7 @@ public interface FlowOutcome { A flow may declare one or more instance variables. These variables are allocated when the flow starts. - Any @Autowired transient references the variable holds are also rewired when the flow resumes. + Any @Autowired transient references the variable holds are also rewired when the flow resumes. var @@ -414,7 +414,7 @@ public interface FlowOutcome { Passing a subflow input - Use the input element to pass input to the subflow: + Use the input element to pass input to the subflow: diff --git a/spring-webflow-reference/src/el.xml b/spring-webflow-reference/src/el.xml index f3162f22..c13cb6d3 100644 --- a/spring-webflow-reference/src/el.xml +++ b/spring-webflow-reference/src/el.xml @@ -17,7 +17,7 @@ jboss-el is currently the default EL implementation. When found in your classpath along with the el-api, it will be used automatically. - The el-api dependency is typically a provided by your web container. Tomcat 6 includes it, for example. + The el-api dependency is typically provided by your web container. Tomcat 6 includes it, for example. @@ -61,7 +61,7 @@ Standard eval expressions - The first, and most common type of expression, is the standard eval expression. + The first, and most common, type of expression, is the standard eval expression. Such expressions are dynamically evaluated by the EL and should not be enclosed in delimiters like ${} or #{}. For example: diff --git a/spring-webflow-reference/src/flow-inheritance.xml b/spring-webflow-reference/src/flow-inheritance.xml index 860a82dc..60af3e48 100644 --- a/spring-webflow-reference/src/flow-inheritance.xml +++ b/spring-webflow-reference/src/flow-inheritance.xml @@ -64,7 +64,7 @@ Abstract flows Often parent flows are not designed to be executed directly. - In order to protect these flow from running, they can be marked as abstract. + In order to protect these flows from running, they can be marked as abstract. If an abstract flow attempts to run, a FlowBuilderException will be thrown. - There are two types of elements mergeable and non-mergeable. + There are two types of elements: mergeable and non-mergeable. Mergeable elements will always attempt to merge together if the elements are similar. Non-mergeable elements in a parent or child flow will always be contained in the resulting flow intact. They will not be modified as part of the merge process. @@ -91,13 +91,13 @@ Mergeable Elements - If the elements are of the same type and the keyed attribute are identical, the content of the parent element will be merged with the child element. + If the elements are of the same type and their keyed attribute are identical, the content of the parent element will be merged with the child element. The merge algorithm will continue to merge each sub-element of the merging parent and child. Otherwise the parent element is added as a new element to the child. In most cases, elements from a parent flow that are added will be added after elements in the child flow. - Exceptions to this rule include actions elements (evaluate, render and set) which will be added at the beginning. + Exceptions to this rule include action elements (evaluate, render and set) which will be added at the beginning. This allows for the results of parent actions to be used by child actions. diff --git a/spring-webflow-reference/src/flow-security.xml b/spring-webflow-reference/src/flow-security.xml index db2334fe..129cfd52 100644 --- a/spring-webflow-reference/src/flow-security.xml +++ b/spring-webflow-reference/src/flow-security.xml @@ -6,7 +6,7 @@ Security is an important concept for any application. End users should not be able to access any portion of a site simply by guessing the URL. - Areas of a site that are sensitive must insure that only authorized requested are processed. + Areas of a site that are sensitive must ensure that only authorized requested are processed. Spring Security is a proven security platform that can integrate with your application at multiple levels. This section will focus on securing flow execution. @@ -72,7 +72,7 @@ The SecurityFlowExecutionListener - Defining security rules in the flow by themself will not protect the flow execution. + Defining security rules in the flow by themselves will not protect the flow execution. A SecurityFlowExecutionListener must also be defined in the webflow configuration and applied to the flow executor. SpringSource Bundle Repository. - To access Web Flow jars from Maven Central, declare the following dependencies in you pom: + To access Web Flow jars from Maven Central, declare the following dependencies in your pom: diff --git a/spring-webflow-reference/src/spring-mvc.xml b/spring-webflow-reference/src/spring-mvc.xml index bf92cb17..ec7a12b0 100644 --- a/spring-webflow-reference/src/spring-mvc.xml +++ b/spring-webflow-reference/src/spring-mvc.xml @@ -18,7 +18,7 @@ The example below maps all requests that begin with /spring/ to the DispatcherServlet. An init-param is used to provide the contextConfigLocation. - This is configuration file for the web application. + This is the configuration file for the web application. diff --git a/spring-webflow-reference/src/upgrade-guide.xml b/spring-webflow-reference/src/upgrade-guide.xml index 8eea21b8..d7e110db 100644 --- a/spring-webflow-reference/src/upgrade-guide.xml +++ b/spring-webflow-reference/src/upgrade-guide.xml @@ -180,7 +180,7 @@ java org.springframework.webflow.upgrade.WebFlowUpgrader flow-to-upgrade.xml - + diff --git a/spring-webflow-reference/src/views.xml b/spring-webflow-reference/src/views.xml index 3b1f8a37..5be963db 100644 --- a/spring-webflow-reference/src/views.xml +++ b/spring-webflow-reference/src/views.xml @@ -4,7 +4,7 @@ Introduction - This chapter shows you how to use the view-state element to render views within a flow. + This chapter shows you how to use the view-state element to render views within a flow. @@ -85,7 +85,7 @@ Allocating view variables Use the var tag to declare a view variable. - Like a flow variable, any @Autowired references are automatically restored when the view state resumes. + Like a flow variable, any @Autowired references are automatically restored when the view state resumes. ]]> @@ -144,7 +144,7 @@ Use the model attribute to declare a model object the view binds to. This attribute is typically used with views that render data controls, such as forms. - The following example declares the enterBookingDetails state manipulates the booking model: + The following example declares an enterBookingDetails state manipulates the booking model: ]]> @@ -209,7 +209,7 @@ public void validateEnterBookingDetails(MessageContext context) { Implementing a Validator - The second way is to define a separate object, called a Validator, which validates your model object. + The second way is to define a separate object, called a Validator, which validates your model object. To do this, create a class that defines a public method with the name validate${state}, where state is the id of your view-state. The method must declare a parameter to accept your model object, and a MessageContext parameter for recording validation error messages. For example: @@ -233,7 +233,7 @@ public class BookingValidator { Validators must be registered as Spring beans employing the naming convention ${model}Validator to be detected and invoked automatically. - In the example above, Spring 2.5 classpath-scanning would detect the @Component and automatically register it as a bean with the name bookingValidator. + In the example above, Spring 2.5 classpath-scanning would detect the @Component and automatically register it as a bean with the name bookingValidator. Then, anytime the booking model needs to be validated, this bookingValidator instance would be invoked for you.