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 2004/11/12 04:49:00 UTC

svn commit: rev 57498 - in incubator/beehive/site: build/site build/site/controls build/site/pageflow build/site/wsm src/documentation/content/xdocs src/documentation/content/xdocs/controls src/documentation/content/xdocs/pageflow src/documentation/content/xdocs/wsm

Author: steveh
Date: Thu Nov 11 19:48:59 2004
New Revision: 57498

Modified:
   incubator/beehive/site/build/site/controls/sample_controls-db.html
   incubator/beehive/site/build/site/faq.html
   incubator/beehive/site/build/site/jpetstore.html
   incubator/beehive/site/build/site/pageflow/guide.html
   incubator/beehive/site/build/site/pageflow/pageflow_overview.html
   incubator/beehive/site/build/site/wsm/sample_Dashboard.html
   incubator/beehive/site/build/site/wsm/tutorial_wsm.html
   incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml
   incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml
   incubator/beehive/site/src/documentation/content/xdocs/pageflow/guide.xml
   incubator/beehive/site/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
   incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
   incubator/beehive/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
Log:
Fix for BEEHIVE-83: WSM tutorial needs to be updated.
Includes other misc. edits.
     

Modified: incubator/beehive/site/build/site/controls/sample_controls-db.html
==============================================================================
--- incubator/beehive/site/build/site/controls/sample_controls-db.html	(original)
+++ incubator/beehive/site/build/site/controls/sample_controls-db.html	Thu Nov 11 19:48:59 2004
@@ -295,9 +295,6 @@
 </li>
 </ul>
 </li>
-<li>
-<a href="#Distributing+the+Database+Control">Distributing the Database Control</a>
-</li>
 </ul>
     
 <a name="N1000C"></a><a name="Control+Programming%3A+Simplifying+Access+to+Resources"></a>
@@ -408,19 +405,16 @@
 <ul>
         
 <li>Metadata annotations: reduces configuring the control for resource access to a matter of setting properties throught annotations.  To a client, the control appears as a JavaBean that is instantiated and operated upon for resource access.  Base controls configure the container using annotations.  Control extensions configure the base.</li>
-        
-<li>events (<a href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</a>)</li>
-        
-<li>resource management (<a href="http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management">http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management</a>).... [todo]</li>
+<!--        <li>events (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</link>)</li>
+        <li>resource management (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management">http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management</link>).... [todo]</li>
+-->
     
 </ul>
 </div>
-    
-<a name="N10049"></a><a name="Distributing+the+Database+Control"></a>
-<h3>Distributing the Database Control</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>[todo]</p>
-</div>
+<!--    <section>
+        <title>Distributing the Database Control</title>
+        <p>[todo]</p>
+    </section>-->
     
 <div class="attribution"></div>
 </div>

Modified: incubator/beehive/site/build/site/faq.html
==============================================================================
--- incubator/beehive/site/build/site/faq.html	(original)
+++ incubator/beehive/site/build/site/faq.html	Thu Nov 11 19:48:59 2004
@@ -307,12 +307,16 @@
 <li>
 <a href="#controls">What are controls? </a>
 </li>
+        
+<li>
+<a href="#commons_att">Does Beehive Support Commons Attributes? </a>
+</li>
       
 </ol>
 </div>
 
 
-<a name="N10029"></a><a name="General"></a>
+<a name="N1002E"></a><a name="General"></a>
 <h3>General</h3>
 <div style="margin-left: 0 ; border: 2px">
 <dl>
@@ -347,6 +351,14 @@
           model, and a configuration model using JSR 175 annotations. To find 
           out more about controls look at
 	  <a href="./Controls.html">Controls</a>.</dd>
+      
+</dl>
+<dl>
+        
+<dt>Does Beehive Support Commons Attributes?</dt>
+        
+<dd>
+<a name="commons_att"></a>Since Beehive is depends on JDK1.5, which already contains support for JSR 175 annotations, support for commons-attributes is not a goal for Beehive.</dd>
       
 </dl>
 </div>

Modified: incubator/beehive/site/build/site/jpetstore.html
==============================================================================
--- incubator/beehive/site/build/site/jpetstore.html	(original)
+++ incubator/beehive/site/build/site/jpetstore.html	Thu Nov 11 19:48:59 2004
@@ -392,7 +392,8 @@
 <tr>
                     
 <td colspan="1" rowspan="1">&nbsp;&nbsp;&nbsp;&nbsp;webappRoot</td>
-                    <td colspan="1" rowspan="1">[todo]</td>
+                    <td colspan="1" rowspan="1">
+<!--[todo]--></td>
                 
 </tr>
                 
@@ -531,10 +532,14 @@
 <a name="N10188"></a><a name="Start+Tomcat"></a>
 <h4>Start Tomcat</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>To start Tomcat, run the following Ant command:</p>
+<p>To start Tomcat, run the following command:</p>
 <pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
+<p>You can also start Tomcat by running the following Ant command, provided in the buildWebapp.xml file:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</pre>
+<p>
+<strong>Note:</strong> if you use the second of these methods for starting Tomcat, you will have to enter Ctrl+C into the command shell to enter any further commands.</p>
 </div>
-<a name="N10197"></a><a name="Deploying+to+Tomcat+and+Running%0A"></a>
+<a name="N101A4"></a><a name="Deploying+to+Tomcat+and+Running%0A"></a>
 <h4>Deploying to Tomcat and Running
 </h4>
 <div style="margin-left: 0 ; border: 2px">

Modified: incubator/beehive/site/build/site/pageflow/guide.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/guide.html	(original)
+++ incubator/beehive/site/build/site/pageflow/guide.html	Thu Nov 11 19:48:59 2004
@@ -299,15 +299,6 @@
 <li>
 <a href="#submit">Submitting Data: Form Beans and Data Binding</a>
 </li>
-<li>
-<a href="#controls">Accessing Back-End Resources with Controls</a>
-</li>
-<li>
-<a href="#validation">Validation</a>
-</li>
-<li>
-<a href="#security">Security</a>
-</li>
 </ul>
         
 <a name="N1000C"></a><a name="intro"></a>
@@ -360,7 +351,6 @@
 	<!-- Render a link that invokes the toPageB method -->
 	&lt;netui:anchor <strong>action="toPageB"</strong>&gt;Link to page_B.jsp&lt;/netui:anchor&gt;
 </pre>
-<p>(When pageA.jsp is viewed in a broswer, the &lt;netui:anchor&gt; tag is rendered as ordinary HTML, with associated JavaScript which handles the invocation.... [todo] )</p>
 <p>Suppose the link above is clicked.  When clicked, the following method, <span class="codefrag">toPageB</span>, is invoked.</p>
 <p>The method below, when invoked, navigates the user to pageB.jsp.  The code within the method body is very simple: upon invocation, the method immediately returns a Forward object, with the String parameter "success".  The code <em>above</em> the method does the real work of determining the navigational target.  The code above the method consists of two metadata annotations.  "Metadata" means that the annotation configures or sets a property on some part of the Java code.  In the example below, the @Jpf.Action annotation makes the method available to invocation (by netui tags), while the @Jpf.Forward annotation configures the navigation information.  In the this case the method it configured to navigate to pageB.jsp whenever it is invoked.  </p>
 <p>
@@ -380,9 +370,6 @@
     {
         return new Forward("success");
     }</pre>
-<p>Metadata annotations are typically compiled into XML configuration files, or some other post-compilation artifact.  Sometimes the artifacts are very complex, as in the case of the @WebService annotation.  But in other case the post-compilation artifact is simple: for example, the @jpf:forward annotation compiles into an entry in the [todo] configuration file.</p>
-<p>The first annotation, <span class="codefrag">@jpf:action</span>, declares that method is an Action method.  Action methods are ...[todo]</p>
-<p>The second annotation, <span class="codefrag">@jpf:forward</span>, configures the [todo].  As a result, at runtime, when the toPageB method is invoked (say by the clicking of a &lt;netui:anchor&gt; tag), the [todo] configuration file is consulted, and the user is navigated to pageB.jsp.</p>
 <p>
                 
 <strong>Changing the Navigation Target</strong>
@@ -433,7 +420,7 @@
 </p>
 </div>
         
-<a name="N100C9"></a><a name="submit"></a>
+<a name="N100BB"></a><a name="submit"></a>
 <h3>Submitting Data: Form Beans and Data Binding</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -555,18 +542,16 @@
 
 </p>
 </div>
-        
-<a name="N100D5"></a><a name="controls"></a>
-<h3>Accessing Back-End Resources with Controls</h3>
-<div style="margin-left: 0 ; border: 2px"></div>
-        
-<a name="N100DC"></a><a name="validation"></a>
-<h3>Validation</h3>
-<div style="margin-left: 0 ; border: 2px"></div>
-        
-<a name="N100E3"></a><a name="security"></a>
-<h3>Security</h3>
-<div style="margin-left: 0 ; border: 2px"></div>
+<!--        <section id="controls">
+            <title>Accessing Back-End Resources with Controls</title>
+        </section>
+        <section id="validation">
+            <title>Validation</title>
+        </section>
+        <section id="security">
+            <title>Security</title>
+        </section>
+    -->
     
 <div class="attribution"></div>
 </div>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_overview.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_overview.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_overview.html	Thu Nov 11 19:48:59 2004
@@ -291,15 +291,32 @@
 <a href="#introduction">Introduction</a>
 </li>
 <li>
-<a href="#logical_flow">The Logical Flow</a>
+<a href="#Some+Page+Flow+Features">Some Page Flow Features</a>
+<ul class="minitoc">
+<li>
+<a href="#Declarative+Programming">Declarative Programming</a>
 </li>
 <li>
-<a href="#implementation_of_flow">The Implementation of the Flow</a>
+<a href="#Page+Flows+are+Stateful">Page Flows are Stateful</a>
+</li>
+<li>
+<a href="#Shared+Flow">Shared Flow</a>
 </li>
 <li>
 <a href="#URL+Addressable+%5Btodo%2C+JIRA+82%5D">URL Addressable [todo, JIRA 82]</a>
 </li>
 <li>
+<a href="#Struts+Integration">Struts Integration</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#logical_flow">The Logical Flow</a>
+</li>
+<li>
+<a href="#implementation_of_flow">The Implementation of the Flow</a>
+</li>
+<li>
 <a href="#next">Next...</a>
 </li>
 </ul>
@@ -317,8 +334,34 @@
     </p>
 </div>
 
+<a name="N10016"></a><a name="Some+Page+Flow+Features"></a>
+<h3>Some Page Flow Features</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Here are a few of the advantages of developing web applications with Page Flows.</p>
+<a name="N1001F"></a><a name="Declarative+Programming"></a>
+<h4>Declarative Programming</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>Many common web app programming tasks are accomplished through a declarative programming model using JSR 175 metadata annotations, a new feature in JKD5.  JSR 175 metadata annotations, "annotations" for short, are property setters for Java classes and methods, aliviating the need for independent configuration files. Navigation, exception handling, validation, and other tasks become configurable properties of a single Java class, the "controller" class that drives the web application.</p>
+</div>
+<a name="N10029"></a><a name="Page+Flows+are+Stateful"></a>
+<h4>Page Flows are Stateful</h4>
+<div style="margin-left: 0 ; border: 2px"></div>
+<a name="N10030"></a><a name="Shared+Flow"></a>
+<h4>Shared Flow</h4>
+<div style="margin-left: 0 ; border: 2px"></div>
+<a name="N10037"></a><a name="URL+Addressable+%5Btodo%2C+JIRA+82%5D"></a>
+<h4>URL Addressable [todo, JIRA 82]</h4>
+<div style="margin-left: 0 ; border: 2px"></div>
+<a name="N1003E"></a><a name="Struts+Integration"></a>
+<h4>Struts Integration</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>Page Flows are built on top of Apache Struts 1.1.  Each Page Flow is compiled into a Struts module.  As a result, Page Flow and Struts applications can work closely together.</p>
+<p>Struts and Page Flow apps can co-habitate and interact with one another inside a web app.  To forward from a Page Flow to a (pure) Struts module, simply forward to the desired action within the Struts module.  The same goes for the reverse direction: from a Struts module, simply configure an action to point to the desired method in the Page Flow.  <!--[todo: detailed doc based on R. Feit's: http://dev2dev.bea.com/products/wlworkshop81/articles/Feit.jsp]--></p>
+<p>You can use many advanced Struts features within a Page Flow, for example, the StrutsValidatorPlugIn, which allows you to declare validation rules inside an XML file.  Page Flows do not directly support the plug-in, but you can refer your data to a Struts app that does support the plug-in by using the <strong>Struts merge</strong> feature of Page Flows. <!-- [todo: detailed doc based on R. Feit's: http://dev2dev.bea.com/products/wlworkshop81/articles/Feit.jsp] --> </p>
+</div>
+</div>
   
-<a name="N10016"></a><a name="logical_flow"></a>
+<a name="N10055"></a><a name="logical_flow"></a>
 <h3>The Logical Flow</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -397,7 +440,7 @@
 </div>
 
   
-<a name="N1006F"></a><a name="implementation_of_flow"></a>
+<a name="N100AE"></a><a name="implementation_of_flow"></a>
 <h3>The Implementation of the Flow</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -469,7 +512,7 @@
     </p>
 <p>
       
-<img alt="implementation page flow" height="342" src="images/impl-flow-1.png" width="621">
+<img alt="implementation page flow" src="images/impl-flow-1.png">
     </p>
 <p>
     Now it is apparent that to navigation from <span class="codefrag">index.jsp</span> to <span class="codefrag">mypage.jsp</span>,
@@ -479,11 +522,7 @@
     </p>
 </div>
   
-<a name="N100E4"></a><a name="URL+Addressable+%5Btodo%2C+JIRA+82%5D"></a>
-<h3>URL Addressable [todo, JIRA 82]</h3>
-<div style="margin-left: 0 ; border: 2px"></div>
-  
-<a name="N100EB"></a><a name="next"></a>
+<a name="N10121"></a><a name="next"></a>
 <h3>Next...</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/beehive/site/build/site/wsm/sample_Dashboard.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_Dashboard.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_Dashboard.html	Thu Nov 11 19:48:59 2004
@@ -300,6 +300,9 @@
 <a href="#Setting+up+the+Environment">Setting up the Environment</a>
 </li>
 <li>
+<a href="#Start+Tomcat">Start Tomcat</a>
+</li>
+<li>
 <a href="#Undeploy+Petstore">Undeploy Petstore</a>
 </li>
 <li>
@@ -366,13 +369,23 @@
 </pre>
 <p>After editing the file, open a command shell and run <span class="codefrag">beehiveUser.cmd|sh</span>.</p>
 </div>
-<a name="N10073"></a><a name="Undeploy+Petstore"></a>
+<a name="N10073"></a><a name="Start+Tomcat"></a>
+<h4>Start Tomcat</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>To start Tomcat, run the following command:</p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
+<p>You can also start Tomcat by running the following Ant command, provided in the buildWebapp.xml file:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</pre>
+<p>
+<strong>Note:</strong> if you use the second of these methods for starting Tomcat, you will have to enter Ctrl+C into the command shell to enter any further commands.</p>
+</div>
+<a name="N1008F"></a><a name="Undeploy+Petstore"></a>
 <h4>Undeploy Petstore</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>If you have previously deployed Petstore, you must undeploy it now.  (This allows you to recompile the Petstore source, which occurs in the next step.)</p>
 <pre class="code">  ant -Dwebapp.dir=BEEHIVE_HOME/samples/petstoreWeb -Dcontext.path=petstoreWeb -f ant/buildWebapp.xml undeploy</pre>
 </div>
-<a name="N10082"></a><a name="Download+Required+JAR+Files"></a>
+<a name="N1009E"></a><a name="Download+Required+JAR+Files"></a>
 <h4>Download Required JAR Files</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p> Before you can build Petstore Dashboard you must download 1) activation.jar and 2) mailapi.jar.</p>
@@ -387,7 +400,7 @@
 <p>and</p>
 <pre class="code">    BEEHIVE_HOME/samples/petstoreWeb/WEB-INF/lib</pre>
 </div>
-<a name="N100BA"></a><a name="Initialize%2C+Build+and+Deploy+Petstore"></a>
+<a name="N100D6"></a><a name="Initialize%2C+Build+and+Deploy+Petstore"></a>
 <h4>Initialize, Build and Deploy Petstore</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To build and deploy Petstore, enter the following Ant command:</p>

Modified: incubator/beehive/site/build/site/wsm/tutorial_wsm.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/tutorial_wsm.html	(original)
+++ incubator/beehive/site/build/site/wsm/tutorial_wsm.html	Thu Nov 11 19:48:59 2004
@@ -320,9 +320,6 @@
 <a href="#step_2">Step 2: Install the Web Service Template</a>
 <ul class="minitoc">
 <li>
-<a href="#Introduction">Introduction</a>
-</li>
-<li>
 <a href="#Make+a+Project+Folder">Make a Project Folder</a>
 </li>
 <li>
@@ -360,7 +357,7 @@
 <a href="#Step+4%3A+Add+a+Non-Web+Invokable+Method">Step 4: Add a Non-Web Invokable Method</a>
 <ul class="minitoc">
 <li>
-<a href="#Compile+and+Redeploy+the+Web+Service-N101FC">Compile and Redeploy the Web Service</a>
+<a href="#Compile+and+Redeploy+the+Web+Service-N101EB">Compile and Redeploy the Web Service</a>
 </li>
 <li>
 <a href="#To+Test+the+Non-Web+Invokable+Method">To Test the Non-Web Invokable Method</a>
@@ -472,12 +469,7 @@
 <a name="N100DA"></a><a name="step_2"></a>
 <h3>Step 2: Install the Web Service Template</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100E0"></a><a name="Introduction"></a>
-<h4>Introduction</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>[todo]</p>
-</div>
-<a name="N100EA"></a><a name="Make+a+Project+Folder"></a>
+<a name="N100E2"></a><a name="Make+a+Project+Folder"></a>
 <h4>Make a Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>On your C: drive, create a directory called <span class="codefrag">beehive_projects</span>.</p>
@@ -487,7 +479,7 @@
   beehive_projects
     ws_tutorial</pre>
 </div>
-<a name="N10105"></a><a name="To+Copy+the+Web+Services+Application+Template"></a>
+<a name="N100FD"></a><a name="To+Copy+the+Web+Services+Application+Template"></a>
 <h4>To Copy the Web Services Application Template</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will copy the Web Services project template into your project folder.  The project template contains a simple web service and a test JSP page.</p>
@@ -504,7 +496,7 @@
       happyaxis.jsp
       index.html</pre>
 </div>
-<a name="N10133"></a><a name="Copy+the+Runtime+JARs+into+the+Project+Folder"></a>
+<a name="N1012B"></a><a name="Copy+the+Runtime+JARs+into+the+Project+Folder"></a>
 <h4>Copy the Runtime JARs into the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To copy the runtime JARs into your project, run the following Ant command:</p>
@@ -514,7 +506,7 @@
   deploy.wsm.webapp.runtime</pre>
 <p>This will copy the JAR files from <span class="codefrag">BEEHIVE_HOME/lib/wsm</span> into <span class="codefrag">C:/beehive_projects/ws_tutorial/WEB-INF/lib</span>.</p>
 </div>
-<a name="N1014B"></a><a name="Examine+the+Blank.jws+Web+Service"></a>
+<a name="N10143"></a><a name="Examine+the+Blank.jws+Web+Service"></a>
 <h4>Examine the Blank.jws Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile and run your web service.</p>
@@ -541,14 +533,14 @@
 <p>
 <span class="codefrag">@WebService</span> and <span class="codefrag">@WebMethod</span> are "metadata annotations", a.k.a. "annotations".  Annotations allow you to set properties on Java classes and methods.  They can be used to generate compile-time artifacts such as configuration files or Java classes (this is how many Beehive Control annotations work) or to determine some runtime behavior (this is how Beehive Web Service annotations work).  <span class="codefrag">@WebService</span> annotates (or "decorates") the class Blank: this tells the runtime that Blank is a web service that listens for SOAP messages and responds in kind.  <span class="codefrag">@WebMethod</span> annotates the method sayHelloWorld(): this tells the runtime that the method can be invoked over the web.</p>
 </div>
-<a name="N10176"></a><a name="Compile+and+Deploy+the+Web+Service"></a>
+<a name="N1016E"></a><a name="Compile+and+Deploy+the+Web+Service"></a>
 <h4>Compile and Deploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will compile the web service and deploy it to Tomcat, all in one step.</p>
 <p>Run the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp deploy</pre>
 </div>
-<a name="N10188"></a><a name="To+Run+the+Web+Service+Provided+in+the+Template"></a>
+<a name="N10180"></a><a name="To+Run+the+Web+Service+Provided+in+the+Template"></a>
 <h4>To Run the Web Service Provided in the Template</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the index.jsp page: <a target="_blank" href="http://localhost:8080/ws_tutorial/index.jsp">http://localhost:8080/ws_tutorial/index.jsp</a>.</p>
@@ -558,10 +550,10 @@
 </div>
 </div>
         
-<a name="N101A0"></a><a name="step_3"></a>
+<a name="N10198"></a><a name="step_3"></a>
 <h3>Step 3: Add a Parameterized Method to the Web Service</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N101A6"></a><a name="Edit+the+JWS+File"></a>
+<a name="N1019E"></a><a name="Edit+the+JWS+File"></a>
 <h4>Edit the JWS File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p></p>
@@ -582,7 +574,7 @@
     }
     
     @WebMethod
-    public String sayHello( @WebParam(name="greetee") String greetee ) 
+    public String sayHello( @WebParam String greetee ) 
     {
         
         if( greetee.equals("") )
@@ -592,16 +584,16 @@
     
     }
 }</pre>
-<p>The <span class="codefrag">@WebParam</span> you just added lets you pass a String parameter to the method over the web.  The <span class="codefrag">name="greetee"</span> attribute is optional.  If you do not explicitly specify a <span class="codefrag">name</span> attribute, the parameter will take the default name <span class="codefrag">str0</span> [&lt;--- todo: verify].</p>
+<p>The <span class="codefrag">@WebParam</span> you just added lets you pass a String parameter to the method over the web.</p>
 </div>
-<a name="N101C9"></a><a name="Compile+and+Redeploy+the+Web+Service"></a>
+<a name="N101B8"></a><a name="Compile+and+Redeploy+the+Web+Service"></a>
 <h4>Compile and Redeploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 <p>This Ant command compiles the app, undeploys it, and then deploys it.  Calling <span class="codefrag">ant ... redeploy</span> is equivalent to calling <span class="codefrag">ant ... undeploy deploy</span>.</p>
 </div>
-<a name="N101E1"></a><a name="Test+the+Parameterized+Method"></a>
+<a name="N101D0"></a><a name="Test+the+Parameterized+Method"></a>
 <h4>Test the Parameterized Method</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>
@@ -618,7 +610,7 @@
 </div>
 </div>
         
-<a name="N101F7"></a><a name="Step+4%3A+Add+a+Non-Web+Invokable+Method"></a>
+<a name="N101E6"></a><a name="Step+4%3A+Add+a+Non-Web+Invokable+Method"></a>
 <h3>Step 4: Add a Non-Web Invokable Method</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Edit the file <span class="codefrag">C:/beehive_projects/ws_tutorial/WEB-INF/src/template/Blank.jws</span> so it appears as follows.</p>
@@ -655,14 +647,14 @@
 }
 </pre>
 <p>Note that the method added, sayNothingOverTheWeb(), does not have the annotation @WebMethod, indicating that it cannot be invoked by SOAP messages over the web.</p>
-<a name="N1020B"></a><a name="Compile+and+Redeploy+the+Web+Service-N101FC"></a>
+<a name="N101FA"></a><a name="Compile+and+Redeploy+the+Web+Service-N101EB"></a>
 <h4>Compile and Redeploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 <p>This Ant command compiles the app, undeploys it, and then deploys it.  Calling <span class="codefrag">ant ... redeploy</span> is equivalent to calling <span class="codefrag">ant ... undeploy deploy</span>.</p>
 </div>
-<a name="N10223"></a><a name="To+Test+the+Non-Web+Invokable+Method"></a>
+<a name="N10212"></a><a name="To+Test+the+Non-Web+Invokable+Method"></a>
 <h4>To Test the Non-Web Invokable Method</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>
@@ -680,7 +672,7 @@
   &lt;/soapenv:Body&gt;
 &lt;/soapenv:Envelope&gt; </pre>
 </div>
-<a name="N10238"></a><a name="Step+5%3A+Change+the+SOAP+Style"></a>
+<a name="N10227"></a><a name="Step+5%3A+Change+the+SOAP+Style"></a>
 <h4>Step 5: Change the SOAP Style</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>The default SOAP style for JSR-181 web services is DOC-literal.  In this step you will change the style to RPC-encoded.</p>
@@ -718,13 +710,13 @@
         return "Not for for Web consumption!";
     }
 }</pre>
-<a name="N1024C"></a><a name="Compile+and+Redeploy+the+Web+Service-N1023A"></a>
+<a name="N1023B"></a><a name="Compile+and+Redeploy+the+Web+Service-N10229"></a>
 <h5>Compile and Redeploy the Web Service</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 </div>
-<a name="N1025B"></a><a name="To+Test+the+Non-Web+Invokable+Method-N10248"></a>
+<a name="N1024A"></a><a name="To+Test+the+Non-Web+Invokable+Method-N10237"></a>
 <h5>To Test the Non-Web Invokable Method</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>

Modified: incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml	Thu Nov 11 19:48:59 2004
@@ -108,14 +108,15 @@
 
     <ul>
         <li>Metadata annotations: reduces configuring the control for resource access to a matter of setting properties throught annotations.  To a client, the control appears as a JavaBean that is instantiated and operated upon for resource access.  Base controls configure the container using annotations.  Control extensions configure the base.</li>
-        <li>events (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</link>)</li>
+<!--        <li>events (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</link>)</li>
         <li>resource management (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management">http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management</link>).... [todo]</li>
+-->
     </ul>
     </section>
-    <section>
+<!--    <section>
         <title>Distributing the Database Control</title>
         <p>[todo]</p>
-    </section>
+    </section>-->
     </body>
     <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>

Modified: incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml	Thu Nov 11 19:48:59 2004
@@ -50,7 +50,7 @@
                 </tr>
                 <tr>
                     <td>&nbsp;&nbsp;&nbsp;&nbsp;webappRoot</td>
-                    <td>[todo]</td>
+                    <td><!--[todo]--></td>
                 </tr>
                 <tr>
                     <td>&nbsp;&nbsp;&nbsp;&nbsp;WEB-INF</td>
@@ -144,9 +144,12 @@
             </section>
             <section>
                 <title>Start Tomcat</title>
-                <p>To start Tomcat, run the following Ant command:</p>
+                <p>To start Tomcat, run the following command:</p>
                 <source>%CATALINA_HOME%\bin\startup.bat</source>
-            </section>
+                <p>You can also start Tomcat by running the following Ant command, provided in the buildWebapp.xml file:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</source>
+                <p><strong>Note:</strong> if you use the second of these methods for starting Tomcat, you will have to enter Ctrl+C into the command shell to enter any further commands.</p>
+            </section>            
             <section>
                 <title>Deploying to Tomcat and Running
 </title>

Modified: incubator/beehive/site/src/documentation/content/xdocs/pageflow/guide.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/pageflow/guide.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/pageflow/guide.xml	Thu Nov 11 19:48:59 2004
@@ -44,7 +44,7 @@
 	<!-- Render a link that invokes the toPageB method -->
 	&lt;netui:anchor <strong>action="toPageB"</strong>>Link to page_B.jsp&lt;/netui:anchor>
 </source>
-            <p>(When pageA.jsp is viewed in a broswer, the &lt;netui:anchor> tag is rendered as ordinary HTML, with associated JavaScript which handles the invocation.... [todo] )</p>
+<!--            <p>(When pageA.jsp is viewed in a broswer, the &lt;netui:anchor> tag is rendered as ordinary HTML, with associated JavaScript which handles the invocation.... [todo] )</p>-->
             <p>Suppose the link above is clicked.  When clicked, the following method, <code>toPageB</code>, is invoked.</p>
             <p>The method below, when invoked, navigates the user to pageB.jsp.  The code within the method body is very simple: upon invocation, the method immediately returns a Forward object, with the String parameter "success".  The code <em>above</em> the method does the real work of determining the navigational target.  The code above the method consists of two metadata annotations.  "Metadata" means that the annotation configures or sets a property on some part of the Java code.  In the example below, the @Jpf.Action annotation makes the method available to invocation (by netui tags), while the @Jpf.Forward annotation configures the navigation information.  In the this case the method it configured to navigate to pageB.jsp whenever it is invoked.  </p>
             <p>
@@ -62,9 +62,10 @@
     {
         return new Forward("success");
     }</source>
-            <p>Metadata annotations are typically compiled into XML configuration files, or some other post-compilation artifact.  Sometimes the artifacts are very complex, as in the case of the @WebService annotation.  But in other case the post-compilation artifact is simple: for example, the @jpf:forward annotation compiles into an entry in the [todo] configuration file.</p>
+<!--            <p>Metadata annotations are typically compiled into XML configuration files, or some other post-compilation artifact.  Sometimes the artifacts are very complex, as in the case of the @WebService annotation.  But in other case the post-compilation artifact is simple: for example, the @jpf:forward annotation compiles into an entry in the [todo] configuration file.</p>
             <p>The first annotation, <code>@jpf:action</code>, declares that method is an Action method.  Action methods are ...[todo]</p>
             <p>The second annotation, <code>@jpf:forward</code>, configures the [todo].  As a result, at runtime, when the toPageB method is invoked (say by the clicking of a &lt;netui:anchor> tag), the [todo] configuration file is consulted, and the user is navigated to pageB.jsp.</p>
+-->
             <p>
                 <strong>Changing the Navigation Target</strong>
             </p>
@@ -228,7 +229,7 @@
 -->
 </p>
         </section>
-        <section id="controls">
+<!--        <section id="controls">
             <title>Accessing Back-End Resources with Controls</title>
         </section>
         <section id="validation">
@@ -237,6 +238,7 @@
         <section id="security">
             <title>Security</title>
         </section>
+    -->
     </body>
     <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>

Modified: incubator/beehive/site/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/pageflow/pageflow_overview.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/pageflow/pageflow_overview.xml	Thu Nov 11 19:48:59 2004
@@ -18,7 +18,31 @@
     </p>
 
   </section>
+<section>
+    <title>Some Page Flow Features</title>
+    <p>Here are a few of the advantages of developing web applications with Page Flows.</p>
+  <section>
+    <title>Declarative Programming</title>
+    <p>Many common web app programming tasks are accomplished through a declarative programming model using JSR 175 metadata annotations, a new feature in JKD5.  JSR 175 metadata annotations, "annotations" for short, are property setters for Java classes and methods, aliviating the need for independent configuration files. Navigation, exception handling, validation, and other tasks become configurable properties of a single Java class, the "controller" class that drives the web application.</p>
+</section>
+<section>
+    <title>Page Flows are Stateful</title>
+    
+</section>
+<section>
+    <title>Shared Flow</title>
+</section>
+  <section>
+    <title>URL Addressable [todo, JIRA 82]</title>
+</section>
+  <section>
+    <title>Struts Integration</title>
+    <p>Page Flows are built on top of Apache Struts 1.1.  Each Page Flow is compiled into a Struts module.  As a result, Page Flow and Struts applications can work closely together.</p> 
+<p>Struts and Page Flow apps can co-habitate and interact with one another inside a web app.  To forward from a Page Flow to a (pure) Struts module, simply forward to the desired action within the Struts module.  The same goes for the reverse direction: from a Struts module, simply configure an action to point to the desired method in the Page Flow.  <!--[todo: detailed doc based on R. Feit's: http://dev2dev.bea.com/products/wlworkshop81/articles/Feit.jsp]--></p>
 
+<p>You can use many advanced Struts features within a Page Flow, for example, the StrutsValidatorPlugIn, which allows you to declare validation rules inside an XML file.  Page Flows do not directly support the plug-in, but you can refer your data to a Struts app that does support the plug-in by using the <strong>Struts merge</strong> feature of Page Flows. <!-- [todo: detailed doc based on R. Feit's: http://dev2dev.bea.com/products/wlworkshop81/articles/Feit.jsp] --> </p>
+</section>
+</section>
   <section id="logical_flow">
     <title>The Logical Flow</title>
 
@@ -148,7 +172,7 @@
     </p>
 
     <p>
-      <img src="images/impl-flow-1.png" alt="implementation page flow" width="621" height="342"/>
+      <img src="images/impl-flow-1.png" alt="implementation page flow"/>
     </p>
 
     <p>
@@ -159,9 +183,6 @@
     </p>
 
   </section>
-  <section>
-    <title>URL Addressable [todo, JIRA 82]</title>
-</section>
   <section id="next">
     <title>Next...</title>
   

Modified: incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml	Thu Nov 11 19:48:59 2004
@@ -55,6 +55,14 @@
                 <p>After editing the file, open a command shell and run <code>beehiveUser.cmd|sh</code>.</p>
             </section>
             <section>
+                <title>Start Tomcat</title>
+                <p>To start Tomcat, run the following command:</p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
+                <p>You can also start Tomcat by running the following Ant command, provided in the buildWebapp.xml file:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</source>
+                <p><strong>Note:</strong> if you use the second of these methods for starting Tomcat, you will have to enter Ctrl+C into the command shell to enter any further commands.</p>
+            </section>            
+            <section>
                 <title>Undeploy Petstore</title>
                 <p>If you have previously deployed Petstore, you must undeploy it now.  (This allows you to recompile the Petstore source, which occurs in the next step.)</p>
                 <source>  ant -Dwebapp.dir=BEEHIVE_HOME/samples/petstoreWeb -Dcontext.path=petstoreWeb -f ant/buildWebapp.xml undeploy</source>

Modified: incubator/beehive/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml	Thu Nov 11 19:48:59 2004
@@ -86,10 +86,10 @@
         </section>
         <section id="step_2">
             <title>Step 2: Install the Web Service Template</title>
-            <section>
+            <!--<section>
                 <title>Introduction</title>
                 <p>[todo]</p>
-            </section>
+            </section>-->
             <section>
                 <title>Make a Project Folder</title>
                 <p>On your C: drive, create a directory called <code>beehive_projects</code>.</p>
@@ -185,7 +185,7 @@
     }
     
     @WebMethod
-    public String sayHello( @WebParam(name="greetee") String greetee ) 
+    public String sayHello( @WebParam String greetee ) 
     {
         
         if( greetee.equals("") )
@@ -195,7 +195,7 @@
     
     }
 }]]></source>
-<p>The <code>@WebParam</code> you just added lets you pass a String parameter to the method over the web.  The <code>name="greetee"</code> attribute is optional.  If you do not explicitly specify a <code>name</code> attribute, the parameter will take the default name <code>str0</code> [&lt;--- todo: verify].</p>
+<p>The <code>@WebParam</code> you just added lets you pass a String parameter to the method over the web.</p>
             </section>
             <section>
                 <title>Compile and Redeploy the Web Service</title>