diff --git a/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index 666b4688..00000000 --- a/spring-webflow-samples/birthdate/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,21 +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 uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> - - - -Calculate your Age - - - - - - - - diff --git a/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index ad39cc3d..00000000 --- a/spring-webflow-samples/fileupload/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,21 +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" %> - - - -Upload a file - - - - - - - - diff --git a/spring-webflow-samples/flowlauncher/.springWebflow b/spring-webflow-samples/flowlauncher/.springWebflow new file mode 100644 index 00000000..78273a1e --- /dev/null +++ b/spring-webflow-samples/flowlauncher/.springWebflow @@ -0,0 +1,13 @@ + + + + + src/main/webapp/WEB-INF/sampleA.xml + sampleA + + + src/main/webapp/WEB-INF/sampleB.xml + sampleB + + + diff --git a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/aPage.jsp b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/aPage.jsp index 80b2ed8b..d04bbe65 100644 --- a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/aPage.jsp +++ b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/aPage.jsp @@ -1,53 +1,66 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> + + + Sample A Flow + + + + + + +
Sample A Flow
- Flow input was: ${input}
-
- From Sample A you may terminate Sample A and launch Sample B from an end state of Sample A. - You may also pass Sample B input. This can be done using: - - Alternatively, you may spawn Sample B as a sub flow of Sample A. In this case a flow - attribute mapper maps the input stored in the FlowScope of Sample A down to the spawning subflow - Here again you have the option of using: - - Yet another option is to launch Sample B as a top-level flow without involving Sample A as: - -
"> +
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/bPage.jsp b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/bPage.jsp index f345c9bc..6ee76d28 100644 --- a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/bPage.jsp +++ b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/bPage.jsp @@ -1,45 +1,60 @@ -<%@ include file="includeTop.jsp" %> +<%@ page contentType="text/html" %> +<%@ page session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + HigherLower - Enter Guess + + + + +
Sample B Flow
- Flow input was: ${input}
+ Flow input was: ${input} -
- Sample B is now running as a sub flow within Sample A. This means we can end Sample B and - return to the parent flow. We can do this using either: -
-
"> +
-<%@ include file="includeBottom.jsp" %> \ No newline at end of file + + + + \ No newline at end of file diff --git a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index 5a677d34..00000000 --- a/spring-webflow-samples/flowlauncher/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,21 +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" %> - - - -Launch a flow - - - - - - - - diff --git a/spring-webflow-samples/flowlauncher/src/main/webapp/index.html b/spring-webflow-samples/flowlauncher/src/main/webapp/index.html index 074ea7aa..18e858ea 100644 --- a/spring-webflow-samples/flowlauncher/src/main/webapp/index.html +++ b/spring-webflow-samples/flowlauncher/src/main/webapp/index.html @@ -13,6 +13,7 @@

You can launch the Sample A flow as a top-level flow and pass it input using request parameters. This can be done using +

@@ -21,8 +22,8 @@
an anchor:
or a form: - +
@@ -32,14 +33,14 @@ -
+
-

The same is true for Sample B: +

@@ -48,8 +49,8 @@ -
an anchor:
or a form: - +
@@ -59,12 +60,11 @@ -
+
-

+
diff --git a/spring-webflow-samples/itemlist/.springWebflow b/spring-webflow-samples/itemlist/.springWebflow new file mode 100644 index 00000000..8ae9dc58 --- /dev/null +++ b/spring-webflow-samples/itemlist/.springWebflow @@ -0,0 +1,13 @@ + + + + + src/main/webapp/WEB-INF/itemlist.xml + itemlist + + + src/main/webapp/WEB-INF/itemlist-alternate.xml + itemlist-alternate + + + diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeTop.jsp deleted file mode 100644 index 6716fa78..00000000 --- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/jsp/includeTop.jsp +++ /dev/null @@ -1,21 +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" %> - - - -Create an item list - - - - - - - -