All buttons are now working

Arun Gupta · Arun Gupta · commit b9e4790728d3 · 2013-04-25T23:40:47.000+04:00
Former-commit-id: c5fad05dc95647e268147ddd9ed1135040f7848f
diff --git a/samples/jsf/flows-declarative/src/main/webapp/flow1/flow1-flow.xml b/samples/jsf/flows-declarative/src/main/webapp/flow1/flow1-flow.xml
@@ -51,6 +51,9 @@
         <flow-return id="taskFlowReturn1">
             <from-outcome>#{flow1Bean.returnValue}</from-outcome>
         </flow-return>
+        <flow-return id="goHome">
+            <from-outcome>#{flow1Bean.homeValue}</from-outcome>
+        </flow-return>
 
         <inbound-parameter>
             <name>param1FromFlow1</name>
diff --git a/samples/jsf/flows-declarative/src/main/webapp/flow1/flow1b.xhtml b/samples/jsf/flows-declarative/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="callFlow2" /></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/flows-declarative/src/main/webapp/flow2/flow2-flow.xml b/samples/jsf/flows-declarative/src/main/webapp/flow2/flow2-flow.xml
@@ -51,6 +51,9 @@
         <flow-return id="taskFlowReturn1">
             <from-outcome>#{flow2Bean.returnValue}</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/flows-declarative/src/main/webapp/flow2/flow2.xhtml b/samples/jsf/flows-declarative/src/main/webapp/flow2/flow2.xhtml
@@ -56,7 +56,7 @@
             <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="index" 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>
 
diff --git a/samples/jsf/flows-declarative/src/main/webapp/flow2/flow2a.xhtml b/samples/jsf/flows-declarative/src/main/webapp/flow2/flow2a.xhtml
@@ -55,9 +55,10 @@
 
             <p>value: <h:inputText id="input" value="#{flowScope.value}" /></p>
 
-            <p><h:commandButton id="start" value="back" action="flow2" /></p>
+            <p><h:commandButton id="start" value="start" action="flow2" /></p>
+            <p><h:commandButton id="back" 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="index" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flows-declarative/src/main/webapp/flow2/flow2b.xhtml b/samples/jsf/flows-declarative/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="index" value="home" action="goHome" /></p>
 
         </h:form>
     </body>
diff --git a/samples/jsf/flows-declarative/src/main/webapp/return.xhtml b/samples/jsf/flows-declarative/src/main/webapp/return.xhtml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!-- 
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+*
+* The contents of this file are subject to the terms of either the GNU
+* General Public License Version 2 only ("GPL") or the Common Development
+* and Distribution License("CDDL") (collectively, the "License").  You
+* may not use this file except in compliance with the License.  You can
+* obtain a copy of the License at
+* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+* or packager/legal/LICENSE.txt.  See the License for the specific
+* language governing permissions and limitations under the License.
+*
+* When distributing the software, include this License Header Notice in each
+* file and include the License file at packager/legal/LICENSE.txt.
+*
+* GPL Classpath Exception:
+* Oracle designates this particular file as subject to the "Classpath"
+* exception as provided by Oracle in the GPL Version 2 section of the License
+* file that accompanied this code.
+*
+* Modifications:
+* If applicable, add the following below the License Header, with the fields
+* enclosed by brackets [] replaced by your own identifying information:
+* "Portions Copyright [year] [name of copyright owner]"
+*
+* Contributor(s):
+* If you wish your version of this file to be governed by only the CDDL or
+* only the GPL Version 2, indicate your decision by adding "[Contributor]
+* elects to include this software in this distribution under the [CDDL or GPL
+* Version 2] license."  If you don't indicate a single choice of license, a
+* recipient has the option to distribute your version of this file under
+* either the CDDL, the GPL Version 2 or to extend the choice of license to
+* its licensees as provided above.  However, if you add GPL Version 2 code
+* and therefore, elected the GPL Version 2 license, then the option applies
+* only if the new code is made subject to such option by the copyright
+* holder.
+*/
+-->
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html">
+    <head>
+        <title>Page navigated to upon return from any flow</title>
+    </head>
+    <body>
+        <h1>Page navigated to upon return from any flow</h1>
+        
+    <h:form prependId="false">
+        <p>Has a flow: #{null != facesContext.application.flowHandler.currentFlow}.</p>
+        
+        <p>flowScope value (should be empty): #{flowScope.value}.</p>
+
+        <p><h:commandButton id="index" value="home" action="/index" /></p>
+        
+    </h:form>
+</body>
+</html>
