You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2005/09/06 23:31:00 UTC

svn commit: r279122 - in /beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui: databinding.xml exceptionHandling.xml lifecycleAndState.xml nestedPageFlow.xml validation.xml

Author: steveh
Date: Tue Sep  6 14:30:57 2005
New Revision: 279122

URL: http://svn.apache.org/viewcvs?rev=279122&view=rev
Log:
Editing run-through.

Modified:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml?rev=279122&r1=279121&r2=279122&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml Tue Sep  6 14:30:57 2005
@@ -9,24 +9,22 @@
         <section id="introduction">
             <title>Introduction</title>
             <p>
-            In NetUI, data binding is the what happens when binding JSP tags or other UI technologies to data that 
-            is available in the web-tier environment.  This document discusses both the the <em>implicit objects</em> that 
+            In NetUI, data binding allows JSP tags or other UI technologies to read and write data 
+            available in the web-tier environment.  This document discusses both the <em>implicit objects</em> that 
             are available via NetUI to the JSP author and the <em>expression languages</em> that are used to bind UI 
             objects to those implicit objects.  
             </p>
             <p>
             NetUI tags support binding to both <em>read-only</em> and <em>read-write</em> data.  Read-only data is usually
-            bound to tag attributes that simply display information on a page.  Read-write data is bound with the inteition
+            bound to tag attributes that simply display information on a page.  Read-write data is bound with the intention
             of being updated from a web browser.  Often, read-write data is displayed within an HTML form tag and bound to 
             HTML text boxes, radio buttons, select boxes, and other HTML widget types.  Each of these types of binding 
             use the syntax of the JSP 2.0 Expression Language (EL) to express a binding from JSP tag to JavaBean property,
             Map member, List item, array element, and so on.  The JSP 2.0 Expression Language is used to bind read-only 
-            data to tag attributes.  This language is documented in detail <a href="site:jspel">here</a>.  For example, 
+            data to tag attributes.  This language is documented in detail at <a href="site:jspel">here</a>.  For example, 
             this example binds a NetUI <code>span</code> tag to a value from a JSP's PageContext attribute map:
             </p>
-            <source><![CDATA[
-                <netui:span value="${pageScope.fooAttribute}"/>
-            ]]></source>
+            <source><![CDATA[<netui:span value="${pageScope.fooAttribute}"/> ]]></source>
             <p>
             Here, the JSP container evaluates the expression and invokes the <code>span</code> tag's <code>setValue</code>
             attribute method to pass the result to the tag.  The JSP 2.0 EL is also able to perform simple arithmetic 
@@ -38,18 +36,14 @@
             For example, when binding a NetUI <code>textBox</code> tag to data that is meant to be read and then updated during an 
             HTML form POST, the <code>textBox</code> tag might look like:
             </p>
-            <source><![CDATA[
-               <netui:textBox dataSource="actionForm.userName"/>
-            ]]></source>
+            <source><![CDATA[<netui:textBox dataSource="actionForm.userName"/> ]]></source>
             <p>
             This expression syntax is used on NetUI JSP tag attributes named <code>dataSource</code>.  The expression syntax is 
             necessary to allow the NetUI tags to know <em>both</em> the value of the expression and the expression text.  The 
             expression text is needed in order to write the tag's name in the HTML rendered to a web browser.  For example, 
             with a <code>userName</code> of "foo", the JSP tag above will render:
             </p>
-            <source><![CDATA[
-                <input type="text" name="{actionForm.userName}"/>
-            ]]></source>
+            <source><![CDATA[<input type="text" name="{actionForm.userName}"/> ]]></source>
             <p>
             The expression text is used by the <code>textBox</code> tag to render the value of the HTML <code>input</code>'s 
             <code>name</code> attribute, and when the containing HTML form POSTs, this name is used to detect the presence of 
@@ -57,8 +51,8 @@
             </p>
             <note label="Best Practice">
             In order to prevent POSTing data into JSP implicit objects such as <code>requestScope</code> or <code>sessionScope</code>,
-            only a few NetUI implicit objects should be used in read/write expressions.  These include <code>pageFlow</code>, <code>sharedFlow</code>, 
-            and <code>actionForm</code>.
+            only a few NetUI implicit objects should be used in read/write expressions.  These include <code>pageFlow</code>, 
+            <code>sharedFlow</code>, and <code>actionForm</code>.
             </note>
             <p>
             </p>
@@ -71,36 +65,26 @@
             For example, in a webapp called <code>foo</code> the following JSP snippet uses the <code>pageContext</code> implicit object
             which exposes the JSP's <code>javax.servlet.jsp.PageContext</code> to the page as a JavaBean:
             </p>
-            <source><![CDATA[
-               <netui:image value="${pageContext.request.contextPath}/images/banner.png"/>
-            ]]></source>
-            <p>
-            will display HTML markup:
-            </p>
-            <source><![CDATA[
-               <img source="/foo/images/banner.png"/>
-            ]]></source>
+            <source><![CDATA[<netui:image value="${pageContext.request.contextPath}/images/banner.png"/> ]]></source>
             <p>
-            The JSP container also makes implicit objects available that provide access to The attribute maps for the page context, 
-            request, session, and servlet context   By adding attributes to the page context, request, and session, webapp 
+            The following HTML markup will be rendered:
+            </p>
+            <source><![CDATA[<img source="/foo/images/banner.png"/> ]]></source>
+            <p>
+            The JSP container also makes implicit objects available that provide access to the attribute maps for the page context, 
+            request, session, and servlet context.  By adding attributes to the page context, request, and session, webapp 
             developers can add their own implicit objects.  In the following example, a JavaBean of type <code>Widget</code> is
             added to the request in a Page Flow action:
             </p>
-            <source>
-                getRequest().setAttribute("widget", fooWidget");
-            </source>
+            <source>getRequest().setAttribute("widget", fooWidget");</source>
             <p>
             Then, this JSP snippet uses the expression language to data bind to the Widget's <code>density</code> property:
             </p>
-            <source>
-                The density is: ${widget.density}
-            </source>
+            <source>The density is: ${widget.density}</source>
             <p>
             This is effectively the same as writing code that does:
             </p>
-            <source><![CDATA[
-                The density is: <%= ((Widget)request.getAttribute("widget")).getDensity() %>
-            ]]></source>
+            <source><![CDATA[The density is: <%= ((Widget)request.getAttribute("widget")).getDensity() %>]]></source>
         </section>
         <section id="implicit-objects-netui">
             <title>NetUI Implicit Objects</title>
@@ -111,7 +95,7 @@
             a <code>&lt;netui:form</code> tag for accessing the form's associated form bean.
             </p>
             <p>
-            A summary of the NetUI implicit objects is shown in the table below; details are avaialble further down this document.
+            A summary of the NetUI implicit objects is shown in the table below; details are available further down this document.
             </p>
             <table>
             <tr><th>Implicit Object</th><th>Context</th><th>Description</th></tr>
@@ -173,7 +157,7 @@
                 </td>
                 <td>
                 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
+                and a page.  This ensures that all actions that forward to JSPs provide the JSP with 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_netui/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.html">
                 <code>&lt;netui-data:declarePageInput></code></a>.
@@ -187,7 +171,7 @@
                     page flow</a> which references 
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/SharedFlowController.html">
                     shared flows</a>.</td>
-                <td>The <code>sharedflow</code> implicit object provides access any JavaBean properties on Shared Flows assocaited 
+                <td>The <code>sharedflow</code> implicit object provides access to any JavaBean properties on Shared Flows assocaited 
                     with the current page flow.  This allows shared flows to expose properties to JSPs.
                 </td>
             </tr>
@@ -201,45 +185,39 @@
             <title>actionForm</title>
             <p>
             The <code>actionForm</code> implicit object is a convenient way to explicitly reference a JavaBean used for authoring
-            HTML forms.  This implicit object is available only inside of <code>&lt;netui:form</code> tags with <code>action</code>
+            HTML forms.  This implicit object is available only inside of <code>&lt;netui:form></code> tags with <code>action</code>
             attributes that reference Page Flow actions accepting a JavaBean.  The <code>actionForm</code> implicit object allows
             data binding to JavaBean properties, Map attributes, Lists, and arrays as with any other implicit object.  This example
             shows a JSP that contains a form which POSTs to a Page Flow action that accepts a JavaBean <code>NameForm</code>.
             </p>
             <p>The JavaBean:</p>
-            <source>
-            public class NameForm {
-                private String _name;
-                public String getName() {
-                    return _name;
-                }
-               
-                public void setName(String name) {
-                    _name = name;
-                }
-            }
-            </source>
+            <source>public class NameForm {
+    private String _name;
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+    _name = name;
+    }
+}</source>
             <p>
             The JSP:
             </p>
-            <source><![CDATA[
-                <netui:form action="submitNameform">
-                    <netui:textBox dataSource="actionForm.name"/><br/>
-                    <netui:button value="Submit"/>
-                </netui:form>
-            ]]></source>
+            <source><![CDATA[<netui:form action="submitNameform">
+    <netui:textBox dataSource="actionForm.name"/><br/>
+    <netui:button value="Submit"/>
+</netui:form>]]></source>
             <p>
             The Page Flow action <code>submitNameForm</code>:
             </p>
-            <source>
-                @Jpf.Action()
-                public Forward submitNameForm(NameForm form) {
-                    ...
-                }
-            </source>
+            <source>@Jpf.Action()
+public Forward submitNameForm(NameForm form) {
+    ...
+}</source>
             <p>
             Here, the <code>dataSource</code>'s <code>actionForm.name</code> expression refers to the value of the
-            <code>NameForm</code>'s <code>name</code> property.  The result is data bound to the <code>textBox</code>.
+            <code>NameForm</code>'s <code>name</code> property.  The result is data bound to the <code>textBox</code> tag.
             When the form is submitted to the server, the request parameter <code>{actionForm.name}</code> is applied
             to the action form which is then passed to the <code>submitNameForm</code> action.
             </p>
@@ -268,26 +246,20 @@
             <p>
             The resource bundle, which is located in <code>WEB-INF/classes/org/foo/messages.properties</code>:
             </p>
-            <source><![CDATA[
-            message1=This is the first message
-            message2=Another message
-            ]]></source>
+            <source><![CDATA[message1=This is the first message
+message2=Another message]]></source>
             <p>
             The JSP can declare this resource bundle to be available to the page using this JSP snippet:
             </p>
-            <source><![CDATA[
-                <%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
+            <source><![CDATA[<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
 
-                <netui-data:declareBundle name="fooMessages" bundlePath="org/foo/messages"/>
-            ]]></source>
+<netui-data:declareBundle name="fooMessages" bundlePath="org/foo/messages"/>]]></source>
             <p>
             Finally, messages in the JSP can be data bound with JSP literal text and tags:
             </p>
-            <source><![CDATA[
-               <netui:span value="${bundle.fooMessages.message1}"/>
+            <source><![CDATA[<netui:span value="${bundle.fooMessages.message1}"/>
 
-               ${bundle.fooMessages.message2}
-            ]]></source>
+${bundle.fooMessages.message2}]]></source>
             <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>
@@ -306,45 +278,37 @@
             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(
-                forwards = {...}
-                messageBundles = {
-                    @Jpf.MessageBundle(bundlePath="org.foo.messages")
-                }
-            )
-            public class Controller 
-                extends PageFlowController {
-                ...
-            }
-            </source>
+            <source>@Jpf.Controller(
+    forwards = {...}
+    messageBundles = {
+        @Jpf.MessageBundle(bundlePath="org.foo.messages")
+    }
+)
+public class Controller 
+    extends PageFlowController {
+    ...
+}</source>
             <p>
             Message strings from this bundle can be referred to in JSPs with an expression like:
             </p>
-            <source><![CDATA[
-               ${bundle.default.message1} 
-            ]]></source>
+            <source><![CDATA[${bundle.default.message1}]]></source>
             <p>
             A resource bundle can also be registered with a specific name by adding an annotation like:
             </p>
-            <source>
-            @Jpf.Controller(
-                forwards = {...}
-                messageBundles = {
-                    @Jpf.MessageBundle(bundleName="jpfBundle", bundlePath="org.foo.messages")
-                }
-            )
-            public class Controller 
-                extends PageFlowController {
-                ...
-            }
-            </source>
+            <source>@Jpf.Controller(
+    forwards = {...}
+    messageBundles = {
+        @Jpf.MessageBundle(bundleName="jpfBundle", bundlePath="org.foo.messages")
+    }
+)
+public class Controller 
+    extends PageFlowController {
+    ...
+}</source>
             <p>
             Then, the same message strings from the previous two examples are available with an expression like
             </p>
-            <source>
-                ${bundle.jpfBundle.message1}
-            </source>
+            <source>${bundle.jpfBundle.message1}</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.
@@ -360,27 +324,27 @@
             <ul>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.html">
-                    <code>&lt;netui-data:dataGrid</code></a>
+                    <code>&lt;netui-data:dataGrid></code></a>
                 </li>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/repeater/Repeater.html">
-                    <code>&lt;netui-data:repeater</code></a>
+                    <code>&lt;netui-data:repeater></code></a>
                 </li>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.html">
-                    <code>&lt;netui-data:cellRepeater</code></a>
+                    <code>&lt;netui-data:cellRepeater></code></a>
                 </li>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Select.html">
-                    <code>&lt;netui:select</code></a>
+                    <code>&lt;netui:select></code></a>
                 </li>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/CheckBoxGroup.html">
-                    <code>&lt;netui:checkBoxGroup</code></a>
+                    <code>&lt;netui:checkBoxGroup></code></a>
                 </li>
                 <li>
                     <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/RadioButtonGroup.html">
-                    <code>&lt;netui:radioButtonGroup</code></a>.
+                    <code>&lt;netui:radioButtonGroup></code></a>.
                 </li>
             </ul>
             <p>
@@ -402,8 +366,8 @@
                     </td>
                 </tr>
                 <tr><td><code>container</code></td>
-                    <td>Refers to an outer container repeating container.  This value is used when two repeating containers are
-                        nested and the inner container needs to access about the current item in the outer container.  For example,
+                    <td>Refers to an outer repeating container.  This value is used when two repeating containers are
+                        nested and the inner container needs to access the current item in the outer container.  For example,
                         this might be used when rendering hierarchical data sets.
                     </td>
                 </tr>
@@ -412,16 +376,14 @@
             The following example uses the NetUI <code>&lt;netui-data:repeater></code> to iterate over an array of <code>Widget</code>
             beans displaying each Bean's name and density properties and their index in the array.
             </p> 
-            <source><![CDATA[
-                <%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
+            <source><![CDATA[<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
 
-                <table>                
-                <tr><th>Index</th><th>Name</th><th>Name</th></tr>
-                <netui-data:repeater dataSource="requestScope.widgetBeanArray">
-                    <tr><td>${container.index}</td><td>${container.item.name}</td><td>${container.item.name}</td></tr>
-                </netui-data:repeater>            
-                </table>
-            ]]></source>
+<table>                
+<tr><th>Index</th><th>Name</th><th>Name</th></tr>
+<netui-data:repeater dataSource="requestScope.widgetBeanArray">
+    <tr><td>${container.index}</td><td>${container.item.name}</td><td>${container.item.name}</td></tr>
+</netui-data:repeater>            
+</table>]]></source>
             <p>
             Notice in this example how the <code>repeater</code> tag has a <code>dataSource</code> attribute that references 
             the data set to iterate through.  The <code>dataSource</code> attribute requires the use of the NetUI Expression 
@@ -438,30 +400,26 @@
             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>
-            @Jpf.Controller(
-                forwards={@Jpf.Forward(name="index", path="index.jsp")}
-            )
-            public class Controller {
-                private String _username = null;
+            <source>@Jpf.Controller(
+    forwards={@Jpf.Forward(name="index", path="index.jsp")}
+)
+public class Controller {
+    private String _username = null;
   
-                public String getUsername() {
-                    return _username;
-                }
-
-                @Jpf.Action()
-                public Forward begin() {
-                    _username = "Foo Bar";
-                    return new Forward("index");
-                }
-            }
-            </source>
+    public String getUsername() {
+        return _username;
+    }
+
+    @Jpf.Action()
+    public Forward begin() {
+        _username = "Foo Bar";
+        return new Forward("index");
+    }
+}</source>
             <p>
             The <code>username</code> property can be data bound in <code>index.jsp</code> as: 
             </p>
-            <source><![CDATA[
-                ${pageFlow.username}
-            ]]></source>
+            <source><![CDATA[${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.
@@ -485,27 +443,25 @@
             <p>
             The page flow controller:
             </p>
-            <source>
-            @Jpf.Controller() 
-            public class Controller
-                extends PageFlowController {
-
-                @Jpf.Action(
-                    forwards={@Jpf.Forward(name="success", 
-                                           path="index.jsp",
-                                           actionOutputs={@Jpf.ActionOutput(name="theWidget", type=Widget.class, required=true)}
-                                          )
-                    }
-                )
-                protected Forward begin() {
-                    Widget widget = new Widget();
-                    widget.setDensity(3.14);
-                    Forward f = new Forward("success");
-                    f.addActionOutput("theWidget", widget);
-                    return f;
-                }
-            }            
-            </source>
+            <source>@Jpf.Controller() 
+public class Controller
+    extends PageFlowController {
+
+    @Jpf.Action(
+        forwards={@Jpf.Forward(name="success", 
+                               path="index.jsp",
+                               actionOutputs={@Jpf.ActionOutput(name="theWidget", type=Widget.class, required=true)}
+                              )
+        }
+    )
+    protected Forward begin() {
+        Widget widget = new Widget();
+        widget.setDensity(3.14);
+        Forward f = new Forward("success");
+        f.addActionOutput("theWidget", widget);
+        return f;
+    }
+}</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 NetUI runtime will then validate the data contract declared in the annotations against the 
@@ -514,13 +470,11 @@
             <p>
             The JSP:
             </p>
-            <source><![CDATA[
-                <%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
+            <source><![CDATA[<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>                
                 
-                <netui-data:declarePageInput name="theWidget" type="org.foo.Widget"/>
+<netui-data:declarePageInput name="theWidget" type="org.foo.Widget"/>
 
-                ${pageInput.theWidget.density}
-            ]]></source>
+${pageInput.theWidget.density}]]></source>
             <p>
             Notice here that the page has used a <code>declarePageInput</code> tag to ensure that the <code>Widget</code>
             entering the page is both present in the set of page inputs and is non-null.  Given this information, the JSP
@@ -533,10 +487,6 @@
             and to refer to them via the <code>pageInput</code> implicit object will continue to work without any data contract
             validation.
             </p>
-            <ul>
-                <li>An action exposes data specified in its annotations.</li>
-                <li>A JSP receives the data that it expects.An action exposes data specified in its annotations.</li>
-            </ul>
             </section>
             <section id="implicit-objects-netui-sharedFlow">
             <title>sharedFlow</title>
@@ -554,35 +504,31 @@
             <p>
             The Shared Flow:
             </p>
-            <source>
-            package org.foo;
+            <source>package org.foo;
 
-            import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.SharedFlowController;
 
-            @Jpf.Controller()
-            public class SharedFlow 
-                extends SharedFlowController {
+@Jpf.Controller()
+public class SharedFlow 
+   extends SharedFlowController {
 
-                private String _sharedMessage = null;
+    private String _sharedMessage = null;
  
-                public String getSharedMessage() {
-                    return _sharedMessage;
-                }
-            }
-
-            </source>
+    public String getSharedMessage() {
+        return _sharedMessage;
+    }
+}</source>
             <p>
             The page flow controller:
             </p>
-            <source>
-            @Jpf.Controller(
-                sharedFlowRefs={@Jpf.SharedFlowRef(name="aSharedFlow", type=org.foo.SharedFlow.class)}
-            )
-            public class Controller
-               extends PageFlowController {
+            <source>@Jpf.Controller(
+    sharedFlowRefs={@Jpf.SharedFlowRef(name="aSharedFlow", type=org.foo.SharedFlow.class)}
+)
+public class Controller
+   extends PageFlowController {
 
-                ...
-            }
+    ...
+}
             </source>
             <p>
             Above, the page flow controller adds an explicit reference to the shared flow controller <code>org.foo.SharedFlow</code> defined above.
@@ -590,9 +536,7 @@
             <p>
             The JSP:
             </p>
-            <source><![CDATA[
-                ${sharedFlow.aSharedFlow.sharedMessage}
-            ]]></source>
+            <source><![CDATA[${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

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml?rev=279122&r1=279121&r2=279122&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml Tue Sep  6 14:30:57 2005
@@ -78,9 +78,8 @@
                 exception-handler method <code>handleMyException</code>:
             </p>
             <source xml:space="preserve">
-                @Jpf.Catch(type=MyException.class, path="error.jsp")
-                @Jpf.Catch(type=MyException.class, method="handleMyException")
-            </source>
+@Jpf.Catch(type=MyException.class, path="error.jsp")
+@Jpf.Catch(type=MyException.class, method="handleMyException")</source>
             <p>
                 You can put this annotation in a number of places (in order of precedence):
             </p>
@@ -154,7 +153,7 @@
             @Jpf.Forward(name="success", path="success.jsp")
         },
         catches={
-            @Jpf.Catch(type=Exception1.class, path="specialErrorPage.jsp")
+            <strong>@Jpf.Catch(type=Exception1.class, path="specialErrorPage.jsp")</strong>
         }
     )
     public Forward specialAction() throws Exception1, Exception2

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml?rev=279122&r1=279121&r2=279122&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml Tue Sep  6 14:30:57 2005
@@ -88,10 +88,10 @@
                             <code>@Jpf.FacesBacking</code></a>, and extends
                         <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/FacesBackingBean.html">
                             <code>FacesBackingBean</code></a>, then an instance is created and stored in the session.
-                        It is removed from the session on the next request that is not the same page.
+                        It is removed from the session on the next request that is not from the same page.
                     </p>
                     <p>
-                        See <a href="site:docs/pageflow/netuiBasic/pageflow_jsf">this document</a> for more details on JSF
+                        See <a href="site:docs/pageflow/netuiBasic/pageflow_jsf">Java Server Faces</a> for more details on JSF
                         integration with NetUI.
                     </p>
                 </section>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml?rev=279122&r1=279121&r2=279122&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml Tue Sep  6 14:30:57 2005
@@ -72,8 +72,8 @@
 }           </source>
             <p>
                 As you can see, the <code>begin</code> action forwards to <code>index.jsp</code>, which allows you to
-                raise the <code>goNested</code> action. This action enters the nested page flow <code>simply by
-                forwarding to it</code>. Any time you hit the URL for a nested page flow (or any one of its actions or
+                raise the <code>goNested</code> action. This action enters the nested page flow <em>simply by
+                forwarding to it</em>. Any time you hit the URL for a nested page flow (or any one of its actions or
                 pages), you enter the nested page flow, and the current one is pushed aside.
             </p>
             <p>
@@ -241,12 +241,12 @@
                 <source>
 @Jpf.SimpleAction(name="chooseAirportCancelled", navigateTo=Jpf.NavigateTo.currentPage)</source>
                 <p>
-                    It could also go back to the <em>previous</em> page, and it could re-run the most recent action in
-                    the current page flow:
+                    Or could also go back to the <em>previous</em> page:
                 </p>
                 <source>
 @Jpf.SimpleAction(name="chooseAirportCancelled", navigateTo=Jpf.NavigateTo.previousPage)</source>
-                <p>or,</p>
+                <p>Or it could re-run the most recent action in
+                    the current page flow:</p>
                 <source>
 @Jpf.SimpleAction(name="chooseAirportCancelled", navigateTo=Jpf.NavigateTo.previousAction)</source>
                 <note>
@@ -279,7 +279,7 @@
                     object that is sent to the nested page flow.
                 </p>
                 <section id="beginActionFormBean">
-                    <title>add a form bean to the nested page flow's <code>begin</code> action</title>
+                    <title>Add a form bean to the nested page flow's <code>begin</code> action</title>
                     <p>
                         To add a form bean, simply add a single argument to a <code>begin</code> action method:
                     </p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml?rev=279122&r1=279121&r2=279122&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml Tue Sep  6 14:30:57 2005
@@ -22,7 +22,7 @@
 			<li>Form Bean Getter Methods</li>
 		</ul>
 		<section id="class-level"><title>...on the Controller Class</title>
-		<p>The following class-level annotation, says that anytime that an instance of 
+		<p>The following class-level annotation says that anytime that an instance of 
 			MyForm is submitted, then its <code>date</code> field will be validated 
 			(against the pattern M-d-y).</p>
 		<p>When the validation annotations decorate the Controller class,