Most of the buttons are working

Arun Gupta · Arun Gupta · commit 98009b1569b8 · 2013-04-26T00:16:49.000+04:00
Former-commit-id: 2fb58e6708ca8e29fbc44e0437e8dedda9606b90
diff --git a/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow1.java b/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow1.java
@@ -60,6 +60,8 @@ public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) {
         
         flowBuilder.returnNode("taskFlowReturn1").
                 fromOutcome("#{flow1Bean.returnValue}");
+        flowBuilder.returnNode("goHome").
+                fromOutcome("#{flow1Bean.homeValue}");
         
         flowBuilder.inboundParameter("param1FromFlow2", "#{flowScope.param1Value}");
         flowBuilder.inboundParameter("param2FromFlow2", "#{flowScope.param2Value}");
diff --git a/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow1Bean.java b/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow1Bean.java
@@ -55,6 +55,10 @@ public String getName() {
     }
 
     public String getReturnValue() {
-        return "/return1";
+        return "/return";
     }
+
+    public String getHomeValue() {
+        return "/index";
+    }    
 }
diff --git a/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow2Bean.java b/samples/jsf/flow-multi/src/main/java/org/glassfish/flowmulti/Flow2Bean.java
@@ -55,6 +55,10 @@ public String getName() {
     }
 
     public String getReturnValue() {
-        return "/return1";
+        return "/return";
+    }
+
+    public String getHomeValue() {
+        return "/index";
     }
 }
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow1/flow1a.xhtml b/samples/jsf/flow-multi/src/main/webapp/flow1/flow1a.xhtml
@@ -57,7 +57,7 @@
 
             <p><h:commandButton id="start" value="back" action="flow1" /></p>
             <p><h:commandButton id="flow1b" value="next" action="flow1b" /></p>
-            <p><h:commandButton id="index" value="home" action="/index" /></p>
+            <p><h:commandButton id="index" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow1/flow1b.xhtml b/samples/jsf/flow-multi/src/main/webapp/flow1/flow1b.xhtml
@@ -59,7 +59,7 @@
             <p><h:commandButton id="back" value="back" action="flow1a" /></p>
             <p><h:commandButton id="return" value="return" action="taskFlowReturn1" /></p>
             <p><h:commandButton id="call2" value="Enter Flow2" action="call2" /></p>
-            <p><h:commandButton id="index" value="home" action="/index" /></p>
+            <p><h:commandButton id="index" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow2/flow2-flow.xml b/samples/jsf/flow-multi/src/main/webapp/flow2/flow2-flow.xml
@@ -51,6 +51,12 @@
         <flow-return id="taskFlowReturn1">
             <from-outcome>#{flow2Bean.returnValue}</from-outcome>
         </flow-return>
+        <flow-return id="nonFlow">
+            <from-outcome>/nonFlow</from-outcome>
+        </flow-return>
+        <flow-return id="goHome">
+            <from-outcome>#{flow2Bean.homeValue}</from-outcome>
+        </flow-return>
 
         <inbound-parameter>
             <name>param1FromFlow1</name>
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow2/flow2.xhtml b/samples/jsf/flow-multi/src/main/webapp/flow2/flow2.xhtml
@@ -56,9 +56,9 @@
             <p><span id="param1FromFlow2">Parameter 1 value from Flow 1: #{flowScope.param1Value}</span></p>
             <p><span id="param2FromFlow2">Parameter 2 value from Flow 1: #{flowScope.param2Value}</span></p>
 
-            <p><h:commandButton id="index" value="home" action="/index" /></p>
+            <p><h:commandButton id="home" value="home" action="goHome" /></p>
             <p><h:commandButton id="next" value="next" action="flow2a" /></p>
-            <p><h:commandButton id="nonFlow" value="nonFlow" action="/nonFlow" /></p>
+            <p><h:commandButton id="nonFlow" value="nonFlow" action="nonFlow" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow2/flow2a.xhtml b/samples/jsf/flow-multi/src/main/webapp/flow2/flow2a.xhtml
@@ -57,7 +57,7 @@
 
             <p><h:commandButton id="start" value="back" action="flow2" /></p>
             <p><h:commandButton id="next" value="next" action="flow2b" /></p>
-            <p><h:commandButton id="index" value="home" action="/index" /></p>
+            <p><h:commandButton id="home" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flow-multi/src/main/webapp/flow2/flow2b.xhtml b/samples/jsf/flow-multi/src/main/webapp/flow2/flow2b.xhtml
@@ -59,7 +59,7 @@
             <p><h:commandButton id="back" value="back" action="flow2a" /></p>
             <p><h:commandButton id="return" value="return" action="taskFlowReturn1" /></p>
             <p><h:commandButton id="call1" value="Enter Flow 1" action="callFlow1" /></p>
-            <p><h:commandButton id="index" value="home" action="/index" /></p>
+            <p><h:commandButton id="home" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flow-multi/src/main/webapp/index.xhtml b/samples/jsf/flow-multi/src/main/webapp/index.xhtml
@@ -43,8 +43,7 @@
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
+      xmlns:h="http://java.sun.com/jsf/html">
 
     <head>
         <title>Outside of flow</title>
@@ -53,13 +52,8 @@
         <h1>Outside of Flow</h1>
 
         <h:form prependId="false">
-            <p><h:commandButton id="start1" value="Enter Flow1" action="flow1">
-                    <f:attribute name="toFlowDocumentId" value=""/>
-                </h:commandButton></p>
-            <p><h:commandButton id="start2" value="Enter Flow2" action="flow2">
-                    <f:attribute name="toFlowDocumentId" value=""/>
-                </h:commandButton></p>
-            <p><h:commandButton id="stay" value="stay" /></p>
+            <p><h:commandButton id="start1" value="Enter Flow1" action="flow1"/></p>
+            <p><h:commandButton id="start2" value="Enter Flow2" action="flow2"/></p>
         </h:form>
     </body>
 </html>
diff --git a/samples/jsf/flow-multi/src/main/webapp/return.xhtml b/samples/jsf/flow-multi/src/main/webapp/return.xhtml

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ public String getName() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public String getReturnValue() {`
`58`		`- return "/return1";`
	`58`	`+ return "/return";`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ public String getHomeValue() {`
	`62`	`+ return "/index";`
	`63`	`+ }`
`60`	`64`	`}`