You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/08/29 01:49:30 UTC

svn commit: r263967 [1/3] - in /beehive/trunk/docs/forrest/release/src/documentation/content/xdocs: ./ beehive/ controls/ infra/ pageflow/ pageflow/config/ pageflow/jpf-annotations/ samples/ system-controls/jdbc/ wsm/

Author: rich
Date: Sun Aug 28 16:49:01 2005
New Revision: 263967

URL: http://svn.apache.org/viewcvs?rev=263967&view=rev
Log:
- First crack at terminology updates:
    * Most significantly, "Page Flow" -> "NetUI" in many cases
    * "controller file" -> "controller class"
    * "JSP page" -> "JSP"
    * "JPF" -> "Page Flow"
- Rewrite of the NetUI Overview.
- Delete unused pageflow/index.html and controls/index.html (the latter was a copy of the former -- proving no one ever saw it :) ).
- Other edits throughout.

tests: build.release in docs/forrest (WinXP)


Added:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/alteringPageFlow.xml
      - copied, changed from r240148, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_altering.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/overview.xml
      - copied, changed from r240148, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageFlowControllers.xml
      - copied, changed from r240148, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageFlowInheritance.xml
      - copied unchanged from r240148, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_inheritance.xml
Removed:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_altering.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_inheritance.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
Modified:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/guide.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/databinding.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/faq.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/guide.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_method_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_validation_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/netui-samples.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/projects.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/sample_jpf_jsf_integration.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/servlet_container_adapters.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/sharedFlow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsJavascript.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsTree.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsXhtml.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/validation.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/tutorial_wsm.xml

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/guide.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/guide.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/guide.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/guide.xml Sun Aug 28 16:49:01 2005
@@ -6,17 +6,17 @@
     </header>
     <body>
         <section id="intro">
-            <title>How Do Page Flows, Controls, and Web Services Fit Together?</title>
-            <p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p> 
+            <title>How Do NetUI, Controls, and Web Services Fit Together?</title>
+            <p>NetUI makes building Java web applications easy and intuitive.  When programming with NetUI, the developer writes Java classes and pages -- that's it.  There is very little occasion to work with configuration files or other components.  NetUI programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p> 
         </section>
         <section>
-            <title>How Do Page Flows Work?</title>
-            <p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
-            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
-            <p>The JSP files use special tags (the "&lt;netui>" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            <title>How Does NetUI Work?</title>
+            <p>A NetUI "page flow" consists of a single directory containing a Java class, called the "controller", and any number of pages (often JSPs).
+            The role of the pages is to present a visual interface for users of the web application.  The role of the controller class is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+            <p>The JSP files use special tags (the <code>&lt;netui&gt;</code> tags) and databinding expressions which bind the user interface to objects and actions in the controller class.
             </p>
             <p>tbd: need diagram here</p> 
-            <p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            <p>The action methods in the controller class implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
             Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
             The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
             While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>    

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml Sun Aug 28 16:49:01 2005
@@ -10,8 +10,8 @@
             <section>
                 <title>Tutorial Goals</title>
                 <p>The Controls tutorial is provided as a way to become familiar with the concepts of Controls in Beehive.  The tutorial
-                   walks through creating, building, and deploying a sample project that uses a Control from a Page Flow.  Note, Page Flows 
-                   aren't required to use Controls; they just provide a convenient way to demonstrate running a Control.  In this tutorial, 
+                   walks through creating, building, and deploying a sample project that uses a Control from a page flow.  Note, NetUI Page Flow isn't
+                   required to use Controls; they just provide a convenient way to demonstrate running a Control.  In this tutorial, 
                    you will learn:</p>
                 <ul>
                     <li>What Beehive Controls are for and what they do.</li>
@@ -33,8 +33,8 @@
                 <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 
-                <a href="site:netui-blank">netui-blank</a>.  This contains a basic Ant build file and an example Page Flow Controller.  To create the
+                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>
                 <ol>
@@ -174,8 +174,8 @@
             <section id="create-edit-controller">
                 <title>Edit the Controller.java File</title>
             <p>To test the Hello control, you need to call the control from some other resource, such as a 
-               Java application, JSP page, a web application, etc.  In the following two steps you will call the 
-               control from a <a href="site:tutorial_pageflow">Page Flow Contoller</a> in a web application and display the results on a JSP page.</p>
+               Java application, JSP, a web application, etc.  In the following two steps you will call the 
+               control from a <a href="site:tutorial_pageflow">page flow contoller</a> in a web application and display the results on a JSP.</p>
             <p>Open the file <code>control_tutorial/Controller.java</code> in a code editor and modify so it appears as:</p>
             <source>
 import javax.servlet.http.HttpSession;
@@ -221,7 +221,7 @@
      <p>The two import statements import the @Control annotation and the <code>Hello</code> control, respectively.</p>
      <p>The <code>@Jpf.SimpleAction</code> named <code>begin</code> is renamed to <code>old_begin</code>
         because the Beehive runtime automatically looks for and runs any action named <code>begin</code> when 
-        a Page Flow is first instantiated.  The renaming makes the runtime run the action method <code>begin()</code>, 
+        a page flow is first instantiated.  The renaming makes the runtime run the action method <code>begin()</code>, 
         which allows us to call the <code>Hello</code> control inside of the method body.</p>
         </section>
         <section id="create_edit_page">
@@ -249,7 +249,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>controls_tutorial/WEB-INF/src</code> directory.  At the command prompt, enter:</p>
                 <source>
   ant clean build war
@@ -348,7 +348,7 @@
 </source>
     </section>
 <section id="add_method_edit_page">
-    <title>Edit a Test JSP Page</title>
+    <title>Edit a Test JSP</title>
     <p>Edit <code>index.jsp</code> so it appears as follows.  Code to add appears in bold.</p>
     <source><![CDATA[
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml Sun Aug 28 16:49:01 2005
@@ -15,16 +15,22 @@
         These include:
         </p>
         <ul>
-            <li><strong>NetUI</strong>: An annotation-driven web application programming framework that is built atop Struts. 
-                NetUI centralizes navigation logic, state, metadata, and exception handling in a single enacpsulated
-                and reusable <a href="site:pageflow/pageflow_overview">Page Flow Controller</a> class.  In addition, NetUI provides a set of JSP tags
-                for rendering HTML / XHTML and higher-level UI constructs such as data grids and trees and has first-class
-                integration with JavaServer Faces and Struts.</li>
-            <li><strong>Controls</strong>: A lightweight, metadata-driven component framework for building that reduces the 
+            <li>
+                <strong>NetUI</strong>: A project that includes Page Flow and a powerful set of JSP tags.  Page Flow is
+                an annotation-driven web application programming framework built on Struts, including
+                first-class integration with JavaServer Faces and Struts itself.  It centralizes navigation logic,
+                state, metadata, and exception handling in a single
+                <a href="site:pageflow/pageflow_overview">Page Flow Controller</a> class.  The NetUI JSP tag set is
+                Page Flow-aware, and provides tags for rendering HTML / XHTML and higher-level UI constructs such as
+                data grids and trees.
+            </li>
+            <li>
+                <strong>Controls</strong>: A lightweight, metadata-driven component framework for building that reduces the 
                 complexity of being a client of enterprise resources.  Controls provide a unified client abstraction that
                 can be implemented to access a diverse set of enterprise resources using a single configuration model.
             </li>
-            <li><strong>Web Service Metadata (WSM)</strong>: An implementation of <a href="site:jsr/n181">JSR 181</a> which 
+            <li>
+                <strong>Web Service Metadata (WSM)</strong>: An implementation of <a href="site:jsr/n181">JSR 181</a> which 
                 standardizes a simplified, annotation-driven model for building Java web services.
             </li>
         </ul>
@@ -39,7 +45,7 @@
         </p>
         <ul>
             <li><a href="site:control_overview">Controls</a></li>
-            <li><a href="site:pageflow_overview">Page Flow</a></li>
+            <li><a href="site:pageflow_overview">NetUI</a></li>
             <li><a href="site:wsm_overview">Web Service Metadata</a></li>
         </ul>
         <p>
@@ -48,7 +54,7 @@
         service projects:
         </p>
         <ul>
-            <li><a href="site:netui-blank">Blank Page Flow</a></li>
+            <li><a href="site:netui-blank">Blank NetUI</a></li>
             <li><a href="site:control-blank">Blank Control</a></li>
             <li><a href="site:wsm-blank">Web Service Metadata</a></li>
             <li><a href="site:ws-control-blank">Web Service Control</a></li>
@@ -58,7 +64,7 @@
         </p>
         <ul>
             <li><a href="site:control_getting_started">Controls</a></li>
-            <li><a href="site:pageflow_getting_started">Page Flows</a></li>
+            <li><a href="site:pageflow_getting_started">NetUI</a></li>
             <li><a href="site:wsm_getting_started">Web Service metadata</a></li>
         </ul>
         <p>
@@ -66,7 +72,7 @@
         </p>
         <ul>
             <li><a href="site:tutorial_control">Controls</a></li>
-            <li><a href="site:tutorial_pageflow">Page Flow</a></li>
+            <li><a href="site:tutorial_pageflow">NetUI</a></li>
             <li><a href="site:wsm/tutorial">Web Service Metadata</a></li>
         </ul>
         <p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml Sun Aug 28 16:49:01 2005
@@ -8,7 +8,7 @@
         <section id="overview">
             <title>Overview</title>
             <p>The Beehive distribution includes several Ant macros to assist developers creating Ant build files for
-              Page Flows, Controls and Web Services.  These macros are located in the
+              NetUI Page Flow, Controls and Web Services.  These macros are located in the
               &lt;BeehiveHome&gt;/ant/beehive-tools.xml file.</p>
             <p>To use any of these macros import the beehive-tools file into your Ant script:</p>
               <source>&lt;import file="${beehive.home}/ant/beehive-tools.xml"/&gt;</source>

Copied: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/alteringPageFlow.xml (from r240148, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_altering.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/alteringPageFlow.xml?p2=beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/alteringPageFlow.xml&p1=beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_altering.xml&r1=240148&r2=263967&rev=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_altering.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/alteringPageFlow.xml Sun Aug 28 16:49:01 2005
@@ -11,9 +11,9 @@
 
     <p>
     In the previous pages, you were shown how to stitch together a controller class
-    and a set of JSP pages.  One of the most powerful features of the Beehive way
+    and a set of JSPs.  One of the most powerful features of the Beehive way
     of building applications is being able to change the flow by editing only the
-    controller class file, without having to touch the JSP pages.
+    controller class file, without having to touch the JSPs.
     </p>
 
   </section>
@@ -25,7 +25,7 @@
     Sometime after deploying the application, it is decided that before allowing a
     user to login, they must first be presented a page describing the terms of 
     service for using the application.  Additionally, a decision is made to remove the 
-	thanks.jsp page and have
+	<code>thanks.jsp</code> file and have
     the "Sign Up" action automatically log-in the new user so they don't have
     to traverse the login screen.  In short, after (successfully) completing signup.jsp, the user
 	is taken directly to mypage.jsp.

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml Sun Aug 28 16:49:01 2005
@@ -9,7 +9,7 @@
             <title>Description</title>
             <p>
             The <code>beehive-netui-config.xml</code> file configures the runtime behavior of your
-            Page Flow web application.  It lives under the WEB-INF directory.
+            NetUI web application.  It lives under the WEB-INF directory.
             </p>
             <p>
             Use <code>beehive-netui-config.xml</code> to declare interceptor classes, override the
@@ -247,7 +247,7 @@
 				<p><strong>Children:</strong></p>
 				<p>none</p></section>
         <section id="default-shared-flow-refs"><title>&lt;default-shared-flow-refs&gt;</title>
-			<p>Allows JSPs to access shared flows even when there is no Page Flow that 
+			<p>Allows JSPs to access shared flows even when there is no page flow that 
 				declares the shared flow.  This configuration element declares
 				default shared flow references that can be used across the web app.</p>
 				<p><strong>Syntax</strong></p>
@@ -637,7 +637,7 @@
 				<p>If the number of server 
         forwards exceeds the given count, an error is written to the response and no further 
         forwarding is excuted. This is mainly to prevent infinite loops of server forwards. 
-        To reproduce the error, invoke this action in a Page Flow:</p>
+        To reproduce the error, invoke this action in a page flow:</p>
 <source>
 <![CDATA[    @Jpf.Action(
         forwards={
@@ -707,10 +707,10 @@
 				<p><a href="#module-config-locator">&lt;module-config-locator></a></p></section>
 
         <section id="multipart-handler"><title>&lt;multipart-handler&gt;</title>
-			    <p>By default multi-part file uploading is disabled for Page Flow web applications.
+			    <p>By default multi-part file uploading is disabled for NetUI web applications.
 					To turn it on, you must (1) explicitly set this element to <code>memory</code>
 					or <code>disk</code>, or (2) set the <code>multipartHandler</code> attribute on
-                    a page flow's &#64;Jpf.Controller annotation.  Doing (1) will enable file uploading across 
+                    a page flow's <code>&#64;Jpf.Controller</code> annotation.  Doing (1) will enable file uploading across 
 					the entire web applcation; doing (2) enables file uploading on a
 					controller-by-controller basis.</p>
                 <p><strong>Also see:</strong></p>
@@ -857,7 +857,7 @@
 					<a href="#module-config-locators">&lt;module-config-locators&gt;</a>
 					</p>
 				<p>
-Configures the page flow 
+Configures the NetUI
 runtime across the webapp. If you want to disable file-upload, for instance, 
 you set the multipart-handler to "disabled".</p></section>
             

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/databinding.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/databinding.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/databinding.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/databinding.xml Sun Aug 28 16:49:01 2005
@@ -106,7 +106,7 @@
             <title>NetUI Implicit Objects</title>
             <p>
             In addition to the implicit objects that the JSP container provides, the NetUI runtime provides an additional set 
-            of objects that are available when using certain NetUI and Page Flow features.  Not all of the implicit objects are 
+            of objects that are available when using certain NetUI features.  Not all of the implicit objects are 
             always available -- for example, the <code>actionForm</code> implicit object is only available when used inside of
             a <code>&lt;netui:form</code> tag for accessing the form's associated form bean.
             </p>
@@ -125,7 +125,7 @@
                 <td>Inside of a JSP where the 
                     <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
                     <code>&lt;netui-data:declareBundle></code></a>
-                    tag is used to refer to a resource bundle or where a JSP is part of a Page Flow that has 
+                    tag is used to refer to a resource bundle or where a JSP is part of a page flow that has 
                     resource bundles declared witd tde 
                     <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Controller.html">
                     <code>@Jpf.MessageBundle</code></a> 
@@ -158,22 +158,22 @@
             </tr>
             <tr>
                 <td><code>pageFlow</code></td>
-                <td>Available to any JSP that is part of a Page Flow.</td>
+                <td>Available to any JSP that is part of a page flow.</td>
                 <td>The <code>pageFlow</code> implicit object provides access to the 
-                    current Page Flow instance as a JavaBean.  This allows a JPF to expose properties to JSP pages.
+                    current page flow controller instance as a JavaBean.  This allows a page flow controller to expose properties to JSPs.
                 </td>
             </tr>
             <tr>
                 <td><code>pageInput</code></td>
                 <td>
-                Available to any JSP that was reached by a Page Flow 
+                Available to any JSP that was reached by a page flow 
                 <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/Forward.html">Forward</a> 
                 object that had <em>page inputs</em> attached to the Forward.
                 </td>
                 <td>
-                Page Flows allow <em>page inputs</em> to be attached to Forward objects as a way to provide a data contract between a Page Flow action 
-                and a JSP page.  This ensures that all actions that forward to JSPs provide the JSP the appropriate data and that all JSPs receive
-                the correct data.  This data contract is validated at both the action and at the JSP page when using the 
+                Page flows allow <em>action outputs</em> to be attached to Forward objects as a way to provide a data contract between a Page Flow action 
+                and a page.  This ensures that all actions that forward to JSPs provide the JSP the appropriate data and that all JSPs receive
+                the correct data.  This data contract is validated at both the action and at the JSP when using the 
                 <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.html">
                 <code>&lt;netui-data:declarePageInput></code></a>.
                 tag.
@@ -183,11 +183,11 @@
                 <td><code>sharedFlow</code></td>
                 <td>Available to any JSP that is part of a 
                     <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/PageFlowController.html">
-                    Page Flow</a> which references 
+                    page flow</a> which references 
                     <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/SharedFlowController.html">
-                    Shared Flows</a>.</td>
+                    shared flows</a>.</td>
                 <td>The <code>sharedflow</code> implicit object provides access any JavaBean properties on Shared Flows assocaited 
-                    with the current Page Flow.  This allows Shared Flows to expose properties to JSPs.
+                    with the current page flow.  This allows shared flows to expose properties to JSPs.
                 </td>
             </tr>
             </table>
@@ -250,10 +250,10 @@
             implicit object is available in one of two situations:
             </p>
             <ul>
-                <li>when declaring a resource bundle accessible to a JSP page via the 
+                <li>when declaring a resource bundle accessible to a JSP via the 
                     <a href="../apidocs/classref_pageflows/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
                     <code>&lt;netui-data:declareBundle></code></a> tag.</li>
-                <li>when a Page Flow with which the JSP is associated exposes resource bundles via the <code>@Jpf.MessageBundle</code>
+                <li>when a page flow with which the JSP is associated exposes resource bundles via the <code>@Jpf.MessageBundle</code>
                     annotation.</li>
             </ul>
             <p>
@@ -287,17 +287,17 @@
             <p>            
             The expressions above contain a reference to the <code>bundle</code> implicit object.  Then, the specific
             bundle name is referred to with <code>fooMessages</code>; this name must match the value of a <code>name</code>
-            attribute of a <code>declareBundle</code> tag or the name of a bundle declared in a Page Flow.  Finally, the
+            attribute of a <code>declareBundle</code> tag or the name of a bundle declared in a page flow controller.  Finally, the
             expressions use <code>message1</code> and <code>message2</code> to refer to message keys in the 
             <code>messages.properties</code> file.
             </p>
             <p>
             Resource bundles can also be registered with the <code>bundle</code> implicit object by using the <code>@Jpf.MessageBundle</code>
-            class-level annotation.  This allows a Page Flow to also integrate with the implicit message resources object which is
-            available via a Struts module.  These resource bundles will be available to all JSPs that are part of a Page Flow without having
+            class-level annotation.  This allows a page flow to also integrate with the implicit message resources object which is
+            available via a Struts module.  These resource bundles will be available to all JSPs that are part of a page flow without having
             to use the <code>declareBundle</code> JSP tag.  Because a default resource bundle can be associated with a Struts module, the 
-            bundle name <code>default</code> is reserved for referencing this bundle.  For example, the following Page Flow declares
-            the resource bundle above as the default Page Flow bundle:
+            bundle name <code>default</code> is reserved for referencing this bundle.  For example, the following page flow controller declares
+            the resource bundle above as the default page flow bundle:
             </p>
             <source>
             @Jpf.Controller(
@@ -312,7 +312,7 @@
             }
             </source>
             <p>
-            Message strings from this bundle can be referred to in JSP pages with an expression like:
+            Message strings from this bundle can be referred to in JSPs with an expression like:
             </p>
             <source><![CDATA[
                ${bundle.default.message1} 
@@ -340,7 +340,7 @@
             </source>
             <p>
             Each of these three ways to register a resource bundle (JSP tag, implicit Page Flow bundle, and explicit Page Flow bundle)
-            can be used together in a single Page Flow.
+            can be used together in a single page flow.
             </p>
             </section>
             <section id="implicit-objects-netui-container">
@@ -427,8 +427,8 @@
             <section id="implicit-objects-netui-pageFlow">
             <title>pageFlow</title>
             <p>
-            The <code>pageFlow</code> implicit object is used to refer to the current Page Flow as a JavaBean.  If there is no Page Flow
-            present, the <code>pageFlow</code> implicit object will not be available for data binding.  For example, if a Page Flow 
+            The <code>pageFlow</code> implicit object is used to refer to the current page flow controller as a JavaBean.  If there is no page flow
+            present, the <code>pageFlow</code> implicit object will not be available for data binding.  For example, if a page flow controller
             exposes a <code>username</code> property as:
             </p>
             <source>
@@ -456,8 +456,8 @@
                 ${pageFlow.username}
             ]]></source>
             <note label="Best Practice">
-            Because mutable JavaBean properties can be updated via an HTML form POST, JavaBean properties exposed by a Page Flow should usually 
-            be read-only unless the Page Flow itself is being used as a form bean.
+            Because mutable JavaBean properties can be updated via an HTML form POST, JavaBean properties exposed by a page flow should usually 
+            be read-only unless the page flow itself is being used as a form bean.
             </note>
             </section>
             <section id="implicit-objects-netui-pageInput">
@@ -476,7 +476,7 @@
             data binds to the <code>density</code> property on the <code>Widget</code>.
             </p>
             <p>
-            The Page Flow:
+            The page flow controller:
             </p>
             <source>
             @Jpf.Controller() 
@@ -501,7 +501,7 @@
             </source>
             <p>
             Notice here that the action has added an action output to the <code>Forward</code> via the <code>addActionOutput</code>
-            method call.  The Page Flow runtime will then validate the data contract declared in the annotations against the 
+            method call.  The NetUI runtime will then validate the data contract declared in the annotations against the 
             returned forward object.  If validation fails, a runtime error will be displayed in the browser.
             </p>
             <p>
@@ -535,14 +535,14 @@
             <title>sharedFlow</title>
             <p>
             The <code>sharedFlow</code> implicit object is used to refer to properties of Shared Flow objects that are associated with 
-            the current Page Flow.  If there is no Page Flow present, the <code>sharedFlow</code> implicit object will not be available
-            for data binding.  In order for a Shared Flow to be available for data binding, it must be registered with a Page Flow by
+            the current page flow.  If there is no page flow present, the <code>sharedFlow</code> implicit object will not be available
+            for data binding.  In order for a shared flow to be available for data binding, it must be registered with a page flow by
             type; additionally, it is registered with a name that will uniquely identify it in the set of Shared Flows associated with a 
-            Page Flow.  More information on Shared Flows can be found <a href="site:pageflow_sharedFlow">here</a>.
+            page flow.  More information on shared flows can be found <a href="site:pageflow_sharedFlow">here</a>.
             </p>
             <p>
-            The following example shows a Shared Flow, a Page Flow that uses that Shared Flow, and a JSP that uses the JSP 2.0 EL
-            to data bind to a JavaBean propety of the Shared Flow.
+            The following example shows a shared flow, a page flow that uses the shared flow, and a JSP that uses the JSP 2.0 EL
+            to data bind to a JavaBean propety of the shared flow.
             </p>
             <p>
             The Shared Flow:
@@ -565,7 +565,7 @@
 
             </source>
             <p>
-            The Page Flow:
+            The page flow controller:
             </p>
             <source>
             @Jpf.Controller(
@@ -578,7 +578,7 @@
             }
             </source>
             <p>
-            Above, the Page Flow adds an explicit reference to the Shared Flow Controller <code>org.foo.SharedFlow</code> defined above.
+            Above, the page flow controller adds an explicit reference to the shared flow controller <code>org.foo.SharedFlow</code> defined above.
             </p>
             <p>
             The JSP:
@@ -587,9 +587,9 @@
                 ${sharedFlow.aSharedFlow.sharedMessage}
             ]]></source>
             <p>
-            In a JSP whose current Page Flow Controller is the <code>Controller</code> class defined above, the JSP has access to 
-            all of the Shared Flows associated to the Page Flow via its <code>@Jpf.SharedFlowRef</code> annotation.  The Shared
-            Flow can then be referenced by the <code>name</code> attribute of the <code>SharedFlowRef</code> annotation.  In this case,
+            In a JSP whose current page flow controller is the <code>Controller</code> class defined above, the JSP has access to 
+            all of the shared flows associated to the page flow via its <code>@Jpf.SharedFlowRef</code> annotation.  The shared
+            flow can then be referenced by the <code>name</code> attribute of the <code>SharedFlowRef</code> annotation.  In this case,
             the name <code>aSharedFlow</code> is used in the JSP 2.0 expression to refer to the <code>SharedFlow</code>'s 
             <code>sharedMessage</code> property.
             </p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml Sun Aug 28 16:49:01 2005
@@ -10,7 +10,7 @@
 		<p>Beehive applications can be run in either <strong>development</strong> or 
 			<strong>production</strong> mode:</p>
 		<p>In <strong>development</strong> mode, if the tag <code>&lt;netui:exceptions showDevModeStackTrace="true"/></code>
-			is present on a JSP page and an exception occurs, then the stack trace will be 
+			is present on a JSP and an exception occurs, then the stack trace will be 
 			displayed.</p>
 		<p>In <strong>production</strong> mode, the opposite is true: if the tag &lt;netui:exceptions showDevModeStackTrace="true"/>
 			is present and an exception occurs, then the stack trace <em>won't</em> be 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/faq.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/faq.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/faq.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/faq.xml Sun Aug 28 16:49:01 2005
@@ -5,9 +5,9 @@
 		<title>Frequently Asked Questions</title>
 	</header>
 	<body>
-        <section><title>How Do I Ensure that JSP Pages are Accessible Only Through the Controller Class?</title>
+        <section><title>How Do I Ensure that JSPs are Accessible Only Through the Controller Class?</title>
 		<p>To prevent users from navigating directly to a JSP
-page, register the following filter class.  The filter class will intercept direct requests for JSP pages
+page, register the following filter class.  The filter class will intercept direct requests for JSPs
 and redirect the user to the Controller class in the JSP's parent directory.		</p>
 <source>package example;
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml Sun Aug 28 16:49:01 2005
@@ -2,35 +2,35 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Page Flows: Getting Started</title>
+        <title>NetUI: Getting Started</title>
     </header>
     <body>
-        <p>For an introduction to the basic concepts of Page Flows, see the <strong>users guide</strong> topics:</p>
+        <p>For an introduction to the basic concepts of NetUI (Page Flow and the JSP tags), see the <strong>users guide</strong> topics:</p>
         <ul>
-            <li><a href="site:pageflow_overview">Page Flow Overview</a></li>
+            <li><a href="site:pageflow_overview">NetUI Overview</a></li>
             <li><a href="site:pageflow_jsp">JSP Files</a></li>
         </ul>
-        <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle Page Flow web applications:</p>
+        <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle NetUI web applications:</p>
         <ul>
-            <li><a href="site:tutorial_pageflow">Page Flow Tutorial</a></li>
+            <li><a href="site:tutorial_pageflow">NetUI Tutorial</a></li>
         </ul>
         <p>
-        The following <strong>sample</strong> demonstrates a complete Page Flow web application that uses 
-        multiple, modular Page Flows, and Controls for back-end resource access:</p>
+        The following <strong>sample</strong> demonstrates a complete NetUI web application that uses 
+        multiple, modular page flows, and Controls for back-end resource access:</p>
         <ul>
             <li><a href="site:samples/petstore">Petstore</a></li>
         </ul>
-        <p>The following <strong>sample</strong> demonstrates individual Page Flow features:</p>
+        <p>The following <strong>sample</strong> demonstrates individual NetUI features:</p>
         <ul>
-            <li><a href="site:netui-samples">Page Flow Samples</a></li>
+            <li><a href="site:netui-samples">NetUI Samples</a></li>
         </ul>
         <p>The following <strong>sample</strong> demonstrates integration with Java Server Faces:</p>
         <ul>
-            <li><a href="site:netui-jsf">Page Flow: JSF Integration</a></li>
+            <li><a href="site:netui-jsf">NetUI: JSF Integration</a></li>
         </ul>
-        <p>The following <strong>project template</strong> will help you get a Page Flow project started:</p>
+        <p>The following <strong>project template</strong> will help you get a NetUI project started:</p>
         <ul>
-            <li><a href="site:netui-blank">Project: Page Flow</a></li>
+            <li><a href="site:netui-blank">Project: NetUI</a></li>
         </ul>
     </body>
     <footer>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/guide.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/guide.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/guide.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/guide.xml Sun Aug 28 16:49:01 2005
@@ -2,21 +2,21 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Page Flow Users Guide</title>
+        <title>NetUI Users Guide</title>
     </header>
     <body>
         <section id="intro">
-            <title>Advantages of Programming with Page Flows</title>
-            <p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p>
+            <title>Advantages of Building Applications with NetUI</title>
+            <p>NetUI (Page Flow and a set of JSP tags) makes building Java web applications easy and intuitive.  When building applications with NetUI, the developer writes Java files and pages --that's it.  There is very little occasion to work with configuration files, or other components.  NetUI is not only simple, it is also excells at separating the presentation from the navigational controller.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many repetitive programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p>
         </section>
         <section id="how_work">
-            <title>How Do Page Flows Work?</title>
-            <p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
-            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
-            <p>The JSP files use special tags (the "&lt;netui>" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            <title>How Does NetUI Work?</title>
+            <p>A NetUI "page flow" consists of a single directory path containing a Java class, called the "controller", and any number of JSPs.
+            The role of the JSPs is to present a visual interface for users of the web application.  The role of the controller class is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+            <p>The JSP files use special tags (the "&lt;netui>" tags) and databinding expressions which bind the user interface to objects and actions in the controller class.
             </p>
             <p>tbd: need diagram here</p>
-            <p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            <p>The action methods in the controller class implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
             Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
             The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
             While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>
@@ -27,13 +27,13 @@
             <p>
                 <strong>Introduction</strong>
             </p>
-            <p>Suppose you have two JSP pages, pageA.jsp and pageB.jsp.  Also, suppose you want to place a link on pageA, that will navigate the user to pageB.</p>
-            <p>One solution would be to place an HTML anchor tag (&lt;a>) on pageA that links to pageB.  But what if you had dozens of pages that needed to link to pageB?  You could repeat the anchor tag solution a dozen times, by placing an anchor tag on each page that required a link to pageB.  But this solution becomes cumbersome if you ever need to edit those links.  At some point in the future, you may want to change those links, so that they navigate to another page, say to pageC.  But this would require sifting through all of your web site's JSP pages for anchor tags to edit.</p>
-            <p>Page Flows solve this problem by placing navigational control within a single file: the Controller file (=JPF file).   Methods within the Controller file decide the target page, whether it is pageB, pageC, or somewhere else.  The job of the JSP page is to invoke the method, not to directly link to another JSP page.  The work of navigation in a Page Flow breaks down to a two step process: (1) The JSP page invokes a method in the Controller file, then (2) the method navigates the user to the target page.</p>
+            <p>Suppose you have two JSPs, pageA.jsp and pageB.jsp.  Also, suppose you want to place a link on pageA, that will navigate the user to pageB.</p>
+            <p>One solution would be to place an HTML anchor tag (&lt;a>) on pageA that links to pageB.  But what if you had dozens of pages that needed to link to pageB?  You could repeat the anchor tag solution a dozen times, by placing an anchor tag on each page that required a link to pageB.  But this solution becomes cumbersome if you ever need to edit those links.  At some point in the future, you may want to change those links, so that they navigate to another page, say to pageC.  But this would require sifting through all of your web site's JSPs for anchor tags to edit.</p>
+            <p>Page flows solve this problem by placing navigational control within a single place: the controller class.   Methods within the controller class decide the target page, whether it is pageB, pageC, or somewhere else.  The job of the JSP is to invoke the method, not to link directly to another JSP.  The work of navigation in a page flow breaks down to a two step process: (1) The JSP invokes an <em>action</em> in the controller class, then (2) the action navigates the user to the target page.</p>
             <p>
                 <strong>How the Code Works</strong>
             </p>
-            <p>Methods in the Controller file are invoked through specially designed JSP tags, called "netui" tags.  These tags appear with the prefix <strong>&lt;netui:></strong>. (Tags with the &lt;netui:> reference the netui-tags-html.tld tag library.)  Neuti tags like &lt;neuti:anchor>, &lt;netui:button>, and &lt;netui:imageButton> are all capable of invoking methods in the Controller file.  The method to invoke is specified by the tag's <code>action</code> attribute.  For example, the following  &lt;netui:anchor> tag invokes the <code>navigate</code> method by referencing the method in it's <code>action</code> attribute.</p>
+            <p>Methods in the controller class are invoked through specially designed JSP tags, called "netui" tags.  These tags appear with the prefix <strong>&lt;netui:></strong>. (Tags with the &lt;netui:> reference the netui-tags-html.tld tag library.)  Neuti tags like &lt;neuti:anchor>, &lt;netui:button>, and &lt;netui:imageButton> are all capable of invoking methods in the controller class.  The method to invoke is specified by the tag's <code>action</code> attribute.  For example, the following  &lt;netui:anchor> tag invokes the <code>navigate</code> method by referencing the method in it's <code>action</code> attribute.</p>
             <p>
                 <strong>pageA.jsp</strong>
             </p>
@@ -69,7 +69,7 @@
             <p>
                 <strong>Changing the Navigation Target</strong>
             </p>
-            <p>To change the navigation target of this action method, simply change the value of the path attribute. For example, if you want this action method to navigate to pageC.jsp, you would make the following change to the controller file (no change to the JSP page is necessary).</p>
+            <p>To change the navigation target of this action method, simply change the value of the path attribute. For example, if you want this action method to navigate to pageC.jsp, you would make the following change to the controller class (no change to the JSP is necessary).</p>
             <source>
     @Jpf.Action(
         forwards = { 
@@ -83,7 +83,7 @@
             <p>
                 <strong>Conditional Navigation</strong>
             </p>
-            <p>By placing navigational control in the Controller file, you can control conditional navigation.</p>
+            <p>By placing navigational control in the controller class, you can control conditional navigation.</p>
             <p>The following example is from the Petstore sample.  The <code>begin</code> method checks to see if the user is logged in or not, and navigates the user appropriately.</p>
             <p>
                 <strong>
@@ -121,7 +121,7 @@
 
     
 
-Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.java. It contains one field, name, and setter and getter methods for that field.
+Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller class. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller class SimpleSubmitController.java. It contains one field, name, and setter and getter methods for that field.
 
     SimpleSubmitController.java
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml Sun Aug 28 16:49:01 2005
@@ -8,7 +8,7 @@
         <section id="desc">
             <title>Description</title>
             <p>
-                These annotations configure elements of a Page Flow web application: page flows, shared flows, etc.
+                These annotations configure elements of a NetUI web application: page flows, shared flows, etc.
                 All Page Flow annotations come from the annotation interface
                 <a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.html">
                     org.apache.beehive.netui.pageflow.annotations.Jpf

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml Sun Aug 28 16:49:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>JPF Class Annotations</title>
+    <title>Page Flow Class Annotations</title>
   </header>
 	<body>
 		<section id="toc">

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_method_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_method_annotations.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_method_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_method_annotations.xml Sun Aug 28 16:49:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>JPF Annotations</title>
+    <title>Page Flow Annotations</title>
   </header>
   <body>
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_validation_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_validation_annotations.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_validation_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_validation_annotations.xml Sun Aug 28 16:49:01 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>JPF Validation Annotations</title>
+    <title>Page Flow Validation Annotations</title>
   </header>
 	<body>
 		<section id="ValidatableBean">
@@ -2201,4 +2201,4 @@
 	&copy; 2004, Apache Software Foundation
 	</legal>
     </footer>
-</document>
\ No newline at end of file
+</document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jsf.xml Sun Aug 28 16:49:01 2005
@@ -10,7 +10,7 @@
             <p>
                 <a href="http://java.sun.com/j2ee/javaserverfaces/">JavaServer Faces</a> is
                 technology for building web application user interfaces.  It allows development of
-                very rich component- and event-based pages.  Page Flow treats treats JSF pages as
+                very rich component- and event-based pages.  NetUI Page Flow treats treats JSF pages as
                 <em>first-class citizens</em>.  In addition to allowing the use of "straight" JSF
                 features, it integrates in the following ways:
             </p>
@@ -27,7 +27,7 @@
                     without form beans attached, using the built-in <code>action</code> attribute.
                 </li>
                 <li>
-                    Pages can databind to Page Flow objects using JSF-style expressions like
+                    Pages can databind to NetUI objects using JSF-style expressions like
                     <code>#{pageFlow.someProperty}</code> or
                     <code>#{pageInput.somePageInput.someProperty}</code>.
                 </li>
@@ -41,7 +41,7 @@
                 </li>
             </ul>
             <p>
-                The <a class="jump" href="sample_jpf_jsf_integration.html">Page Flow / JSF Sample</a>
+                The <a class="jump" href="sample_jpf_jsf_integration.html">NetUI / JSF Sample</a>
                 demonstrates these features.
             </p>
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml Sun Aug 28 16:49:01 2005
@@ -8,7 +8,7 @@
     <section id="introduction">
         <title>Introduction</title>
         <p> NetUI adds a handful of tag libraries to normal JSP usage to assist with the
-            binding of the JSP pages to the controller class.  These tag libraries add a number of features such
+            binding of the JSPs to the controller class.  These tag libraries add a number of features such
             as HTML form controls, data grids, and trees.  For a detailed overview of the tag libraries
             and their usage see the <a href="site:pageflow_tag_overview">NetUI Tag Library Overview</a>.  The
             <a href="../apidocs/taglib/taglib-overview-summary.html">tag library API documentation</a>
@@ -26,15 +26,15 @@
                 This tag library provides a very simple templating facility, allowing common elements such
                 as headers, footers, etc.</li>
         </ul>
-        <p> Page Flows also make extensive use of <strong><em>data binding expressions</em></strong>
-            to bind the JSP pages to data in the controller class.  For a detailed explanation
+        <p> NetUI also makes extensive use of <strong><em>data binding expressions</em></strong>
+            to bind the JSPs to data in the controller class.  For a detailed explanation
             of databinding expressions see
-            <a href="site:pageflow/databinding">Databinding: Passing Data Between Controller Classes and JSP Pages</a>
+            <a href="site:pageflow/databinding">Databinding: Passing Data Between Controller Classes and JSPs</a>
         </p>
     </section>
     <section id="StartingJSP">
         <title>Starting a NetUI JSP</title>
-        <p> NetUI JSP pages that act as stand alone HTML pages, can use the following template as the basis
+        <p> NetUI JSPs that act as stand alone HTML pages, can use the following template as the basis
             for a new page.  Using this template will insure that the structure of the HTML page is valid
             and that all of the features in the tag library are enabled.
         </p>
@@ -63,7 +63,7 @@
 &lt;%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
         </source>
 
-        <p> After the common prolog, the JSP page can be written like most any other JSP pages. The NetUI HTML tags can
+        <p> After the common prolog, the JSP can be written like most any other JSPs. The NetUI HTML tags can
             be configured to support both the HTML 4.01 spec and XHTML.  See the <a href="site:pageflow_tag_htmlMapping">
             HTML to NetUI Tag</a> topic to see how the NetUI tags relate to HTML. In addition to the prolog and
             using the HTML tags to represent the HTML structure, <code>&lt;netui:base&gt;</code>
@@ -71,7 +71,7 @@
             resolved correctly.
         </p>
         <p> The resulting general
-            form of a NetUI JSP page is as follows:
+            form of a NetUI JSP is as follows:
         </p>
         <source>
 <strong>&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
@@ -103,7 +103,7 @@
             <em>constant forward methods</em>, the advantage is that if a page
             gets renamed or you wish to change the flow through an application,
             the destination only needs to be changed once, within the controller.
-            Otherwise, you may have to edit a handful of JSP pages manually
+            Otherwise, you may have to edit a handful of JSPs manually
             changing the URLs inside normal <code>&lt;a&gt;</code> tags.
         </p>
         <p> In addition, the &lt;netui:anchor> tag supports many additional features such as submitting
@@ -111,8 +111,8 @@
         </p>
         <section id="LinkingExample">
             <title>Linking Example</title>
-            <p> Initially, we will examine simple linking through a controller to another JSP page using the
-                Page Flow introduced earlier.
+            <p> Initially, we will examine simple linking through a controller to another JSP using the
+                Page Flow controller introduced earlier.
             </p>
             <p><img src="images/impl-flow-1.png" alt="implementation page flow"/>
             </p>
@@ -139,8 +139,8 @@
                 display.
             </p>
             <p> If you want to add the term-of-service page, you can simply modify the action in the
-                Page Flow Controller to go to the newly created JSP page.  The advantage is that the
-                flow of control is stored in the Page Flow Controller and not in the pages themselves.
+                Page Flow controller to go to the newly created JSP.  The advantage is that the
+                flow of control is stored in the Page Flow controller and not in the pages themselves.
             </p>
         </section>
     </section>
@@ -150,7 +150,7 @@
         <p> To post data from forms to Page Flow controller's action handling the form post,
             the <code>&lt;netui:form&gt;</code> container tag, along with
             specialized NetUI form control tags that replace the normal form elements are used within
-            a JSP page.  Similar to how <code>&lt;netui:anchor&gt;</code> replaces
+            a JSP.  Similar to how <code>&lt;netui:anchor&gt;</code> replaces
             normal HTML <code>&lt;a&gt;</code> tags, the <code>&lt;netui:form&gt;</code>
             tag replaces the typical HTML <code>&lt;form&gt;</code> tag.  In addition,
             the NetUI form control tags replace the typical HTML form controls.
@@ -195,7 +195,7 @@
     </p>
 
     <ul>
-      <li><a href="site:pageflow/projects">Building a Page Flow Web Project</a></li>
+      <li><a href="site:pageflow/projects">Building a NetUI Web Project</a></li>
     </ul>
   </section>
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/netui-samples.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/netui-samples.xml?rev=263967&r1=263966&r2=263967&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/netui-samples.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/netui-samples.xml Sun Aug 28 16:49:01 2005
@@ -3,16 +3,29 @@
 	"http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
 	<header>
-		<title>Beehive Sample: Page Flow Samples</title>
+		<title>Beehive Sample: NetUI Samples</title>
 	</header>
 	<body>
 		<section id="intro">
 			<title>Introduction</title>
-			<p>These samples show individual Page Flow features, including:</p>
-            <ul><li>Data validation</li>
-				<li>Data grids</li>
-				<li>Link trees</li>
-				<li>Popup windows</li></ul>
+			<p>These samples show individual NetUI features, including:</p>
+            <ul>
+                <li>Page Flow Action Interceptors</li>
+                <li>Page Flow Declarative Exception Handling</li>
+                <li>File Upload</li>
+                <li>Page Flow Lifecycle</li>
+                <li>Nested Page Flows</li>
+                <li>Page Flow Inheritance</li>
+                <li>Form Posting</li>
+                <li>Page Inputs</li>
+                <li>Message Resources</li>
+                <li>Repeater Tag</li>
+                <li>Datagrid Tag</li>
+                <li>Tree Tag</li>
+                <li>Popup Windows and Nested Page Flows</li>
+                <li>Select Tag</li>
+                <li>Form Tags in a JSP 2.0 <code>.tag</code> File</li>
+            </ul>
 		</section>
 		<section id="running">
 			<title>Running the Samples on Tomcat 5</title>
@@ -86,9 +99,8 @@
 
 					</section>
 			<section id="compile">
-				<title>To Compile the Page Flow Samples Application</title>
-				<p>To compile the page flow samples app, enter the following Ant 
-					command:</p>
+				<title>To Compile the NetUI Samples Application</title>
+				<p>To compile the NetUI samples app, enter the following Ant command:</p>
 <source>ant 
   -f /beehive_projects/netui-samples/WEB-INF/src/build.xml
   clean