From bd2db87ad3d7740e5684ed64360dc17261b3b229 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sun, 1 Apr 2007 13:58:35 +0000 Subject: [PATCH] fixed misc bugs in samples cleanup --- spring-binding/ivy.xml | 10 +-- .../webflow/phonebook-webflow-config.xml | 2 +- .../WEB-INF/flows/search-flow-beans.xml | 2 +- .../conversation-scope/sellitem-beans.xml | 6 +- .../main/webapp/WEB-INF/jsp/categoryForm.jsp | 26 +++++- .../main/webapp/WEB-INF/jsp/costOverview.jsp | 21 ++++- .../main/webapp/WEB-INF/jsp/includeBottom.jsp | 5 -- .../main/webapp/WEB-INF/jsp/includeTop.jsp | 22 ----- .../WEB-INF/jsp/priceAndItemCountForm.jsp | 25 +++++- .../WEB-INF/jsp/shippingDetailsForm.jsp | 26 +++++- .../sellitem/src/main/webapp/index.jsp | 90 +++++++------------ spring-webflow/ivy.xml | 20 ++--- 12 files changed, 142 insertions(+), 113 deletions(-) delete mode 100644 spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp delete mode 100644 spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml index e2e634d5..b47e32e4 100644 --- a/spring-binding/ivy.xml +++ b/spring-binding/ivy.xml @@ -13,14 +13,14 @@ - - - + + + - - + + \ No newline at end of file diff --git a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml index 25342399..c0b9c90e 100644 --- a/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml +++ b/spring-webflow-samples/phonebook/src/main/java/org/springframework/webflow/samples/phonebook/webflow/phonebook-webflow-config.xml @@ -4,7 +4,7 @@ xmlns:flow="http://www.springframework.org/schema/webflow-config" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd"> diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml index 711c661f..1b033e21 100644 --- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml +++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/flows/search-flow-beans.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml index 66a4c1cc..aa7bd74a 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml +++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/flows/conversation-scope/sellitem-beans.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp index 6d132f90..fd2f782e 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp +++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp @@ -1,4 +1,21 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + + Sell Item - Select Category + + + + + + +
@@ -45,4 +62,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp index 8dd43e98..95ce69bb 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp +++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/costOverview.jsp @@ -1,4 +1,16 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + + + + Sell Item - Order Summary + + + + +
@@ -68,4 +80,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp deleted file mode 100644 index dfe41438..00000000 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeBottom.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index 416cad5f..00000000 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ page session="false" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - - -Sell an item - - - - - - - - diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp index ab220892..507e8fdd 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp +++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/priceAndItemCountForm.jsp @@ -1,4 +1,20 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + + Sell Item - Enter Price and Item Count + + + + + + +
@@ -24,4 +40,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp index e6c9a61c..11d5ce56 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp +++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp @@ -1,4 +1,21 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + + Sell Item - Enter Shipping Information + + + + + + +
@@ -48,4 +65,9 @@
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/sellitem/src/main/webapp/index.jsp b/spring-webflow-samples/sellitem/src/main/webapp/index.jsp index 45801400..0b72e6a5 100644 --- a/spring-webflow-samples/sellitem/src/main/webapp/index.jsp +++ b/spring-webflow-samples/sellitem/src/main/webapp/index.jsp @@ -1,58 +1,32 @@ -<%@ page session="true" %> <%-- make sure we have a session --%> - - -
Sell Item - A Spring Web Flow Sample
- -
- -
-

- Sell Item -

- -

- This Spring Web Flow sample application implements the example application - discussed in the article - - Use continuations to develop complex Web applications. It illustrates - the following concepts: -

    -
  • - Using the "_flowId" request parameter to let the view tell the web - flow controller which flow needs to be started. -
    • -
  • - Implementing a wizard using web flows. -
    • -
  • - Use of the FormAction to perform form processing, including the - FormAction's "setupForm" method to install custom property editors for - formatting text field values (shipDate). -
    • -
  • - Using continuations to make the flow completely stable, no matter - how browser navigation buttons are used. -
    • -
  • - Using "conversation invalidation after completion" to prevent duplicate submits - of the same sale while taking advantage of continuations to allow back button - usage while the application transaction is in process. -
    • -
  • - "Always redirect on pause" to benefit from the POST+REDIRECT+GET pattern with no special coding. -
    • -
  • - Using OGNL based conditional expressions. -
    • -
  • - Use of subflows to compose a multi-step business process from independently reusable modules. -
    • -
-

-
- -
- -
- - +<%-- make sure we have a session --%> +<%@ page session="true" %> + + +
Sell Item - A Spring Web Flow Sample
+
+
+

+ Sell Item +

+

+ This Spring Web Flow sample application implements the example application + discussed in the article + Use continuations to develop complex Web applications. + It illustrates the following concepts: +

+
    +
  • Using the "_flowId" request parameter to let the view tell the web flow controller which flow needs to be started.
    • +
  • Implementing a wizard using web flows.
    • +
  • + Use of the FormAction to perform form processing, including the FormAction's "setupForm" method to install custom property editors for formatting text field values (shipDate). +
    • +
  • Using continuations to make the flow completely stable, no matter how browser navigation buttons are used.
    • +
  • + Using "conversation invalidation after completion" to prevent duplicate submits of the same sale + while taking advantage of continuations to allow back button usage while the application transaction is in process.
    • +
  • "Always redirect on pause" to benefit from the POST+REDIRECT+GET pattern with no special coding.
  • Using OGNL based conditional expressions.
    • +
  • Use of subflows to compose a multi-step business process from independently reusable modules.
    • +
+
+ + \ No newline at end of file diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml index bfccffb5..36318691 100644 --- a/spring-webflow/ivy.xml +++ b/spring-webflow/ivy.xml @@ -27,24 +27,24 @@ --> - + - - - + + + - + - + - + - + @@ -57,10 +57,10 @@ - + - + \ No newline at end of file