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/05/25 00:13:40 UTC

svn commit: r178300 - in /incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs: controls/ pageflow/ pageflow/jpf-annotations/ system-controls/ejb/ system-controls/jdbc/ system-controls/jms/ wsm/

Author: steveh
Date: Tue May 24 15:13:38 2005
New Revision: 178300

URL: http://svn.apache.org/viewcvs?rev=178300&view=rev
Log:
Fix for BEEHIVE-764: Website has minor typos and some other things
Contributed by Krista Baker
Thanks for this thankless editing work!

Modified:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/controlsProgramming.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_altering.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_jsp.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsDoc.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/wsm_JWSFiles.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/controlsProgramming.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/controlsProgramming.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/controlsProgramming.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/controlsProgramming.xml Tue May 24 15:13:38 2005
@@ -995,7 +995,7 @@
 
 <p>In the example above, the BBean JavaBean class that results from processing of B.java will expose the operations, properties, and events defined by both the A and B control interfaces.  The BImpl class would need to implement all operations defined by the B interface, and could also choose to override some, all, or none of the operations defined by A.</p>
 
-<p>Inheritance is also supported for extensible control types.  If AImpl implements the Extensible interface, then BImpl could choose to define additional extensibility PropertySets and implement a new Extensible.invoke() method to provide their semantics (delegating to AImpl.invoke() as approriate). It could also choose not to extend the extensibilty semantics and allow all operations defined within a ControlExtension derived from B to be handled by AImpl.invoke().</p>
+<p>Inheritance is also supported for extensible control types.  If AImpl implements the Extensible interface, then BImpl could choose to define additional extensibility PropertySets and implement a new Extensible.invoke() method to provide their semantics (delegating to AImpl.invoke() as appropriate). It could also choose not to extend the extensibilty semantics and allow all operations defined within a ControlExtension derived from B to be handled by AImpl.invoke().</p>
 
         </section>
         
@@ -1142,7 +1142,7 @@
                     <li>	java.beans.BeanContextServices</li>
                 </ul>
                 <p>These APIs provide access to a standard set of JavaBean events that the Control Implementation Class can register an interest in.   </p>
-                <p><em>[todo][Issue: there is not a declarative mechanism for receiving these events, but probably should be.]</em></p>
+                <p><em><!--[todo]-->[Issue: there is not a declarative mechanism for receiving these events, but probably should be.]</em></p>
                 <section>
                     <title>PropertyChange Events</title>
                     <p>The java.beans.BeanContextChild interface provides the addPropertyChangeListener() and addVetoableChangeListener() APIs to register  for notification when a property is modified.</p>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml Tue May 24 15:13:38 2005
@@ -41,8 +41,8 @@
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">@Jpf.ValidatableBean</a></p>
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">@Jpf.ValidatableProperty</a></p>
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">@Jpf.ValidateCreditCard</a></p>
-			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCustomRule.html">@Jpf.ValidateCustomRule</a></p>
-			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCustomVariable.html">@Jpf.ValidateCustomVariable</a></p>
+			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomRule.html">@Jpf.ValidateCustomRule</a></p>
+			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">@Jpf.ValidateCustomVariable</a></p>
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">@Jpf.ValidateDate</a></p>
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">@Jpf.ValidateEmail</a></p>
 			<p><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">@Jpf.ValidateMask</a></p>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_altering.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_altering.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_altering.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_altering.xml Tue May 24 15:13:38 2005
@@ -53,7 +53,7 @@
     <title>Implementation Flow Change</title>
 
     <p>
-    To accomodate the new logical flow, the implementation flow model originally looked like this:
+    To accommodate the new logical flow, the implementation flow model originally looked like this:
     </p>
 
     <p>
@@ -107,7 +107,7 @@
       <title>Redirect <code>login()</code></title>
 
       <p>
-      Previous, the <code>login()</code> controller method was defined to statically
+      Previously, the <code>login()</code> controller method was defined to statically
       return the forward to <code>login.jsp</code>.  
       </p>
 
@@ -163,7 +163,7 @@
       controller method.  Instead of just recording the user's information, it now must
       also perform the logic of logging in the user automatically.  Additionally, the
       forward returned by it will send the user directly to <code>mypage.jsp</code>
-      instead of the not-unused <code>thanks.jsp</code> page.
+      instead of the now unused <code>thanks.jsp</code> page.
       </p>
 
 <source>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml Tue May 24 15:13:38 2005
@@ -21,7 +21,7 @@
     <title>Source Tree Layout</title>
 
     <p>
-    The layout of your project may be anywhere on your local disk.  We assume
+    The layout of your project may be anywhere on your local disk.  We will assume
     that the environment variable $WEBAPP_DIR points to the top-level of your
     application.      
     </p>
@@ -93,7 +93,7 @@
 	  <p><strong>Note:</strong> this Ant command will deploy the necessary JARs listed
 		below (plus a few other optional control JARs) to the WEB-INF/lib directory.</p>
 		
-	  <source>ant -f $BEEHIVE_HOME\ant\webappRuntimeCore.xml -Dwebapp.dir=$WEBAPP_DIR deploy.beehive.webapp.runtime</source>
+	  <source>ant -f $BEEHIVE_HOME\ant\beehive-runtime.xml -Dwebapp.dir=$WEBAPP_DIR deploy.beehive.webapp.runtime</source>
 
       <table>
         <tr>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml Tue May 24 15:13:38 2005
@@ -26,9 +26,7 @@
     <title>Starting the Controller File</title>
     <p>
     The first step to writing a controller file is to create a new basic class
-    named <code>Controller.java</code>.  The <code>jpf</code> extension alerts the
-    build that this class is a special JPF controller class, instead of a typical
-    Java class. 
+    named <code>Controller.java</code>.  
     </p>
 
 <source>
@@ -50,7 +48,9 @@
     <p>
     Additionally, Beehive weaves magic into controller classes using annotations.
     The <code>Jpf.Controller</code> annotation is a required marker on your
-    own controller class.
+    own controller class.  The <code>jpf</code> annotation alerts the
+    build that this class is a special JPF controller class, instead of a typical
+    Java class. 
     </p>
 
 <source>
@@ -113,7 +113,7 @@
 }</source>
 	
 	<p>Simple actions can handle navigation, form submission, and form validation.  
-		If that's is all your action needs to accomplish, you should implement the action as 
+		If that is all your action needs to accomplish, you should implement the action as 
 		a simple action.  What simple actions <em>can't</em> do is handle decision logic.  If your action
 		needs to make a decision and conditionally execute code based on that decision, you should 
 		implement the action as an <em>action method</em>.</p>
@@ -187,7 +187,7 @@
       must determine if the user has already authenicated himself or not and the action must
 	  behave differently depending on the 
 	  result of that determination.  If the user
-	  has aleady been authenticated, then the page <code>myPage.jsp</code> will be displayed;
+	  has already been authenticated, then the page <code>myPage.jsp</code> will be displayed;
 	  if the user has not been authenticated yet, then the page <code>login.jsp</code> will
 	  be displayed.
       </p>
@@ -361,7 +361,7 @@
 }
 </source>
 
-<p>But how to do the method decide which forward to invoke?       
+<p>But how does the method decide which forward to invoke?       
 	In this case, the determination of authentication is performed by checking a 
 	  <strong>session attribute</strong>
       to see if the <code>authenticated_user</code> attribute has been set.</p>
@@ -409,9 +409,9 @@
       You may notice that the body of <code>myPage()</code> has no particular logic regarding
       the JSP page "myPage.jsp" itself.  It simply operates in terms of authentication and generically
       named <code>Forward</code> objects.  This presents a possibility of sharing this logic
-      with other controller methods that are concerned with authentication.  For more ideas
-      along these lines, please see 
-		<!--<link href="controller_patterns.html">-->Controller Patterns [todo: forthcoming document]<!--</link>-->.
+      with other controller methods that are concerned with authentication.  
+	<!-- Comment out for v1, document does not yet exist. For more ideas along these lines, please see -->
+		<!--<link href="controller_patterns.html">--><!--Controller Patterns [todo: forthcoming document]--><!--</link>-->.
       </p>
     </section>
     <section id="handling_forms">
@@ -435,7 +435,7 @@
     </p>
     <p>The JavaBean may be defined (1) as a <code>static</code> inner class of the controller itself 
 		(see example below) or (2) as a stand-alone Java class in a separate file.  The 
-		JavaBean class follows normal JavaBean conventions and require no special annotations.   
+		JavaBean class follows normal JavaBean conventions and requires no special annotations.   
       </p>
 
 <source>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml Tue May 24 15:13:38 2005
@@ -19,7 +19,7 @@
 				only pass data from the processing layer to the presentation layer, some contexts
 				can pass data in the opposite direction from the presentation layer to the processing layer.
 				</p>
-			<p>The one-way, read-only contexts are: requestScope, url, sessionScope, container, pageContext, bundle, pageInput</p>
+			<p>The one-way, read-only contexts are: requestScope, param, sessionScope, container, pageScope, bundle, pageInput, applicationScope</p>
 			<p>The two-way, read-write contexts are:  pageFlow, sharedFlow, actionForm</p>
 		</section>
 		<section id="contexts">
@@ -82,8 +82,15 @@
 					</td>
 					<td>The current Controller class</td>
 					<td>Public members of the current Controller class can be referenced and written to.
-						Assume that the Controller class contains the following public member String.
-						<source>public String someText = "This is some text"</source>
+						Assume that the Controller class contains the following member String and
+						associated get and set methods.
+						<source>public String someText = "This is some text"
+public String getSomeText(){
+    return someText;
+}
+public void setSomeText(String newText){
+    someText = newText;
+}</source>
 						Then that member can be referenced from any JSP page in the page flow.
 						<source>&lt;netui:span value="${pageFlow.someText}"/></source></td>
 				</tr>
@@ -140,7 +147,7 @@
 				</tr>				
 				<tr>
 					<td>
-						<code>url</code>
+						<code>param</code>
 					</td>
 					<td>Query parameters on the current JSP's URL.</td>
 					<td>Query parameters that are part of the URL can be 
@@ -188,8 +195,8 @@
                     The values are retrieved by the JSP page, using the <code>actionForm</code>
 					context:</p>
 				<source>&lt;netui:form action="submitUpdate">
-    &lt;netui:content value="{actionForm.itemnumber}"/>
-    &lt;netui:textBox dataSource="{actionForm.itemname}"/>
+    &lt;netui:content value="${actionForm.itemnumber}"/>
+    &lt;netui:textBox dataSource="actionForm.itemname"/>
     ...
 &lt;/netui:form></source>
 				<p>When the &lt;netui:form> is submitted 
@@ -261,19 +268,28 @@
 					<code>pageFlow</code>
 				</title>
 				<p>When you define a variable in your controller class, you can access this 
-					variable from any JSP page that is part of that page flow. For example, 
-					if the JPF file contains this code:</p>
+					variable from any JSP page that is part of that page flow by providing
+					access with a getter and setter method. For example, if the JPF file 
+					contains this code:</p>
 
-<source>public class SimpleflowController extends PageFlowController
-{
-    public String labelName = "This is a label"
-    ...
-</source>
-<p>You can access this variable on a JSP, for instance by using a &lt;netui:label>:</p>
+<source>  private String firstName;
+    
+  public String getFirstName() { 
+      return firstName;
+  }
+
+  public void setFirstName(String aStr) { 
+      firstName = aStr; 
+  }</source>
+
+<p>You can access this variable on a JSP, for instance, you can bind the 
+	value to a netui:label as is shown next:</p>
+
+<source>&lt;netui:label value="${pageFlow.firstName}" /></source>
 
-<source>&lt;netui:label value="{pageFlow.labelName}" /></source>
 
-<p>The variable is read-write and can be changed, for instance in the controller's action 
+<p>In the example the method getFirstName is used to provide read access to the variable. 
+	The variable is read-write and can be changed, for instance in the controller's action 
 	method as is shown in the next example:</p>
 
 <source>
@@ -286,7 +302,7 @@
 public Forward labelAction(NameActionForm form)
 {
     ...
-    labelName = "Default Label";
+    firstName = "Default Name";
     return new Forward( "success");
 }
 </source>
@@ -294,42 +310,14 @@
 <p>It can also be changed in a JSP by using a form, as is shown next:</p>
 
 <source>  &lt;netui:form action="submitAction">
-      &lt;netui:textBox dataSource="{pageFlow.labelName}"/>
+      &lt;netui:textBox dataSource="pageFlow.firstName"/>
       ...
       &lt;netui:button value="submit"/>
   &lt;/netui:form></source>
 
-<p>In this example, the text box will display the current value of the pageFlow's labelName 
-variable when the form is first loaded, and upon submit the variable will hold the new 
-value the user entered.</p>
-
-<p><strong>Accessing Page Flow Properties</strong></p>
-
-<p>In the example used above, the page flow property was defined as a public member variable 
-	in the page flow controller class. Alternatively you can define a private variable and 
-	provide access with a getter and setter method, as is shown in the following example:</p>
-
-<source>  private String firstName;
-    
-  public String getFirstName() { 
-      return firstName;
-  }
-
-  public void setFirstName(String aStr) { 
-      firstName = aStr; 
-  }</source>
-
-<p>You can access this variable on a JSP exactly like before. For instance, you can bind the 
-	value to a netui:label as is shown next:</p>
-
-<source>&lt;netui:label value="{pageFlow.firstName}" /></source>
-
-<p>In the example the method getFirstName is used to provide read access to the variable. </p>
-
 <p>You can also define and access variables that are part of an object created in the 
-	controller class. You can provide access by using getter and setter methods, or 
-	by referencing the object and property name. The latter option is shown next. 
-	For instance, if the JPF file contains the code:</p>
+	controller class. You can provide this access by  again using getter and setter 
+	methods. For instance, if the JPF file contains the code:</p>
 
 <source>public class dataFlowController extends PageFlowController
 {
@@ -339,12 +327,19 @@
     public class Names implements Serializable {
         public String firstName;
         public String lastName;
+
+        public String getFirstName(){
+            return firstName;
+        }
+        public String getLastName(){
+            return lastName;
+        }
     }
     ...</source>
 
 <p>You can access the firstName property in a JSP like this:</p>
 
-<source>&lt;netui:label value="{pageFlow.myNames.firstName}" /></source>
+<source>&lt;netui:label value="${pageFlow.myNames.firstName}" /></source>
 
 <p>The comments in this section regarding access of page flow properties also apply to 
 	properties defined to the <a href="#sharedFlow"><code>sharedFlow</code></a> context.</p>
@@ -377,7 +372,7 @@
 
 <p>then, you can read the data onto a JSP page as follows:</p>
 
-<source>&lt;netui:content value="{sessionScope.myAttributeKey.someProperty}">&lt;/netui:content></source>
+<source>&lt;netui:content value="${sessionScope.myAttributeKey.someProperty}">&lt;/netui:content></source>
 				
 			</section>
 			<section id="sharedFlow">
@@ -397,6 +392,9 @@
 {
     public String defaultText = "Please Define";
 
+    public String getDefaultText(){
+        return defaultText;
+    }
     ...
 }
 </source>
@@ -413,9 +411,9 @@
 ...
 }</source>	
 	
-<p>you can use the databinding context <code>shareFlow</code> in a JSP file:</p>
+<p>you can use the databinding context <code>sharedFlow</code> in a JSP file:</p>
 
-<source>&lt;netui:textBox dataSource="{actionForm.firstName}" defaultValue="{sharedFlow.specificSharedFlow.defaultText}"/></source>
+<source>&lt;netui:textBox dataSource="actionForm.firstName" defaultValue="${sharedFlow.specificSharedFlow.defaultText}"/></source>
 
 <p>Notice that the &lt;netui:textBox> tag in the example binds to a form bean to post data and 
 	binds to sharedFlow's defaultText to receive its default value.</p>			
@@ -431,13 +429,13 @@
            <p>where specificSharedFlow was the name given to the sharedFlow in the JPF 
 			annotation <code>Jpf.SharedFlowRef</code>.</p>
 			</section>
-			<section id="url">
+			<section id="param">
 				<title>
-					<code>url</code>
+					<code>param</code>
 				</title>
 			</section>
 		</section>
 		<section id="related"><title>Related Topics</title>
 			<p>For more information on the JSP 2.0 Expression Language, see <a href="http://www.onjava.com/pub/a/onjava/2003/11/05/jsp.html" class="fork">JSP 2.0: The New Deal, Part 1</a></p></section>
 	</body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml Tue May 24 15:13:38 2005
@@ -823,7 +823,7 @@
 			</section>-->
         <section id="filtering">
             <title>Filtering a Data Grid</title>
-	<p>[todo]</p>
+	<p>To be completed<!--[todo]--></p>
 		<!--<p>A filter is specified using three bits of information - the filter expression, 
 		the filter operation, and the filter value.  The filter expression is specified 
 		as an attribute on a grid's header cell and is used to loosely couple the filetr 
@@ -838,7 +838,7 @@
         </section>
         <section id="sorting">
             <title>Sorting a Data Grid</title>
-			<p>[todo]</p>
+			<p>To be completed<!--[todo]--></p>
 <!--<p>A sort is specified using two bits of information - the sort expression and the sort 
 	direction.  The sort expression is specified as an attribute on a grid's header cell 
 	and is used to loosely couple the sort information for the header from the data displayed 
@@ -862,8 +862,9 @@
 	<li>descending > no sort</li>
 </ul>-->
         </section>
-        <section><title>Nesting Data Grids</title></section>
-			</section>
+        <section><title>Nesting Data Grids</title>
+		<p>To be completed<!--[todo]--></p>
+	  </section>
 <!--		<section id="sample_code">
 			<title>Sample Code</title>
 			
@@ -1002,6 +1003,6 @@
         &lt;/blockquote>
     &lt;/netui-template:section>
 &lt;/netui-template:template></source>
-		</section>-->
+		</section>--></section>
 </body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_jsp.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_jsp.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_jsp.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_jsp.xml Tue May 24 15:13:38 2005
@@ -40,7 +40,7 @@
     <title>Starting a JPF JSP</title>
 
     <p>
-    As with <a href="pageflow_controllers.html">Page Flow Controller</a>, a certain amount
+    As with <a href="pageflow_controllers.html">Page Flow Controllers</a>, a certain amount
     of common boilerplate text is required in each page.  The first two lines should set
     the content-type, the encoding, and import the base netui tag library.  The <code>taglib</code>
     binds the netui tags to the <code>netui</code> prefix.
@@ -131,7 +131,7 @@
 
     <p>
     The <code>&lt;netui:anchor&gt;</code> tag parallels the <code>&lt;a&gt;</code>
-    tag but uses an <code>action</code> attribute instead of an <code>href</code>.
+    tag but is able to use an <code>action</code> attribute instead of an <code>href</code>.
     Instead of specifying the URL to another page, the name of the method
     on the controller class is used, without parenthesis.
     </p>
@@ -244,7 +244,7 @@
 <strong>&lt;netui:form action="processLogin" method="POST"&gt;
   &lt;netui:textBox dataSource="actionForm.username" size="20"/&gt;
   &lt;netui:textBox dataSource="actionForm.password" size="20" password="true"/&gt;
-  &lt;netui:button  dataSource="actionForm.submit" value="Login"/&gt;
+  &lt;netui:button  type="submit" value="Login"/&gt;
 &lt;/netui:form&gt;</strong>
 </source>
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml Tue May 24 15:13:38 2005
@@ -35,7 +35,7 @@
     <p><strong>Page Flows are Stateful</strong></p>
     <p>When a user enters a Page Flow (by calling an URL in the Page Flow's URL space), an instance of the 
 		Page Flow's controller class is created.  While the user is in the Page Flow, the controller class 
-		stores the accumulated flow-related state in member variables of the conroller class. 
+		stores the accumulated flow-related state in member variables of the controller class. 
 		The methods within the class have access to the 
 		accumulated state, making for easy state management within the web application.  For example, 
 		suppose your web application calls for a multi-page registration, where the user moves from page to 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml Tue May 24 15:13:38 2005
@@ -235,14 +235,14 @@
           &lt;/netui:configurePopup></strong>
       &lt;/netui:button></source>
 		</section>
-		<section id="retrievePopupOutputTag"><title>The &lt;netui:retrievePopupOutput</title>
+		<section id="retrievePopupOutputTag"><title>The &lt;netui:retrievePopupOutput></title>
 			<p>To access values returned by the nested page flow use the <a href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/retrievePopupOutput.html">&lt;netui:retrievePopupOutput></a> tag,
 for example,</p>
 			<source>&lt;netui:retrievePopupOutput dataSource="outputFormBean.color" tagIdRef="colorField"/></source>
 			<p>Include multiple instances of the tag to set multiple fields.</p>
 			<p><strong>Note</strong> - the &lt;netui:retrievePopupOutput> tag must be nested inside 
 				the &lt;netui:configurePopup> tag even if the &lt;netui:configurePopup> tag has no attributes</p>
-			<p>The &lt;netui:configurePopup> tag has two attributes, <code>dataSource</code>
+			<p>The &lt;netui:retrievePopupOutput> tag has two attributes, <code>dataSource</code>
 				and <code>tagIdRef</code>, both of which are required.  Both accept expressions that
 				can be evaluated at runtime.</p>
 			<p><strong>Note</strong> - '<code>outputFormBean</code>' is a special databinding context 
@@ -280,4 +280,4 @@
 					</section>
 	</section>
 	</body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml Tue May 24 15:13:38 2005
@@ -87,7 +87,7 @@
                 <p>Note: A value must be specified for exactly one of the attributes.</p>
 
                 <p><strong>@JNDIContextEnv</strong></p>
-                <p>Specifies the environment properties for the JNDI context that will be used to lookup the target EJB. This attribute is optional. If you are using an URL with the JNDI protocol or if you want to use a JNDI context with the default envirnoment properties, you do not need a specify any values for this attribute.</p>
+                <p>Specifies the environment properties for the JNDI context that will be used to lookup the target EJB. This attribute is optional. If you are using an URL with the JNDI protocol or if you want to use a JNDI context with the default environment properties, you do not need to specify any values for this attribute.</p>
 
                 <table>
                         <tr><th>Attribute</th><th>Value</th><th>Description</th></tr>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml Tue May 24 15:13:38 2005
@@ -258,7 +258,7 @@
      </section>
 
      <section>
-             <title>Invoking Stored Procedures With the Jdbc Control</title>
+             <title>Invoking Stored Procedures with the Jdbc Control</title>
 
              <p>The following topics explain how to call and create stored procedures with the Jdbc Control.</p>
              <section>
@@ -287,7 +287,7 @@
     void call_sp_updateCust(short keyVal, int intVal);
                     </source>
 
-                    <p><strong>The method parameters are substituted into the procedure call using the curly brace substition syntax.</strong></p>
+                    <p><strong>The method parameters are substituted into the procedure call using the curly brace substitution syntax.</strong></p>
 
                     <p>If you are calling this stored procedure against a Sybase database, you must include curly braces around the stored procedure call. For Sybase, the annotation value should look like this:</p>
 
@@ -973,7 +973,7 @@
                             the JDBC default type for the database column.</p>
             </section>
             <section>
-                    <title>Returning a Resultset</title>
+                    <title>Returning a ResultSet</title>
 
                     <p>The Jdbc control is designed to allow you to obtain data from a database in a variety of ways without 
                             having to understand the classes in the java.sql package. If you and your users do understand 
@@ -1141,7 +1141,7 @@
                 <p>This topic describes how to write methods on a Jdbc control that return a RowSet from the database.  
                         Since the RowSet implementations provided by the JDK are part of the javax.sql package the 
                         JdbcControl does not support any of them by default.  A sample ResultSetMapper for RowSet's is 
-                        included as part of the Jdbc Control's distribution but must be explicity set in the @SQL 
+                        included as part of the Jdbc Control's distribution but must be explicitly set in the @SQL 
                         annotation in order to be invoked.</p>
 
                 <p>The DefaultRowSetResultSetMapper will create a javax.sql.CachedRowSetImpl.  The following example 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsDoc.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsDoc.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsDoc.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsDoc.xml Tue May 24 15:13:38 2005
@@ -14,7 +14,7 @@
                     are transparently managed by the controls relieving the developer of that responsibility.</p>
 
             <p>In the example below, the OrderQueue control class has one submitOrder() method that takes an 
-                    Order object as the body and a string that sets the'DeliverBy' property in the 
+                    Order object as the body and a string that sets the 'DeliverBy' property in the 
                     javax.jms.ObjectMessage to be sent to the queue.orders JMS queue.</p>
 
             <source>
@@ -72,13 +72,13 @@
                     <tr><td>setJMSPriority()</td><td>Priority</td><td>String valued int or Integer</td></tr>
             </table>
 
-            <p>All other values are silently ignored (for backward compatability).</p>
+            <p>All other values are silently ignored (for backward compatibility).</p>
     </section>
 
     <section>
             <title>Extension Class Annotation</title>
 
-            <p>The is one TYPE/FIELD level annotation is:</p>
+            <p>The one TYPE/FIELD level annotation is:</p>
 
             <ul>
                     <li>@Destination - defines the destination of the message, the message type and 
@@ -123,7 +123,7 @@
                     <li>@CorrelationId - the string valued attribute determines the correlation id.</li>
 
                     <li>@Properties( PropertyValue[] ) - One or more string/int/long valued properties to be added 
-                            to the message. PropertyValue has the string valued attributes 'name','value' and class 
+                            to the message. PropertyValue has the string valued attributes 'name', 'value' and class 
                             valued 'type'. The allowed values for 'type' are String.class, Integer.class and Long.class. 
                             If not given then 'String.class' is assumed.</li>
             </ul>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/wsm_JWSFiles.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/wsm_JWSFiles.xml?rev=178300&r1=178299&r2=178300&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/wsm_JWSFiles.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/wsm_JWSFiles.xml Tue May 24 15:13:38 2005
@@ -174,7 +174,7 @@
   &lt;/complexType>
 &lt;/element>
 </source>
-				<p>Changing the method invoked...[todo: doable?]</p>
+				<p><!--Changing the method invoked...[todo: doable?]--></p>
 			</section>
 			<section id="at_webresult"><title>@WebResult</title>
 				<p>[todo]</p></section>