Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 Sun Aug 28 16:49:01 2005
@@ -2,25 +2,25 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
"http://forrest.apache.org/dtd/document-v20.dtd";>
 <document>
     <header>
-        <title>Beehive Page Flow Tutorial</title>
+        <title>Beehive NetUI Tutorial</title>
     </header>
     <body>
         <section id="intro">
             <title>Introduction</title>
-            <p>The Page Flow tutorial is provided as a way to become familiar 
with NetUI's Page Flow Controllers and JSP tags.  The tutorial 
-               walks through creating, building, and deploying a sample 
project  Page Flow that uses JavaBeans to submit data from a browser 
+            <p>The NetUI tutorial is provided as a way to become familiar with 
NetUI's Page Flow controllers and JSP tags.  The tutorial 
+               walks through creating, building, and deploying a sample 
project page flow that uses JavaBeans to submit data from a browser 
                to the server.</p>
             <section id="goals">
             <title>Tutorial Goals</title>
             <ul>
-                <li>How to create a basic Page Flow web application.</li>
+                <li>How to create a basic NetUI web application.</li>
                 <li>How to coordinate user navigation with Forward 
methods.</li>
                 <li>How to handle data submission and processing with data 
binding and Form Beans.</li>
                 <li>How to create a user interface with the &lt;netui> JSP tag 
library.</li>
-                <li>How Page Flows help to separate data processing and data 
presentation.</li>
+                <li>How page flows help to separate data processing and data 
presentation.</li>
                 <li>How to use declarative validation with data 
submission.</li>
-                <li>How to collect data from a nested Page Flow and 'return' 
it to the nesting Page Flow.</li>
-                <li>How to make an action available to multiple Page 
Flows.</li>
+                <li>How to collect data from a nested page flow and 'return' 
it to the nesting page flow.</li>
+                <li>How to make an action available to multiple page 
flows.</li>
             </ul>
             </section>
         </section>
@@ -34,7 +34,7 @@
                 <title>Create a Beehive-enabled Web Project</title>
                 <p>
                 In order to follow the steps in this tutorial, it's necessary 
to create a Beehive-enabled web application.  Beehive-enabled web applications
-                are described <a href="index.html">here</a>.  A skeleton 
Beehive-enabled web project is provided in the samples/ directory as 
+                are described <a href="site:setup">here</a>.  A skeleton 
Beehive-enabled web project is provided in the samples/ directory as 
                 <a href="site:netui-blank">netui-blank</a>.  This contains a 
basic Ant build file and an example Page Flow controller.  To create the
                 tutorial's project, we'll copy and then rename the <a 
href="site:netui-blank">netui-blank</a> project using these steps:
                 </p>
@@ -110,7 +110,7 @@
             <section id="setup_urls">
                 <title>Using URLs in the Examples</title>
                 <p>
-                In the Beehive tutorials, you will often encounter URLs like 
<code>http://localhost:8080/pageflow_tutorial/begin.do</code>.
+                In the Beehive tutorials, you will often encounter URLs like 
<code>http://localhost:8080/pageflow_tutorial/Controller.jpf</code>.
                 When you see these URLs, they are meant to be accessed via 
your web browser to demonstrate functionality built in the 
                 tutorial.  These URLs are setup to run on Tomcat, so if you 
are unable to run these URLs, be sure that they are appropriate 
                 for your application server.  Specifically, check the port 
numbers to make sure that your server is running on the 
@@ -123,32 +123,32 @@
             <section id="create_overview">
                 <title>Overview</title>
                 <p>
-            In this step you will create a Controller file and a JSP page.  
These are the basic files in 
-            a Beehive Page Flow web application.  Each Page Flow contains one 
Controller file and any 
-            number of JSP pages. A Controller file is a Java class that 
+            In this step you will create a controller class and a JSP.  These 
are the basic files in 
+            a Beehive NetUI web application.  Each page flow contains one 
controller class and any 
+            number of JSPs. A controller class is a Java class that 
             controls how your web application functions and what it does. The 
methods in the 
             Controller 
             file determine all of the major features of a web application: how 
users navigate from page 
             to page, how user requests are handled, and how the web 
application accesses back-end 
-            resources. The JSP pages determine what a visitor to the web sees 
in the browser.  
+            resources. The JSPs determine what a visitor to the web sees in 
the browser.  
                 </p>
                 <p>
             In terms of the Model-View-Controller paradigm for web 
applications, the Controller.java
-            file is the Controller (naturally) and the JSP pages are the View. 
 The web application's
+            file is the Controller (naturally) and the JSPs are the View.  The 
web application's
             Model in this tutorial is very simple: it consists of three fields 
that represent the
             user's name, age and selected sport activity.
                 <!--[tbd: more, explain]-->
                 </p>
                 <p>    
-                Controller files contain Action methods. An Action method may 
do something simple, such 
-                as forward a user from one JSP page to another; or it may do a 
complex set of tasks, such 
-                as receive user input from a JSP page, calculate and/or 
retrieve other data based on the 
-                user input, and forward the user to a JSP page where the 
results are displayed. 
+                controller classs contain Action methods. An Action method may 
do something simple, such 
+                as forward a user from one JSP to another; or it may do a 
complex set of tasks, such 
+                as receive user input from a JSP, calculate and/or retrieve 
other data based on the 
+                user input, and forward the user to a JSP where the results 
are displayed. 
                     <!--[tbd: diagram, etc.]-->
                 </p>
                 <p>
-                The Controller file in this step contains one simple Action 
method. This
-                simple navigational Action method forwards users to the 
index.jsp page. In the next 
+                The controller class in this step contains one simple Action 
method. This
+                simple navigational Action method forwards users to the 
<code>index.jsp</code> page. In the next 
                 step, you will create a more complex Action method.
                 </p>
             </section>
@@ -158,16 +158,16 @@
                     to learn about the code you are about to run.</p>
                 <p>Open the file 
<code>pageflow_tutorial/Controller.java</code>. 
                     </p>
-                <p>The Controller file is an ordinary Java class with methods 
and annotations.</p>
+                <p>The controller class is an ordinary Java class with methods 
and annotations.</p>
                 <p>A Page Flow controller class must extend 
                     
<code>org.apache.beehive.netui.pageflow.PageFlowController</code> and be 
decorated by the
                     annotation <code>@Jpf.Controller</code>.</p>
                 <p>The <code>onCreate()</code> method is executed whenever the 
Controller class is first 
                     instantiated.  The <code>onDestroy()</code> method is 
executed when the Controller 
                     class is destroyed.</p>
-                <p>After the <code>onCreate()</code> method is run, the Page 
Flow runtime
+                <p>After the <code>onCreate()</code> method is run, the NetUI 
runtime
                     searches for (and runs) a method or action named 
<code>begin</code>.
-                    In this Controller file, there is a simple action named 
<code>begin</code>:
+                    In this controller class, there is a simple action named 
<code>begin</code>:
                     </p>
                 <source>@Jpf.SimpleAction(name="begin", 
path="index.jsp")</source>
                 <p>The begin action <em>could</em> have been expressed using 
method syntax: </p>
@@ -183,7 +183,7 @@
 </source>
                 <p>We have used the Simple Action syntax for the sake of 
syntactical simplicity.  The Simple Action will forward the user to the JSP, 
index.jsp.</p>
                 <p>The Controller class is instantiated when a user calls it 
via the URL:</p>
-                
<source>http://localhost:8080/pageflow_tutorial/begin.do</source>
+                
<source>http://localhost:8080/pageflow_tutorial/Controller.jpf</source>
                 <p>The URL above means this: "Run the <code>begin</code> 
action of the <code>Controller.java</code> class 
                    in the directory <code>pageflow_tutorial</code>."</p>
                 <p><strong><code>Controller.java</code></strong></p> 
@@ -236,7 +236,7 @@
             </section>
             <section id="create_build_deploy">
                 <title>Compile and Deploy the Web Application</title>
-                <p>You are now ready to compile the Page Flow and deploy it to 
Tomcat.</p>
+                <p>You are now ready to compile the page flow and deploy it to 
Tomcat.</p>
                 <p>The following Ant command assumes that you are in the 
<code>pageflow_tutorial/WEB-INF/src</code> 
                    directory.  At the command prompt, enter:</p>
                 <source>
@@ -259,16 +259,16 @@
                 <p>If you are not using Tomcat, follow your server's web 
application deployment instructions to deploy the webapp.</p>
 </section>
             <section id="create_test">
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following address:</p> 
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
                 <p>You will be directed to the <code>index.jsp</code> page.</p>
             </section>
         </section>
         <section id="navigate">
             <title>Step 3: Navigation</title>
             <section id="navigate_create_page">
-                <title>Create a Destination JSP Page</title>
+                <title>Create a Destination JSP</title>
                 <p>In the directory <code>pageflow_tutorial</code>, create a 
file named <code>page2.jsp</code>.</p>
                 <p>Edit page2.jsp so it appears as follows.</p>
                 <p><strong><code>page2.jsp</code></strong></p>                
@@ -291,7 +291,7 @@
             </section>
             <section id="navigate_create_link"> 
                 <title>Create a Link to the Destination Page</title>
-                <p>In this step you will create a link from the JSP, 
<code>index.jsp</code> to a new Simple Action that you will add to the 
Controller file.</p>
+                <p>In this step you will create a link from the JSP, 
<code>index.jsp</code> to a new Simple Action that you will add to the 
controller class.</p>
                 <p>Open the file <code>pageflow_tutorial/index.jsp</code>.</p>
                 <p>Edit <code>index.jsp</code> so it appears as follows.  The 
code to add appears in bold type.</p>
         <p><strong><code>index.jsp</code></strong></p>
@@ -349,16 +349,16 @@
             </section>
             <section id="navigate_build_deploy">
                 <title>Compile and Redeploy the Web Application</title>
-<p>Compile and deploy the Page Flow using the same Ant and copy commands used 
in <a href="#create_build_deploy">step 2</a>.</p>
+<p>Compile and deploy the page flow using the same Ant and copy commands used 
in <a href="#create_build_deploy">step 2</a>.</p>
 <p>If you are asked to overwrite the old WAR file, enter 'Yes'.</p>
 <p>Wait a few seconds for Tomcat to redeploy the WAR file, then move on to the 
next step.</p>
             </section>
             <section id="navigate_run">
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following link: 
                 </p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
             </section>
@@ -368,7 +368,7 @@
             <section id="forms_create">
                 <title>Create a Submission Form</title>
                 <p>This step illustrates the use of custom tags to render an 
HTML form tag and link it to an Action.
-                    In a later step, the new Action will be added to the 
Controller file to handle the data submission.</p>
+                    In a later step, the new Action will be added to the 
controller class to handle the data submission.</p>
                 <p>Edit the file <code>pageflow_tutorial/page2.jsp</code> so 
it appears as follows.</p>
                 <p><strong><code>page2.jsp</code></strong></p>                
                 <source><![CDATA[
@@ -434,7 +434,7 @@
 <p>Save and close <code>ProfileForm.java</code>.</p>
             </section>
             <section id="forms_edit_controller">
-                <title>Edit the Controller File to Handle the Submitted 
Data</title>
+                <title>Edit the Controller Class to Handle the Submitted 
Data</title>
                 <p>Now you will add a new Action and use your new Form Bean to 
handle the data
                 submitted from the HTML form.</p>
                 <p>Open the file <code>pageflow_tutorial/Controller.java</code>
@@ -485,11 +485,11 @@
                 <p>Compile and (re)deploy the web application using the same 
steps as described <a href="#create_build_deploy">here</a>.</p>
            </section>
            <section id="forms_test">
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following link: 
                 </p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
                 <p>Enter values in the Name and Age fields, and click 
Submit.</p>
@@ -499,7 +499,7 @@
         <section id="forms_display_data">
             <title>Step 5: Processing and Displaying Data</title>
             <section id="create_jsp">
-                <title>Create a JSP Page to Display Submitted Data</title>
+                <title>Create a JSP to Display Submitted Data</title>
                 <p>In this step you will create a new JSP to present the 
results from processing the data submission.</p>
                 <p>In the directory <code>pageflow_tutorial</code> create a 
file named 
                     <strong><code>displayData.jsp</code></strong>. </p>
@@ -557,21 +557,21 @@
                 <p>Compile and (re)deploy the web application using the same 
steps as described <a href="#create_build_deploy">here</a>.</p>
             </section>
             <section>
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following link: 
                 </p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
                 <p>Enter values in the Name and Age fields. Click the Submit 
button.</p>
-                <p>You will be forwarded to the displayData.jsp page.  Notice 
the values you entered are displayed.</p>
+                <p>You will be forwarded to the <code>displayData.jsp</code> 
page.  Notice the values you entered are displayed.</p>
             </section>
         </section>
         <section id="validation">
             <title>Step 6: Input Validation</title>
             <section id="validation_add">
-                <title>To Add Declarative Validation to the Page Flow</title>
+                <title>Add Declarative Validation to the Page Flow</title>
                 <p>In this step you will use declarative validation to define 
the set of rules for each
                     field, to be applied during input validation. Add a 
<code>ValidatableProperty</code>
                     for the name field of the form so that it will (1) be a 
required field and 
@@ -654,14 +654,14 @@
                 <p>Compile and (re)deploy the web application using the same 
steps as described <a href="#create_build_deploy">here</a>.</p>
             </section>
             <section id="validation_run">
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following link:</p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
                 <p>Leave the Name field empty and enter a negative integer 
value in the Age field. Click the Submit button.</p>
-                <p>You will be returned to the page2.jsp page.  Notice the 
error messages for the values you entered.</p>
+                <p>You will be returned to the <code>page2.jsp</code> page.  
Notice the error messages for the values you entered.</p>
             </section>
         </section>
         <section id="nested">
@@ -669,7 +669,7 @@
             <section id="nested_link">
                 <title>Link to the Nested Page Flow</title>
                 <p>Modify the HTML form tag to add a new data field and a 
button and link it to an
-                    Action in the nested Page Flow. In a later step, the new 
nested Controller file
+                    Action in the nested page flow. In a later step, the new 
nested controller class
                     will be created to handle the data collection.</p>
                 <p>Edit the file <code>pageflow_tutorial/page2.jsp</code> so it
                     appears as follows. Code to add appears in bold.</p>
@@ -708,7 +708,7 @@
             <section id="validation_update_formbean">
                 <title>Update the Form Bean</title>
                 <p>In this step you will update the Java class that represents 
the submission form with the
-                    additional data field created in the previous task.  When 
the nested Page Flow returns,
+                    additional data field created in the previous task.  When 
the nested page flow returns,
                     the new member of the Form Bean class instance can be 
loaded with the value collected.</p>
                 <p>Edit 
<code>pageflow_tutorial/WEB-INF/src/forms/ProfileForm.java</code>
                     and add the following member variable and methods.</p>
@@ -732,13 +732,13 @@
             </section>
             <section id="validation_update_controller">
                 <title>To Launch and Return from the Nested Page Flow</title>
-                <p>Add Action methods to handle forwarding to the nested Page 
Flow and another to
-                    implement the return Action when the nested Page Flow 
completes.</p>
+                <p>Add Action methods to handle forwarding to the nested page 
flow and another to
+                    implement the return Action when the nested page flow 
completes.</p>
                 <p>Open the file 
<code>pageflow_tutorial/Controller.java</code></p>
                 <p>Edit <code>Controller.java</code> so it appears as follows. 
 Code to add appears
                     in bold type. Don't forget to add the 
<code>useFormBean</code> property to the
                     <code>@Jpf.Action</code> annotation of the 
<code>processData</code> method. The
-                    ProfileForm is Page Flow scoped for this example, using 
the same Form Bean
+                    ProfileForm is page flow-scoped for this example, using 
the same Form Bean
                     instance in multiple Action methods.</p>
                 <p><strong><code>Controller.java</code></strong></p>
                 <source>
@@ -767,16 +767,16 @@
     <strong>private ProfileForm profileForm;
 
     /**
-     * This action forwards to the nested Page Flow to collect the sport
+     * This action forwards to the nested page flow to collect the sport
      * name.  Note that it takes a ProfileForm so we can update the form
-     * with the sport name returned from the nested Page Flow, but we've
+     * with the sport name returned from the nested page flow, but we've
      * explicitly turned validation off for this action, since the form
      * may be incomplete.
      */
     @Jpf.Action(
         useFormBean="profileForm",
         forwards={
-            @Jpf.Forward(name="getSportFlow", path="sports/begin.do")
+            @Jpf.Forward(name="getSportFlow", 
path="sports/SportsController.jpf")
         },
         doValidation=false
     )
@@ -785,15 +785,12 @@
     }
 
     /**
-     * This action takes the sport name returned from the nested Page Flow
+     * This action takes the sport name returned from the nested page flow
      * and updates the field in the form and returns to the original page.
      */
     @Jpf.Action(
         forwards={
-            @Jpf.Forward(
-                name="success",
-                navigateTo=Jpf.NavigateTo.currentPage
-            )
+            @Jpf.Forward(name="success", navigateTo=Jpf.NavigateTo.currentPage)
         }
     )
     protected Forward sportSelected(String sport) {
@@ -834,12 +831,12 @@
             </section>
             <section id="validation_create_nested">
                 <title>Create a Nested Page Flow</title>
-                <p>In this step you will create a nested Page Flow with 
actions to select and confirm
-                    the data to return to the main or nesting Page Flow. The 
new nested Controller file
+                <p>In this step you will create a nested page flow with 
actions to select and confirm
+                    the data to return to the main ("nesting") page flow. The 
new nested controller class
                     contains an inner Form Bean classs for the data 
collection. It has only a single
                     field for the user's choice of sport activity. The options 
to be displayed are
-                    declared as member data of this nested Page Flow. After 
the user confirms the
-                    data, the nested Page Flow returns a <code>String</code> 
to the main Page Flow.</p>
+                    declared as member data of this nested page flow. After 
the user confirms the
+                    data, the nested page flow returns a <code>String</code> 
to the main page flow.</p>
                 <p>In the directory <code>pageflow_tutorial/</code> create a 
directory
                     named <strong><code>sports</code></strong>.</p>
                 <p>In the directory <code>pageflow_tutorial/sports</code> 
create a JAVA
@@ -918,7 +915,7 @@
             <section id="validation_collect_data">
                 <title>To Present and Collect Data using a Form</title>
                 <p>This step illustrates the use of custom tags to render a 
radio button group in an HTML form and 
-                   link it to the nested Page Flow <code>selectSport</code> 
Action method.</p>
+                   link it to the nested page flow <code>selectSport</code> 
Action method.</p>
                 <p>In the directory <code>pageflow_tutorial/sports</code>, 
create a file named <code>index.jsp</code>.</p>
                 <p>Edit index.jsp so it appears as follows.</p>
                 <p><strong><code>index.jsp</code></strong></p>
@@ -987,25 +984,25 @@
                 <p>Compile and (re)deploy the web application using the same 
steps as described <a href="#create_build_deploy">here</a>.</p>
             </section>
             <section id="validation_run_again">
-                <title>To Test the Page Flow Web Application</title>
+                <title>To Test the NetUI Web Application</title>
                 <p>Visit the following link:</p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
                 <p>Click the "Select Sport" button.</p>
-                <p>You will be directed to sports/index.jsp in the nested Page 
Flow.</p>
+                <p>You will be directed to sports/index.jsp in the nested page 
flow.</p>
                 <p>Click a radio button and then the Submit button.</p>
-                <p>You will be directed to sports/confirm.jsp in the nested 
Page Flow.</p>
+                <p>You will be directed to sports/confirm.jsp in the nested 
page flow.</p>
                 <p>Click the Confirm button.</p>
-                <p>You will be returned to the page2.jsp page. Notice that the 
value you selected is
+                <p>You will be returned to the page2<code>.jsp</code> page. 
Notice that the value you selected is
                    displayed in the Sport field.</p>
             </section>
         </section>
         <section id="sharedflow">
             <title>Step 8: Adding Actions to a Shared Flow</title>
             <section id="sharedflow_page">
-                <title>To Create a Common Destination JSP Page</title>
+                <title>To Create a Common Destination JSP</title>
                 <p>In the directory <code>pageflow_tutorial</code>, create a
                     file named <code>help.jsp</code>.</p>
                 <p>Edit help.jsp so it appears as follows.</p>
@@ -1030,7 +1027,7 @@
             <section id="sharedflow_action">
                 <title>To Make an Action available to multiple Page 
Flows</title>
                 <p>In this step you will add a Simple Action to the existing 
Shared Flow.  The Action forwards to the 
-                    help page created in the previous step and will be 
available to multiple Page Flows in the application.</p>
+                    help page created in the previous step and will be 
available to multiple page flows in the application.</p>
                 <p>Open the existing Shared Flow file 
<code>pageflow_tutorial/WEB-INF/src/shared/SharedFlow.java</code></p>
                 <p>Edit the <code>@Jpf.Controller</code> annotation for the 
Shared Flow controller class, <code>SharedFlow</code>, in the 
<code>SharedFlow.java</code> file and add the <code>simpleActions</code> 
property. Code to add appears in bold. Don't forget the comma after the 
<code>catches={...}</code> element!</p>
                 <p><strong><code>SharedFlow.java</code></strong></p>
@@ -1092,12 +1089,12 @@
                 <p>Compile and (re)deploy the web application using the same 
steps as described <a href="#create_build_deploy">here</a>.</p>
             </section>
             <section id="sharedflow_run">
-                <title>Test the Page Flow Web Application</title>
+                <title>Test the NetUI Web Application</title>
                 <p>Visit the following link:</p>
-                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/begin.do";>http://localhost:8080/pageflow_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
+                <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial/Controller.jpf";>http://localhost:8080/pageflow_tutorial/Controller.jpf</a></p>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
                 <p>Click the help link.</p>
-                <p>A popup window with the help.jsp page will be displayed.</p>
+                <p>A popup window with the <code>help.jsp</code> page will be 
displayed.</p>
             </section>
         </section>
     </body>

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/validation.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/validation.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/validation.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/validation.xml
 Sun Aug 28 16:49:01 2005
@@ -8,8 +8,8 @@
                <section id="introduction">
                        <title>Introduction</title>
                </section>
-               <p>Page Flows offer a declarative validation model.  This means 
that validation tasks are
-                       configured using metadata annotations.  
+               <p>NetUI offers a declarative validation model.  This means 
that validation tasks are
+                       configured using metadata annotations within Page Flow 
controller classes.  
                        Annotations for common validation tasks are already 
provided: e.g., 
                        <a 
href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">@Jpf.ValidateCreditCard</a>,
 
                                <a 
href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">@Jpf.ValidateDate</a>,
 etc.</p>
@@ -233,7 +233,7 @@
                 )</source>
                </section>
                <section id="post_error_nav"><title>Post-Error 
Navigation</title>
-               <p>The action method handling the submit, specifies the JSP 
page to go to, if the validation
+               <p>The action method handling the submit, specifies the JSP to 
go to, if the validation
                        fails.</p>
            <p>Typically, the user is returned to the same submission page, 
where the error message
                        can prompt the user to correct the invalid 
submission.</p>

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
 Sun Aug 28 16:49:01 2005
@@ -15,7 +15,7 @@
                 <a href="site:samples/petstore">Petstore</a>
             </li>
             <li>
-                <a href="site:netui-jsf">Page Flow: JSF Integration</a>
+                <a href="site:netui-jsf">NetUI: JSF Integration</a>
             </li>
             <li>
                 <a href="site:address-enhanced">Web Service: AddressBook 
Enhanced</a>
@@ -29,7 +29,7 @@
         </p>
         <ul>
             <li>
-                <a href="site:netui-blank">Project: Page Flow</a>
+                <a href="site:netui-blank">Project: NetUI</a>
             </li>
             <li>
                 <a href="site:control-blank">Project: Control</a>

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml
 Sun Aug 28 16:49:01 2005
@@ -9,17 +9,17 @@
         <section id="intro">
             <title>Introduction</title>
             <p>The Petstore sample demonstrates how to integrate all three 
-                Beehive technologies (Page Flows, Controls and Web Services) 
in 
+                Beehive technologies (NetUI, Controls and Web Services) in 
                 one application.</p>
-            <p>The Page Flows provide customers with web access to the 
-                Petstore. There are separate Page Flows for different customer 
-                activities: the 'shop' Page Flow (located at: 
+            <p>NetUI provides customers with web access to the 
+                Petstore. There are separate page flows for different customer 
+                activities: the 'shop' page flow (located at: 
                 <code>petstoreWeb/web/shop/</code>) lets users browse the 
catalog 
-                of pets, the 'checkout' Page Flow (petstoreWeb/web/checkout) 
lets 
+                of pets, the 'checkout' page flow (petstoreWeb/web/checkout) 
lets 
                 users purchase selected items from a shopping cart, etc.</p>
             <p>A web service (located at 
<code>petstoreWeb/ws/PestoreInventoryManager.java</code>) 
                 provides store managers access to the inventory.</p>
-            <p>Most of the Page Flows have associated Control files (located 
+            <p>Most of the page flows have associated Control files (located 
                 at: 
                 
<code>petstoreWeb/src/org/apache/beehive/samples/petstore/controls/</code>). 
                 The Controls handle the backend data traffic and encapsulate 
@@ -94,29 +94,29 @@
                 </tr>
                 <tr>
                     <td>&nbsp;&nbsp;&nbsp;&nbsp;web</td>
-                    <td>Contains the Page Flow web application modules.</td>
+                    <td>Contains the NetUI web application modules.</td>
                 </tr>
                 <tr>
                     
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;account</td>
-                    <td>Page Flow user interface for managing user 
accounts</td>
+                    <td>NetUI user interface for managing user accounts</td>
                 </tr>
                 <tr>
                     
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auth</td>
-                    <td>Page Flow user interface for managing login</td>
+                    <td>NetUI user interface for managing login</td>
                 </tr>
                 <tr>
                     
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;checkout</td>
-                    <td>Page Flow user interface for managing the shopping 
+                    <td>NetUI user interface for managing the shopping 
                         cart</td>
                 </tr>
                 <tr>
                     
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;search</td>
-                    <td>Page Flow user interface for searching the 
+                    <td>NetUI user interface for searching the 
                         Petstore</td>
                 </tr>
                 <tr>
                     
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;shop</td>
-                    <td>Page Flow user interface for browsing the catalogue of 
+                    <td>NetUI user interface for browsing the catalogue of 
                         pets</td>
                 </tr>
                 <tr>

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml 
(original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml 
Sun Aug 28 16:49:01 2005
@@ -4,7 +4,7 @@
         <setup label="Setup" href="setup.html"/>
         <tutorials label="Tutorials">
             <tutorial_setup label="Setup" href="tutorial/setup.html"/>
-            <tutorial_pageflow label="Page Flows" 
href="pageflow/tutorial_pageflow.html"/>
+            <tutorial_pageflow label="NetUI" 
href="pageflow/tutorial_pageflow.html"/>
             <tutorial_control label="Controls" 
href="controls/tutorial_controls.html"/>
             <tutorial_system-controls label="System Controls">
                 <control label="EJB Control" 
href="system-controls/ejb/ejbControlTutorial.html"/>
@@ -12,19 +12,19 @@
                 <control label="JMS Control" 
href="system-controls/jms/jmsControlTutorial.html"/>
             </tutorial_system-controls>
         </tutorials>
-        <pageflow label="Page Flow">        
+        <pageflow label="NetUI">        
             <pageflow_getting_started label="Getting Started" 
href="pageflow/getting_started.html"/>
-            <pageflow_overview label="Overview" 
href="pageflow/pageflow_overview.html"/>
+            <pageflow_overview label="Overview" href="pageflow/overview.html"/>
             <projects label="Project Model" href="pageflow/projects.html"/>
-            <pageflow_controllers label="Controller Files" 
href="pageflow/pageflow_controllers.html"/>
+            <pageflow_controllers label="Controller Classes" 
href="pageflow/pageFlowControllers.html"/>
             <pageflow_jsp label="JSP Files" href="pageflow/jspOverview.html">
                 <pageflow_jspOverview_SimpleLinking href="#SimpleLinking" />
                 <pageflow_jspOverview_StartingJSP href="#StartingJSP" />
             </pageflow_jsp>
-            <pageflow_altering label="Altering a Page Flow" 
href="pageflow/pageflow_altering.html"/>
+            <pageflow_altering label="Altering a Page Flow" 
href="pageflow/alteringPageFlow.html"/>
             <databinding label="Databinding" href="pageflow/databinding.html"/>
             <pageflow_advanced label="Advanced">
-                <pageflow_inheritance label="Inheritance" 
href="pageflow/pageflow_inheritance.html"/>
+                <pageflow_inheritance label="Inheritance" 
href="pageflow/pageFlowInheritance.html"/>
                 <pageflow_sharedFlow label="Shared Flow" 
href="pageflow/sharedFlow.html"/>
                 <pageflow_popups label="Popup Windows" 
href="pageflow/popupWindows.html"/>
                 <pageflow_servlet_adapter label="Servlet Container Adapters" 
href="pageflow/servlet_container_adapters.html"/>
@@ -77,11 +77,11 @@
         <samples label="Samples">
             <sam_index label="Overview" href="samples/index.html"/>
             <petstore label="Petstore" href="samples/petstore.html"/>
-            <netui-samples label="Page Flow Samples" 
href="pageflow/netui-samples.html"/>
-            <netui-jsf label="Page Flow: JSF Integration" 
href="pageflow/sample_jpf_jsf_integration.html"/>
+            <netui-samples label="NetUI Samples" 
href="pageflow/netui-samples.html"/>
+            <netui-jsf label="NetUI: JSF Integration" 
href="pageflow/sample_jpf_jsf_integration.html"/>
             <address-enhanced label="Web Service: AddressBook Enhanced" 
href="wsm/sample_AddressBookEnhanced.html"/>
             <address-wsdl label="Web Service: AddressBook from WSDL" 
href="wsm/sample_AddressBookFromWSDL.html"/>
-            <netui-blank label="Project: Page Flow" 
href="pageflow/sample_netui-blank.html"/>
+            <netui-blank label="Project: NetUI" 
href="pageflow/sample_netui-blank.html"/>
             <control-blank label="Project: Control" 
href="controls/sampleControlsBlank.html"/>
             <wsm-blank label="Project: Web Service" 
href="wsm/sample_wsm-blank.html"/>
             <ws-control-blank label="Project: Web Service Control" 
href="system-controls/webservices/sample-ws-control-blank.html" />
@@ -96,8 +96,8 @@
                 <annotations label="Annotations" 
href="controls/annotations/control_annotations.html"/>
                 <javadoc label="API Javadoc" 
href="apidocs/classref_controls/index.html"/>
             </controls>
-            <netui label="Page Flows">
-                <annotations label="Annotations" 
href="pageflow/jpf-annotations/pageflow_annotations.html"/>
+            <netui label="NetUI">
+                <annotations label="Page Flow Annotations" 
href="pageflow/jpf-annotations/pageflow_annotations.html"/>
                 <javadoc label="API Javadoc" 
href="apidocs/classref_pageflows/index.html"/>
                 <taglib label="JSP Tags" href="apidocs/taglib/index.html"/>
                 <config label="beehive-netui-config.xml" 
href="pageflow/config/beehive-netui-config.html">
@@ -129,7 +129,7 @@
             </system-controls>
             <javadoc label="API Javadoc">
                 <controls label="Controls" 
href="apidocs/classref_controls/index.html"/>
-                <netui label="Page Flow" 
href="apidocs/classref_pageflows/index.html"/>
+                <netui label="NetUI" 
href="apidocs/classref_pageflows/index.html"/>
                 <wsm label="Web Services" 
href="apidocs/classref_wsm/index.html"/>
                 <system-controls label="System Controls" 
href="apidocs/classref_systemcontrols/index.html"/>
             </javadoc>

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
 Sun Aug 28 16:49:01 2005
@@ -775,20 +775,20 @@
                                 via the Iterator's next() method, and it 
transparently makes repeated requests from the database 
                                 until all records have been processed. An 
Iterator does not present the risk of running out of 
                                 memory that an array presents. However, note 
that an Iterator returned from a database control 
-                                cannot be used within a Page Flow file (JPF), 
because an Iterator wraps a ResultSet object, 
-                                which is always closed by the time it is 
passed to the web-tier (where page flow files reside). 
+                                cannot be used within a Page Flow controller 
class, because an Iterator wraps a ResultSet object, 
+                                which is always closed by the time it is 
passed to the web-tier (where Page Flow files reside). 
                                 For this reason, your Jdbc control should 
return an array of objects (see above) when it is called 
-                                from a Page Flow file. Also, an Iterator 
cannot be returned to a stateful process, because 
+                                from a page flow controller. Also, an Iterator 
cannot be returned to a stateful process, because 
                                 stateful processes cannot maintain an open 
database connection (which Iterators require). To 
                                 learn about returning a java.util.Iterator, 
see the Returning an Iterator section, below.</p>
 
                         <p>Finally, you can choose to return a 
java.sql.ResultSet from a Jdbc control method. This grants 
                                 complete access to the results of the database 
operation to clients of your control, but it 
                                 requires knowledge of the java.sql package. 
Also, note that a ResultSet returned from a 
-                                Jdbc control cannot be used within a page flow 
file (JPF), because a ResultSet object is 
-                                always closed by the time it is passed to the 
web-tier (where page flow files reside). For 
+                                Jdbc control cannot be used within a Page Flow 
controller, because a ResultSet object is 
+                                always closed by the time it is passed to the 
web-tier (where Page Flow files reside). For 
                                 this reason, your Jdbc control should provide 
an array of objects when it is called from a 
-                                page flow file. To learn about returning a 
java.sql.ResultSet, see the Returning a Resultset 
+                                Page Flow controller. To learn about returning 
a java.sql.ResultSet, see the Returning a Resultset 
                                 section, below.</p>
                 </section>
       

Modified: 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/tutorial_wsm.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 (original)
+++ 
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 Sun Aug 28 16:49:01 2005
@@ -143,7 +143,7 @@
        
             <section id="run_2">
                 <title>To Run the Web Service</title>
-                <p>Visit the index.jsp page: <a class="fork"  
href="http://localhost:8080/tutorialWS/index.html";>http://localhost:8080/tutorialWS/index.html</a>.</p>
+                <p>Visit the <code>index.jsp</code> page: <a class="fork"  
href="http://localhost:8080/tutorialWS/index.html";>http://localhost:8080/tutorialWS/index.html</a>.</p>
                 <p>Click the "Validate" link for an evaluation of the 
resources available to your web service.  Note that you will need to download 
additional resources to take full advantage of Beehive web services.  For 
example, for Axis to work properly with SOAP attachments, additional, external 
jars (activation.jar and mailapi.jar) are required.  You will download those 
resources in later steps in the tutorial.</p>
                 <p>Click the "WSDL" link to see the web service's WSDL. </p>
                 <p>Click the "sayHelloWorld()" link to see a SOAP response 
from the web service's sayHelloWorld() method.</p>


Reply via email to