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/01 22:09:11 UTC

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

Author: steveh
Date: Mon Nov  1 13:09:10 2004
New Revision: 56281

Modified:
   incubator/beehive/site/build/site/Controls.html
   incubator/beehive/site/build/site/contributors.html
   incubator/beehive/site/build/site/controls/tutorial_controls.html
   incubator/beehive/site/build/site/downloads.html
   incubator/beehive/site/build/site/faq.html
   incubator/beehive/site/build/site/index.html
   incubator/beehive/site/build/site/jpetstore.html
   incubator/beehive/site/build/site/license.html
   incubator/beehive/site/build/site/mailinglists.html
   incubator/beehive/site/build/site/pageflow/guide.html
   incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html
   incubator/beehive/site/build/site/reference.html
   incubator/beehive/site/build/site/webservices.html
   incubator/beehive/site/build/site/wsm/sample_AddressBook.html
   incubator/beehive/site/build/site/wsm/tutorial_wsm.html
   incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
   incubator/beehive/site/src/documentation/content/xdocs/site.xml
   incubator/beehive/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
Log:
Pageflow tutorial now works from a distribution perspective, not a "source" perspective.

Modified: incubator/beehive/site/build/site/Controls.html
==============================================================================
--- incubator/beehive/site/build/site/Controls.html	(original)
+++ incubator/beehive/site/build/site/Controls.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/contributors.html
==============================================================================
--- incubator/beehive/site/build/site/contributors.html	(original)
+++ incubator/beehive/site/build/site/contributors.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/controls/tutorial_controls.html
==============================================================================
--- incubator/beehive/site/build/site/controls/tutorial_controls.html	(original)
+++ incubator/beehive/site/build/site/controls/tutorial_controls.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/downloads.html
==============================================================================
--- incubator/beehive/site/build/site/downloads.html	(original)
+++ incubator/beehive/site/build/site/downloads.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/faq.html
==============================================================================
--- incubator/beehive/site/build/site/faq.html	(original)
+++ incubator/beehive/site/build/site/faq.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/index.html
==============================================================================
--- incubator/beehive/site/build/site/index.html	(original)
+++ incubator/beehive/site/build/site/index.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/jpetstore.html
==============================================================================
--- incubator/beehive/site/build/site/jpetstore.html	(original)
+++ incubator/beehive/site/build/site/jpetstore.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/license.html
==============================================================================
--- incubator/beehive/site/build/site/license.html	(original)
+++ incubator/beehive/site/build/site/license.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/mailinglists.html
==============================================================================
--- incubator/beehive/site/build/site/mailinglists.html	(original)
+++ incubator/beehive/site/build/site/mailinglists.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

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	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html	(original)
+++ incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>
@@ -258,37 +248,33 @@
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">Introduction To the Page Flow Tutorial</a>
+<a href="#intro">Introduction</a>
 <ul class="minitoc">
 <li>
 <a href="#Tutorial+Goals">Tutorial Goals</a>
 </li>
 <li>
-<a href="#Note+on+the+Current+State+of+the+Page+Flow+Tutorial">Note on the Current State of the Page Flow Tutorial</a>
+<a href="#Assumptions+Made+in+This+Tutorial">Assumptions Made in This Tutorial</a>
 </li>
 </ul>
 </li>
 <li>
 <a href="#step1">Step 1: Begin the Page Flow Tutorial</a>
 <ul class="minitoc">
-<li></li>
 <li>
-<a href="#Download+and+Install+JDK5">Download and Install JDK5</a>
+<a href="#Download+and+Install+J2SE5">Download and Install J2SE5</a>
 </li>
 <li>
-<a href="#Download+and+Install+SVN+%28Subversion+Source+Control%29">Download and Install SVN (Subversion Source Control)</a>
+<a href="#To+Install+ANT+1.6.2">To Install ANT 1.6.2</a>
 </li>
 <li>
-<a href="#Download+and+Install+Beehive">Download and Install Beehive</a>
+<a href="#To+Download+and+Install+Tomcat+5">To Download and Install Tomcat 5</a>
 </li>
 <li>
-<a href="#Install+ANT">Install ANT</a>
+<a href="#To+Download+and+Install+a+Beehive+Binary+Distribution">To Download and Install a Beehive Binary Distribution</a>
 </li>
 <li>
-<a href="#Run+the+">Run the bootstrap Target</a>
-</li>
-<li>
-<a href="#Compile+Beehive">Compile Beehive</a>
+<a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
 </li>
 </ul>
 </li>
@@ -305,10 +291,10 @@
 <a href="#To+Create+a+JSP+File">To Create a JSP File</a>
 </li>
 <li>
-<a href="#To+Create+the+WEB-INF+directory%2C+etc.">To Create the WEB-INF directory, etc.</a>
+<a href="#To+Add+Beehive+Runtime+JARs+to+Your+Web+Application.">To Add Beehive Runtime JARs to Your Web Application.</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow">Compile the Page Flow</a>
+<a href="#To+Compile+the+Page+Flow">To Compile the Page Flow</a>
 </li>
 <li>
 <a href="#To+Start+the+Tomcat+Server">To Start the Tomcat Server</a>
@@ -316,31 +302,34 @@
 <li>
 <a href="#To+Test+the+Page+Flow+Web+Application">To Test the Page Flow Web Application</a>
 </li>
+<li>
+<a href="#To+Shutdown+the+Tomcat+Server">To Shutdown the Tomcat Server</a>
+</li>
 </ul>
 </li>
 <li>
 <a href="#step_3">Step 3: Navigation</a>
 <ul class="minitoc">
 <li>
-<a href="#Create+a+Destination+JSP+Page">Create a Destination JSP Page</a>
+<a href="#To+Create+a+Destination+JSP+Page">To Create a Destination JSP Page</a>
 </li>
 <li>
-<a href="#Create+a+Link+to+the+Destination+Page">Create a Link to the Destination Page</a>
+<a href="#To+Create+a+Link+to+the+Destination+Page">To Create a Link to the Destination Page</a>
 </li>
 <li>
-<a href="#Add+an+Action+Method+to+Handle+the+Link">Add an Action Method to Handle the Link</a>
+<a href="#To+Add+an+Action+Method+to+Handle+the+Link">To Add an Action Method to Handle the Link</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N101DA">Compile the Page Flow</a>
+<a href="#To+Compile+the+Page+Flow-N101C7">To Compile the Page Flow</a>
 </li>
 <li>
-<a href="#To+Start+the+Tomcat+Server-N101E7">To Start the Tomcat Server</a>
+<a href="#To+Start+the+Tomcat+Server-N101D5">To Start the Tomcat Server</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N101F4">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N101E3">To Test the Page Flow Web Application</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server">Shutdown Tomcat Server</a>
+<a href="#To+Shutdown+the+Tomcat+Server-N101FA">To Shutdown the Tomcat Server</a>
 </li>
 </ul>
 </li>
@@ -354,16 +343,16 @@
 <a href="#To+Edit+the+Controller+File+to+Handle+the+Submitted+Data">To Edit the Controller File to Handle the Submitted Data</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N10243">Compile the Page Flow</a>
+<a href="#To+Compile+the+Page+Flow-N10243">To Compile the Page Flow</a>
 </li>
 <li>
-<a href="#To+Start+the+Tomcat+Server-N10252">To Start the Tomcat Server</a>
+<a href="#To+Start+the+Tomcat+Server-N10251">To Start the Tomcat Server</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N1025E">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N1025F">To Test the Page Flow Web Application</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server-N1027A">Shutdown Tomcat Server</a>
+<a href="#To+Shutdown+the+Tomcat+Server-N1027C">To Shutdown the Tomcat Server</a>
 </li>
 </ul>
 </li>
@@ -377,16 +366,16 @@
 <a href="#To+Create+a+JSP+Page+to+Display+Submitted+Data">To Create a JSP Page to Display Submitted Data</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N102AA">Compile the Page Flow</a>
+<a href="#To+Compile+the+Page+Flow-N102B3">To Compile the Page Flow</a>
 </li>
 <li>
-<a href="#To+Start+the+Tomcat+Server-N102B7">To Start the Tomcat Server</a>
+<a href="#To+Start+the+Tomcat+Server-N102C1">To Start the Tomcat Server</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N102C4">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N102CF">To Test the Page Flow Web Application</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server-N102E0">Shutdown Tomcat Server</a>
+<a href="#To+Shutdown+the+Tomcat+Server-N102EC">To Shutdown the Tomcat Server</a>
 </li>
 </ul>
 </li>
@@ -396,7 +385,7 @@
 </ul>
         
 <a name="N1000C"></a><a name="intro"></a>
-<h3>Introduction To the Page Flow Tutorial</h3>
+<h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
 <a name="N10012"></a><a name="Tutorial+Goals"></a>
 <h4>Tutorial Goals</h4>
@@ -416,117 +405,93 @@
                 
 </ul>
 </div>
-<a name="N1002E"></a><a name="Note+on+the+Current+State+of+the+Page+Flow+Tutorial"></a>
-<h4>Note on the Current State of the Page Flow Tutorial</h4>
+<a name="N1002E"></a><a name="Assumptions+Made+in+This+Tutorial"></a>
+<h4>Assumptions Made in This Tutorial</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>This tutorial is currently a work in progress. Please send any comments to  Steve Hanson, at <span class="codefrag">steveh@bea.com</span>. Also the tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
+<p>The following tutorial assumes that you are working on a Windows machine.  But, with a little common sense, it is easy to run through the tutorial on a Unix machine.  For example, when the tutorial tells you to run the file beehiveUser.cmd, Unix users should run the file beehiveUser.sh.</p>
 </div>
 </div>
         
-<a name="N1003C"></a><a name="step1"></a>
+<a name="N10039"></a><a name="step1"></a>
 <h3>Step 1: Begin the Page Flow Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10042"></a>
-<h4></h4>
-<div style="margin-left: 0 ; border: 2px"></div>
-<a name="N10048"></a><a name="Download+and+Install+JDK5"></a>
-<h4>Download and Install JDK5</h4>
+<a name="N1003F"></a><a name="Download+and+Install+J2SE5"></a>
+<h4>Download and Install J2SE5</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download the latest version of JDK5.</p>
-<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <span class="codefrag">C:\jdk1.5.0</span>
-                
-</p>
-<p>
-<!--[tbd: more detailed installation instructions]-->
-</p>
+<p>If you do not have J2SE5 installed, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a>. 
+                </p>
+<p>Download and install the latest version of J2SE5.</p>
 </div>
-<a name="N1005F"></a><a name="Download+and+Install+SVN+%28Subversion+Source+Control%29"></a>
-<h4>Download and Install SVN (Subversion Source Control)</h4>
+<a name="N10050"></a><a name="To+Install+ANT+1.6.2"></a>
+<h4>To Install ANT 1.6.2</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Visit <a target="_blank" href="http://subversion.tigris.org">http://subversion.tigris.org</a> and install the SVN source control system.</p>
-<p>
-<!--[tbd: more detailed installation instructions]-->
-</p>
+<p>If you do not have Ant 1.6.2 installed, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</a>.  
+                </p>
+<p>Download the ZIP file and unzip it on your machine.</p>
 </div>
-<a name="N10070"></a><a name="Download+and+Install+Beehive"></a>
-<h4>Download and Install Beehive</h4>
+<a name="N10061"></a><a name="To+Download+and+Install+Tomcat+5"></a>
+<h4>To Download and Install Tomcat 5</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>
-					Create a directory called <span class="codefrag">beehive-src</span> on your C: drive.  Confirm that the the following directory structure exists: <span class="codefrag">C:/beehive-src</span>.  This directory will store the Beehive source and all of your Beehive projects.					</p>
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">cd beehive-src</span>
-                
+<p>If you do not have Tomcat 5 installed, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</a>
 </p>
-<p>At the command prompt, enter: <span class="codefrag">svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</span>
-                
-</p>
-<p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
-<p>At the command prompt, enter: <span class="codefrag">exit</span>
-                
-</p>
-</div>
-<a name="N10098"></a><a name="Install+ANT"></a>
-<h4>Install ANT</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Create a directory named <span class="codefrag">installed</span> at <span class="codefrag">C:/beehive-src/trunk/installed</span>.</p>
-<p>Unzip the file <span class="codefrag">C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</span> into <span class="codefrag">C:/beehive-src/trunk/installed</span>.</p>
-<p>After the file has unzipped, confirm that the following directory structure exists: <span class="codefrag">C:/beehive-src/trunk/installed/apache-ant-1.6.2</span>.</p>
+<p>Download the ZIP file and unzip it on your machine.</p>
 </div>
-<a name="N100B7"></a><a name="Run+the+"></a>
-<h4>Run the bootstrap Target</h4>
+<a name="N10071"></a><a name="To+Download+and+Install+a+Beehive+Binary+Distribution"></a>
+<h4>To Download and Install a Beehive Binary Distribution</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-                
-</p>
-<p>At the command prompt, enter: <span class="codefrag">set BEEHIVE_HOME=C:\beehive-src\trunk</span>
-                
-</p>
-<p>At the command prompt, enter:  <span class="codefrag">cd C:\beehive-src\trunk</span>
-                
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-                
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant bootstrap</span>
-                
-</p>
+<p>Visit [todo: distribution download link] and download the latest binary distribution of Beehive.</p>
+<p>Unzip the distribution file on your machine</p>
 </div>
-<a name="N100DF"></a><a name="Compile+Beehive"></a>
-<h4>Compile Beehive</h4>
+<a name="N1007E"></a><a name="To+Set+up+the+Development+Environment"></a>
+<h4>To Set up the Development Environment</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">ant deploy</span>
+<p>Open the directory where you installed the Beehive distribution.  Open the file <span class="codefrag">beehiveUser.cmd</span> in a text editor.  Edit <span class="codefrag">beehiveUser.cmd</span> to fit your local environment.  The following environmental variables must be set to the appropriate paths on your machine:  <span class="codefrag">BEEHIVE_HOME</span>, <span class="codefrag">JAVA_HOME</span>, <span class="codefrag">ANT_HOME</span>, and <span class="codefrag">CATALINA_HOME</span>.  The following example shows how to edit <span class="codefrag">beehiveUser.cmd</span> for a typical environment.</p>
+<pre class="code">REM the root of Beehive distribution
+set BEEHIVE_HOME=C:\beehive-alpha
+
+REM location of a JDK
+set JAVA_HOME=C:\jdk1.5.0
+
+REM location of Ant
+set ANT_HOME=C:\apache-ant-1.6.2
+
+REM location of Tomcat
+set CATALINA_HOME=C:\jakarta-tomcat-5.0.25</pre>
+<p>When you finished editing <span class="codefrag">beehiveUser.cmd</span>, save and close the file.</p>
+<p>Open a command shell.</p>
+<p>cd to the directory where <span class="codefrag">beehiveUser.cmd</span> resides (= the directory where you installed the Beehive distribution).</p>
+<p>At the command prompt, enter: <span class="codefrag">beehiveUser.cmd</span>
                 
 </p>
-<p>Leave this command shell open so you can use it in the next step of the tutorial.</p>
+<p>Leave the command shell open to use throughout the tutorial</p>
 </div>
 </div>
         
-<a name="N100F0"></a><a name="step_2"></a>
+<a name="N100BB"></a><a name="step_2"></a>
 <h3>Step 2: Create a New Page Flow Application</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100F6"></a><a name="Introduction"></a>
+<a name="N100C1"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-				In this step you will create a Controller file and a JSP page.  These are the basic files in a Page Flow web application.  Each Page Flow contains one Controller file and any number of JSP pages. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the major features of a web application: how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources. The JSP pages determine what a visitor to the web sees in the browser.  (In terms of the Model-View-Controller paradigm for web applications: the Controller file is the Controller (naturally), and the JSP pages are the View.  The web application we are buildng in this tutorial does not contain a Model. <!--[tbd: more, explain]-->)
+			In this step you will create a Controller file and a JSP page.  These are the basic files in a Beehive Page Flow web application.  Each Page Flow contains one Controller file and any number of JSP pages. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the major features of a web application: how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources. The JSP pages determine what a visitor to the web sees in the browser.  (In terms of the Model-View-Controller paradigm for web applications: the Controller.jpf file is the Controller (naturally), and the JSP pages are the View.  This web application's Model is very simple: it consists of two fields that represent the user's age and name. <!--[tbd: more, explain]-->)
 				</p>
 <p>	
-				Controller files contain Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do something complex, such as receive user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed. <!--[tbd: diagram, etc.]-->
-				</p>
+				Controller files contain Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do a complex set of tasks, such as receive user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed. <!--[tbd: diagram, etc.]-->
+                </p>
 <p>
 				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
 				</p>
 </div>
-<a name="N1010A"></a><a name="To+Create+a+Controller+File"></a>
+<a name="N100D5"></a><a name="To+Create+a+Controller+File"></a>
 <h4>To Create a Controller File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will create the Controller file in place in the Tomcat deployment directory.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps</span>, create a directory called <span class="codefrag">pageflow_tutorial</span>.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file called <span class="codefrag">Controller.jpf</span>.</p>
+<p>In the directory <span class="codefrag">CATALINA_HOME/webapps</span>, create a directory named <span class="codefrag">pageflow_tutorial</span>.</p>
+<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">Controller.jpf</span>.</p>
 <p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
-import org.apache.beehive.netui.pageflow.PageFlowController;
+<p>Edit <span class="codefrag">Controller.jpf</span> so it appears as follows.</p>
+<pre class="code">import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 	 
@@ -542,16 +507,15 @@
     {
         return new Forward("success");
     }
-}
-				</pre>
+}</pre>
+<p>Save and close the file Controller.jpf.</p>
 </div>
-<a name="N10131"></a><a name="To+Create+a+JSP+File"></a>
+<a name="N10102"></a><a name="To+Create+a+JSP+File"></a>
 <h4>To Create a JSP File</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
-<p>Edit index.jsp so it looks like the following.</p>
-<pre class="code"> 			
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
+<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
+<p>Edit <span class="codefrag">index.jsp</span> so it looks like the following.</p>
+<pre class="code">&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
 &lt;netui:html&gt;
   &lt;head&gt;
@@ -563,78 +527,58 @@
       index.jsp
     &lt;/p&gt;
   &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-			</pre>
+&lt;/netui:html&gt;</pre>
 </div>
-<a name="N10149"></a><a name="To+Create+the+WEB-INF+directory%2C+etc."></a>
-<h4>To Create the WEB-INF directory, etc.</h4>
+<a name="N1011D"></a><a name="To+Add+Beehive+Runtime+JARs+to+Your+Web+Application."></a>
+<h4>To Add Beehive Runtime JARs to Your Web Application.</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In this step you will assemble the JARs and other supporting files for your Page Flow application.  Most of these files are included in the WEB-INF directory.  It includes JAR files with the JSP tag handler classes, Struts config files, etc. <!--[tbd: for a complete list see...]--></p>
-<p></p>
-<p>Using the command shell opened in the previous step, at the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\netui\ant</span>
-                
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-                
-</p>
+<p>In this step you will assemble the runtime resources for your Page Flow application.  Most of these files are included in the WEB-INF directory.  It includes JAR files with the JSP tag handler classes, Struts config files, etc. <!--[tbd: for a complete list see...]--></p>
+<p>Using the command shell opened in the previous step, at the command prompt, enter: </p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml deploy.beehive.webapp.runtime -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</pre>
 </div>
-<a name="N10162"></a><a name="Compile+the+Page+Flow"></a>
-<h4>Compile the Page Flow</h4>
+<a name="N10130"></a><a name="To+Compile+the+Page+Flow"></a>
+<h4>To Compile the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile the Page Flow.</p>
-<p>Using the command shell opened in the previous step, at the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-                
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-                
+<p>Using the command shell opened in the previous step, at the command prompt, enter:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</pre>
+<p>TODO:  <span class="codefrag">This step is blocked by the following error: BUILD FAILED
+C:\beehive-alpha\ant\buildWebappCore.xml:102: srcdir "C:\jakarta-tomcat-5.0.25\webapps\pageflow_tuto
+rial\WEB-INF\src" does not exist!</span>
 </p>
-<p>You should see the following response in the command shell:</p>
-<pre class="code">C:\beehive-src\trunk\test\ant&gt;ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\
-installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial
-Buildfile: buildWebapp.xml
-
-build.webapp:
-[xmlbeanbuild] Could not find any xsd or wsdl files to process.
-     [echo] ========== Complie Java source in WEB-INF/src ==========
-     [echo] netui-compiler.jar: C:\dev-apache\beehive\trunk/netui/build/lib/beehive-netui-compiler.j
-ar
-     [echo] controls.jar: C:\dev-apache\beehive\trunk/controls/build/jars/controls.jar
-     [echo] ========== Generate and compile controls ==========
-    [mkdir] Created dir: C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutor
-ial\WEB-INF\.tmpbeansrc
-     [echo] ========== Compile Page Flows ==========
-      [apt] Compiling 2 source files to C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps
-\pageflow_tutorial\WEB-INF\classes
-     [echo] Copy all .properties files
-     [echo] Copy all .xml files</pre>
+<p>WORKAROUND: create the directory CATALINA_HOME/webapps/pageflowtutorial/WEB-INF/src and recompile.</p>
 </div>
-<a name="N10180"></a><a name="To+Start+the+Tomcat+Server"></a>
+<a name="N1014A"></a><a name="To+Start+the+Tomcat+Server"></a>
 <h4>To Start the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</span>
-                
-</p>
+<p>At the command prompt, enter:</p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
 </div>
-<a name="N1018D"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
+<a name="N10159"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-                
-</p>
-<p>You will be directed to the index.jsp page.</p>
+<p>Open a web browser and enter the following in the address bar:</p>
+<pre class="code">http://localhost:8080/pageflow_tutorial</pre>
+<p>You will be directed to the <span class="codefrag">index.jsp</span> page.</p>
+</div>
+<a name="N1016E"></a><a name="To+Shutdown+the+Tomcat+Server"></a>
+<h4>To Shutdown the Tomcat Server</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>At the command prompt, enter:
+                </p>
+<pre class="code">%CATALINA_HOME%\bin\shutdown.bat</pre>
 </div>
 </div>
         
-<a name="N1019E"></a><a name="step_3"></a>
+<a name="N1017E"></a><a name="step_3"></a>
 <h3>Step 3: Navigation</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N101A4"></a><a name="Create+a+Destination+JSP+Page"></a>
-<h4>Create a Destination JSP Page</h4>
+<a name="N10184"></a><a name="To+Create+a+Destination+JSP+Page"></a>
+<h4>To Create a Destination JSP Page</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
+<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
 <p>Edit page2.jsp so it looks like the following.</p>
-<pre class="code">					
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
+<pre class="code">&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
 &lt;netui:html&gt;
   &lt;head&gt;
@@ -646,14 +590,14 @@
       Welcome to page2.jsp!
     &lt;/p&gt;
   &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
+&lt;/netui:html&gt;</pre>
+<p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
-<a name="N101BC"></a><a name="Create+a+Link+to+the+Destination+Page"></a>
-<h4>Create a Link to the Destination Page</h4>
+<a name="N101A2"></a><a name="To+Create+a+Link+to+the+Destination+Page"></a>
+<h4>To Create a Link to the Destination Page</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
-<p>Edit index.jsp so it appears as follows.</p>
+<p>Open the file <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial/index.jsp</span>.</p>
+<p>Edit <span class="codefrag">index.jsp</span> so it appears as follows.</p>
 <pre class="code">
 &lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
@@ -673,14 +617,13 @@
 &lt;/netui:html&gt;
 				</pre>
 </div>
-<a name="N101CE"></a><a name="Add+an+Action+Method+to+Handle+the+Link"></a>
-<h4>Add an Action Method to Handle the Link</h4>
+<a name="N101BA"></a><a name="To+Add+an+Action+Method+to+Handle+the+Link"></a>
+<h4>To Add an Action Method to Handle the Link</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
+<p>Open the file <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial/Controller.jpf</span>.</p>
+<p>Edit <span class="codefrag">Controller.jpf</span> so it appears as follows.</p>
+<pre class="code">import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller 
@@ -706,51 +649,47 @@
     {
         return new Forward("success");
     }
-}
-				</pre>
+}</pre>
 </div>
-<a name="N101E0"></a><a name="Compile+the+Page+Flow-N101DA"></a>
-<h4>Compile the Page Flow</h4>
+<a name="N101D2"></a><a name="To+Compile+the+Page+Flow-N101C7"></a>
+<h4>To Compile the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Using the same command shell used in previous steps, at the command prompt, enter: <span class="codefrag">ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-                
-</p>
+<p>At the command prompt, enter:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</pre>
 </div>
-<a name="N101ED"></a><a name="To+Start+the+Tomcat+Server-N101E7"></a>
+<a name="N101E1"></a><a name="To+Start+the+Tomcat+Server-N101D5"></a>
 <h4>To Start the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</span>
-                
-</p>
+<p>At the command prompt, enter:  </p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
 </div>
-<a name="N101FA"></a><a name="To+Test+the+Page+Flow+Web+Application-N101F4"></a>
+<a name="N101F0"></a><a name="To+Test+the+Page+Flow+Web+Application-N101E3"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-                
-</p>
+<p>Open a web browser and enter the following in the address bar: 
+                </p>
+<pre class="code">http://localhost:8080/pageflow_tutorial</pre>
 <p>You will be directed to the index.jsp page.</p>
 <p>Click the link.</p>
 <p>You will be directed to page2.jsp.</p>
 </div>
-<a name="N10210"></a><a name="Shutdown+Tomcat+Server"></a>
-<h4>Shutdown Tomcat Server</h4>
+<a name="N10208"></a><a name="To+Shutdown+the+Tomcat+Server-N101FA"></a>
+<h4>To Shutdown the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</span>
-                
-</p>
+<p>At the command prompt, enter:
+                </p>
+<pre class="code">%CATALINA_HOME%\bin\shutdown.bat</pre>
 </div>
 </div>
         
-<a name="N1021E"></a><a name="step_4"></a>
+<a name="N10218"></a><a name="step_4"></a>
 <h3>Step 4: Submitting Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10224"></a><a name="To+Create+a+Submission+Form"></a>
+<a name="N1021E"></a><a name="To+Create+a+Submission+Form"></a>
 <h4>To Create a Submission Form</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Edit the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
+<p>Edit the file <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
+<pre class="code">&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
 &lt;netui:html&gt;
   &lt;head&gt;
@@ -769,16 +708,16 @@
       &lt;/netui:form&gt;
     &lt;/p&gt;	
   &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
+&lt;/netui:html&gt;</pre>
+<p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
 <a name="N10236"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
 <h4>To Edit the Controller File to Handle the Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</span>
+<p>Open the file <span class="codefrag">CATALINA_HOME/webapps/pageflow_tutorial/Controller.jpf</span>
                 
 </p>
-<p>Edit Controller.jpf so it appears as follows.</p>
+<p>Edit <span class="codefrag">Controller.jpf</span> so it appears as follows.</p>
 <pre class="code">
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
@@ -847,51 +786,49 @@
     }
 }
 				</pre>
+<p>Save and close <span class="codefrag">Controller.jpf</span>.</p>
 </div>
-<a name="N1024B"></a><a name="Compile+the+Page+Flow-N10243"></a>
-<h4>Compile the Page Flow</h4>
+<a name="N10254"></a><a name="To+Compile+the+Page+Flow-N10243"></a>
+<h4>To Compile the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-                
-</p>
-<p></p>
+<p>At the command prompt, enter:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</pre>
 </div>
-<a name="N1025A"></a><a name="To+Start+the+Tomcat+Server-N10252"></a>
+<a name="N10263"></a><a name="To+Start+the+Tomcat+Server-N10251"></a>
 <h4>To Start the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</span>
-</p>
+<p>At the command prompt, enter:  </p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
 </div>
-<a name="N10266"></a><a name="To+Test+the+Page+Flow+Web+Application-N1025E"></a>
+<a name="N10272"></a><a name="To+Test+the+Page+Flow+Web+Application-N1025F"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-                
-</p>
+<p>Open a web browser and enter the following in the address bar: 
+                </p>
+<pre class="code">http://localhost:8080/pageflow_tutorial</pre>
 <p>You will be directed to the index.jsp page.</p>
 <p>Click the link.</p>
 <p>You will be directed to page2.jsp.</p>
 <p>Enter values in the Name and Age fields, and click Submit.</p>
 <p>Notice the name and age values you entered are displayed in the Tomcat console shell.</p>
 </div>
-<a name="N10282"></a><a name="Shutdown+Tomcat+Server-N1027A"></a>
-<h4>Shutdown Tomcat Server</h4>
+<a name="N10290"></a><a name="To+Shutdown+the+Tomcat+Server-N1027C"></a>
+<h4>To Shutdown the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</span>
-                
-</p>
+<p>At the command prompt, enter:
+                </p>
+<pre class="code">%CATALINA_HOME%\bin\shutdown.bat</pre>
 </div>
 </div>
         
-<a name="N10290"></a><a name="step_5"></a>
+<a name="N102A0"></a><a name="step_5"></a>
 <h3>Step 5: Processing and Displaying Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10296"></a><a name="To+Process+the+Submitted+Data"></a>
+<a name="N102A6"></a><a name="To+Process+the+Submitted+Data"></a>
 <h4>To Process the Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Edit the processData method in the Controller.jpf file so it appears as follows. Code to add appears in red.</p>
-<pre class="code">
-@Jpf.Action(
+<pre class="code">@Jpf.Action(
 	forwards = { 
 		@Jpf.Forward( name = "success", path = "showData.jsp" )
 	}
@@ -902,15 +839,13 @@
 	System.out.println("Age: " + form.age);
 	getRequest().setAttribute("data", form);
 	return new Forward("success");
-}
-				</pre>
+}</pre>
 </div>
-<a name="N102A5"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
+<a name="N102B5"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
 <h4>To Create a JSP Page to Display Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
+<p>Create a file named <span class="codefrag">displayData.jsp</span> in the directory CATALINA_HOME/pageflow_tutorial. Edit <span class="codefrag">displayData.jsp</span> so it appears as follows.</p>
+<pre class="code">&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
 &lt;netui:html&gt;
   &lt;head&gt;
@@ -921,52 +856,49 @@
       &lt;p&gt;Name:&lt;netui:span value="${requestScope.data.name}"/&gt;
       &lt;p&gt;Age:&lt;netui:span value="${requestScope.data.age}"/&gt;
   &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
+&lt;/netui:html&gt;</pre>
 </div>
-<a name="N102B4"></a><a name="Compile+the+Page+Flow-N102AA"></a>
-<h4>Compile the Page Flow</h4>
+<a name="N102CA"></a><a name="To+Compile+the+Page+Flow-N102B3"></a>
+<h4>To Compile the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-                
-</p>
+<p>At the command prompt, enter:</p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</pre>
 </div>
-<a name="N102C1"></a><a name="To+Start+the+Tomcat+Server-N102B7"></a>
+<a name="N102D9"></a><a name="To+Start+the+Tomcat+Server-N102C1"></a>
 <h4>To Start the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</span>
-                
-</p>
+<p>At the command prompt, enter:  </p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
 </div>
-<a name="N102CE"></a><a name="To+Test+the+Page+Flow+Web+Application-N102C4"></a>
+<a name="N102E8"></a><a name="To+Test+the+Page+Flow+Web+Application-N102CF"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-                
-</p>
+<p>Open a web browser and enter the following in the address bar:
+                </p>
+<pre class="code">http://localhost:8080/pageflow_tutorial</pre>
 <p>You will be directed to the index.jsp page.</p>
 <p>Click the link.</p>
 <p>You will be directed to page2.jsp.</p>
 <p>Enter values in the Name and Age fields. Click the Submit button.</p>
 <p>You will be forwarded to the showData.jsp page.  Notice the values you entered are displayed.</p>
 </div>
-<a name="N102EA"></a><a name="Shutdown+Tomcat+Server-N102E0"></a>
-<h4>Shutdown Tomcat Server</h4>
+<a name="N10306"></a><a name="To+Shutdown+the+Tomcat+Server-N102EC"></a>
+<h4>To Shutdown the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</span>
-                
-</p>
+<p>At the command prompt, enter:
+                </p>
+<pre class="code">%CATALINA_HOME%\bin\shutdown.bat</pre>
 </div>
 </div>
         
-<a name="N102F8"></a><a name="summary"></a>
+<a name="N10316"></a><a name="summary"></a>
 <h3>Summary: Page Flow Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
 <p>Concepts and Tasks Introduced in This Tutorial</p>
 <p>
-<!--[tbd: more detailed summary]-->
-</p>
+                [TODO: complete summary]
+            </p>
 </div>
     
 <div class="attribution"></div>

Modified: incubator/beehive/site/build/site/reference.html
==============================================================================
--- incubator/beehive/site/build/site/reference.html	(original)
+++ incubator/beehive/site/build/site/reference.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/webservices.html
==============================================================================
--- incubator/beehive/site/build/site/webservices.html	(original)
+++ incubator/beehive/site/build/site/webservices.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

Modified: incubator/beehive/site/build/site/wsm/sample_AddressBook.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_AddressBook.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_AddressBook.html	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>

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	Mon Nov  1 13:09:10 2004
@@ -187,16 +187,6 @@
 </li>
         
         
-<li>
-<font color="#CFDCED">Beehive Source</font>
-<ul>
-            
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>            
-        
-</ul>
-</li>
     
 </ul>
 </li>
@@ -263,9 +253,6 @@
 <li>
 <a href="#Tutorial+Goals">Tutorial Goals</a>
 </li>
-<li>
-<a href="#Note+on+the+Current+State+of+the+Web+Service+Tutorial">Note on the Current State of the Web Service Tutorial</a>
-</li>
 </ul>
 </li>
 <li>
@@ -317,51 +304,44 @@
 </ul>
 </li>
 </ul>
-		
-<a name="N1000C"></a><a name="intro"></a>
+        
+<a name="N1000D"></a><a name="intro"></a>
 <h3>Introduction to the Web Service Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10012"></a><a name="Tutorial+Goals"></a>
+<a name="N10013"></a><a name="Tutorial+Goals"></a>
 <h4>Tutorial Goals</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this tutorial, you will learn:</p>
 <ul>
-					
+                    
 <li>How to create a basic Beehive web service application.</li>
-					
+                    
 <li>How to use (JSR 175 and 181) metadata annotations.</li>
-					
+                    
 <li>How to deploy and test a web service to Tomcat</li>
-				
+                
 </ul>
 </div>
-<a name="N10028"></a><a name="Note+on+the+Current+State+of+the+Web+Service+Tutorial"></a>
-<h4>Note on the Current State of the Web Service Tutorial</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>This tutorial is currently a work in progress, and will by changed and amended in the coming weeks.  The tutorial assumes that you are using a Windows machine.  But, with a little common sense, it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
-<p>Please send any comments to  Steve Hanson, at <span class="codefrag">steveh at bea.com</span>.</p>
-</div>
 </div>
-		
-<a name="N10039"></a><a name="step1"></a>
+        
+<a name="N1002A"></a><a name="step1"></a>
 <h3>Step 1: Begin the Web Service Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1003F"></a><a name="Download+and+Install+JDK5"></a>
+<a name="N10030"></a><a name="Download+and+Install+JDK5"></a>
 <h4>Download and Install JDK5</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download and install the latest version.  (Note: it is important that you install version beta51 or later.)</p>
-<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <span class="codefrag">C:/jdk1.5.0</span>.</p>
-<p></p>
+<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download and install the latest version.</p>
 </div>
-<a name="N10055"></a><a name="Install+ANT+1.6.2"></a>
+<a name="N1003E"></a><a name="Install+ANT+1.6.2"></a>
 <h4>Install ANT 1.6.2</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>If you do not have Ant 1.6.2 installed on your machine, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</a>
+                
 </p>
 <p>After download is complete, unzip the file <span class="codefrag">apache-ant-1.6.2-bin.zip</span> into your C: drive.</p>
 <p>After the file has unzipped, confirm that the following directory structure exists: <span class="codefrag">C:/apache-ant-1.6.2</span>.</p>
 </div>
-<a name="N1006E"></a><a name="Download+and+Install+Tomcat+5"></a>
+<a name="N10058"></a><a name="Download+and+Install+Tomcat+5"></a>
 <h4>Download and Install Tomcat 5</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>If you do not have Tomcat 5 installed on your machine, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</a> and download the ZIP file.</p>
@@ -369,51 +349,55 @@
 <p>After the unzip is complete, confirm that the following directory exists: <span class="codefrag">C:/jakarta-tomcat-5.0.25</span>.</p>
 <p></p>
 </div>
-<a name="N10087"></a><a name="Download+and+Install+a+Beehive+Binary+Distribution"></a>
+<a name="N10071"></a><a name="Download+and+Install+a+Beehive+Binary+Distribution"></a>
 <h4>Download and Install a Beehive Binary Distribution</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit [todo: distribution download link] and download the latest binary distribution of Beehive.</p>
 <p>	Create a directory called <span class="codefrag">beehive-0.4</span> on your C: drive.  This directory will store the Beehive distribution JARs and all of your Beehive projects.</p>
 <p>Unzip the distribution JAR into <span class="codefrag">C:/beehive-0.4</span>
+                
 </p>
 </div>
-<a name="N1009C"></a><a name="Set+up+the+Development+Environment"></a>
+<a name="N10087"></a><a name="Set+up+the+Development+Environment"></a>
 <h4>Set up the Development Environment</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Open a command shell.</p>
 <p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:/jdk1.5.0</span>
-				
+                
 </p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;Note: if you have JDK5 installed in a different directory, set JAVA_HOME to that location.</p>
 <p>At the command prompt, enter: <span class="codefrag">set CATALINA_HOME=C:/jakarta-tomcat-5.0.25</span>
-				
+                
 </p>
 <p>At the command prompt, enter: <span class="codefrag">set ANT_HOME=C:/apache-ant-1.6.2</span>
-				
+                
 </p>
 <p>At the command prompt, enter:  <span class="codefrag">set PATH=%PATH%;C:/apache-ant-1.6.2/bin;C:/jdk1.5.0/bin</span>
-				
+                
 </p>
 <p>Leave the command shell open to use throughout the tutorial</p>
 </div>
-<a name="N100C4"></a><a name="Set+Up+Drop+In+Deployment"></a>
+<a name="N100AF"></a><a name="Set+Up+Drop+In+Deployment"></a>
 <h4>Set Up Drop In Deployment</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Copy the folder <span class="codefrag">[todo]/AnnotatedAxis</span> into the directory <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps</span>.</p>
 <p>Confirm that the following directory structure exists: <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</span>
+                
 </p>
 <p>At the command prompt, enter: <span class="codefrag">C:/jakarta-tomcat-5.0.25/bin/startup.bat</span>
+                
 </p>
 <p>Visit <a target="_blank" href="http://localhost:8080/AnnotatedAxis/index.html">http://localhost:8080/AnnotatedAxis/index.html</a> to confirm AnnotatedAxis is installed on Tomcat.  If you do not see an information page on AnnotatedAxis, then something is wrong.  Ensure that the AnnotatedAxis directory has been copied to C:/jakarta-tomcat-5.0.25/webapps, restart Tomcat, and try again.</p>
 <p>At the command prompt, enter: <span class="codefrag">C:/jakarta-tomcat-5.0.25/bin/shutdown.bat</span>
+                
 </p>
 </div>
 </div>
-		
-<a name="N100EB"></a><a name="step_2"></a>
+        
+<a name="N100D9"></a><a name="step_2"></a>
 <h3>Step 2: Create a New Web Service</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100F1"></a><a name="Introduction"></a>
+<a name="N100DF"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>[todo]</p>
@@ -422,7 +406,7 @@
 <p>	
 </p>
 </div>
-<a name="N10101"></a><a name="To+Create+a+JWS+File"></a>
+<a name="N100EF"></a><a name="To+Create+a+JWS+File"></a>
 <h4>To Create a JWS File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the directory <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</span>, create a folder named <span class="codefrag">ws_tutorial</span>.</p>
@@ -444,25 +428,27 @@
 }
 			</pre>
 </div>
-<a name="N10122"></a><a name="Test+the+Web+Service%3A+URL+Invocation+of+the+web+service"></a>
+<a name="N10110"></a><a name="Test+the+Web+Service%3A+URL+Invocation+of+the+web+service"></a>
 <h4>Test the Web Service: URL Invocation of the web service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will test the web service by generating a WSDL for the web service....[todo: explain what a WSDL is]</p>
 <p>At the command prompt, enter: <span class="codefrag">C:/jakarta-tomcat-5.0.25/bin/startup.bat</span>
+                
 </p>
 <p>Open a browser, and enter the following URL in the browser's address bar:  <a target="_blank" href="http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl">http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl</a>
+                
 </p>
 <p>The URL above will show the web service WSDL file.</p>
 <p>Enter the following URL in the browser address bar: <a target="_blank" href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</a>
+                
 </p>
 </div>
 </div>
-		
-		
-<a name="N10141"></a><a name="step_3"></a>
+        
+<a name="N10132"></a><a name="step_3"></a>
 <h3>Step 3: Add a Parameter to the hello Method</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1014A"></a><a name="Edit+the+JWS+File"></a>
+<a name="N1013B"></a><a name="Edit+the+JWS+File"></a>
 <h4>Edit the JWS File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p></p>
@@ -495,17 +481,17 @@
 }
 				</pre>
 </div>
-<a name="N1015A"></a><a name="Test+the+Web+Service"></a>
+<a name="N1014B"></a><a name="Test+the+Web+Service"></a>
 <h4>Test the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-                        
+                    
 <a target="_blank" href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</a>
-                        
+                
 </p>
 </div>
 </div>
-		<!--<section id="step_4">
+        <!--<section id="step_4">
 			<title>Step 4: Submitting Data</title>
 			<section>
 				<title>To Create a Submission Form</title>
@@ -728,7 +714,7 @@
 			<p>[todo: more detailed summary]</p>
 		</section>
 		-->
-	
+    
 <div class="attribution"></div>
 </div>
 </td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>

Modified: incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	Mon Nov  1 13:09:10 2004
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
 <document>
     <header>
         <title>Beehive Page Flow Tutorial</title>
     </header>
     <body>
         <section id="intro">
-            <title>Introduction To the Page Flow Tutorial</title>
+            <title>Introduction</title>
             <section>
                 <title>Tutorial Goals</title>
                 <p>In this tutorial, you will learn:</p>
@@ -19,64 +19,54 @@
                 </ul>
             </section>
             <section>
-                <title>Note on the Current State of the Page Flow Tutorial</title>
-                <p>This tutorial is currently a work in progress. Please send any comments to  Steve Hanson, at <code>steveh@bea.com</code>. Also the tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
+                <title>Assumptions Made in This Tutorial</title>
+                <p>The following tutorial assumes that you are working on a Windows machine.  But, with a little common sense, it is easy to run through the tutorial on a Unix machine.  For example, when the tutorial tells you to run the file beehiveUser.cmd, Unix users should run the file beehiveUser.sh.</p>
             </section>
         </section>
         <section id="step1">
             <title>Step 1: Begin the Page Flow Tutorial</title>
             <section>
-                <title/>
-            </section>
-            <section>
-                <title>Download and Install JDK5</title>
-                <p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download the latest version of JDK5.</p>
-                <p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <code>C:\jdk1.5.0</code>
+                <title>To Download and Install J2SE5</title>
+                <p>If you do not have J2SE5 installed, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork>. 
                 </p>
-                <p><!--[tbd: more detailed installation instructions]--></p>
-            </section>
-            <section>
-                <title>Download and Install SVN (Subversion Source Control)</title>
-                <p>Visit <fork href="http://subversion.tigris.org">http://subversion.tigris.org</fork> and install the SVN source control system.</p>
-                <p><!--[tbd: more detailed installation instructions]--></p>
+                <p>Download and install the latest version of J2SE5.</p>
             </section>
             <section>
-                <title>Download and Install Beehive</title>
-                <p>
-					Create a directory called <code>beehive-src</code> on your C: drive.  Confirm that the the following directory structure exists: <code>C:/beehive-src</code>.  This directory will store the Beehive source and all of your Beehive projects.					</p>
-                <p>Open a command shell.</p>
-                <p>At the command prompt, enter: <code>cd beehive-src</code>
-                </p>
-                <p>At the command prompt, enter: <code>svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</code>
-                </p>
-                <p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
-                <p>At the command prompt, enter: <code>exit</code>
+                <title>To Install ANT 1.6.2</title>
+                <p>If you do not have Ant 1.6.2 installed, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</fork>.  
                 </p>
+                <p>Download the ZIP file and unzip it on your machine.</p>
             </section>
             <section>
-                <title>Install ANT</title>
-                <p>Create a directory named <code>installed</code> at <code>C:/beehive-src/trunk/installed</code>.</p>
-                <p>Unzip the file <code>C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</code> into <code>C:/beehive-src/trunk/installed</code>.</p>
-                <p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/beehive-src/trunk/installed/apache-ant-1.6.2</code>.</p>
+                <title>To Download and Install Tomcat 5</title>
+                <p>If you do not have Tomcat 5 installed, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</fork></p>
+            <p>Download the ZIP file and unzip it on your machine.</p>
             </section>
             <section>
-                <title>Run the <code>bootstrap</code> Target</title>
-                <p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
-                </p>
-                <p>At the command prompt, enter: <code>set BEEHIVE_HOME=C:\beehive-src\trunk</code>
-                </p>
-                <p>At the command prompt, enter:  <code>cd C:\beehive-src\trunk</code>
-                </p>
-                <p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-                </p>
-                <p>At the command prompt, enter: <code>ant bootstrap</code>
-                </p>
+                <title>To Download and Install a Beehive Binary Distribution</title>
+                <p>Visit [todo: distribution download link] and download the latest binary distribution of Beehive.</p>
+                <p>Unzip the distribution file on your machine</p>
             </section>
             <section>
-                <title>Compile Beehive</title>
-                <p>At the command prompt, enter: <code>ant deploy</code>
+                <title>To Set up the Development Environment</title>
+                <p>Open the directory where you installed the Beehive distribution.  Open the file <code>beehiveUser.cmd</code> in a text editor.  Edit <code>beehiveUser.cmd</code> to fit your local environment.  The following environmental variables must be set to the appropriate paths on your machine:  <code>BEEHIVE_HOME</code>, <code>JAVA_HOME</code>, <code>ANT_HOME</code>, and <code>CATALINA_HOME</code>.  The following example shows how to edit <code>beehiveUser.cmd</code> for a typical environment.</p>
+<source>REM the root of Beehive distribution
+set BEEHIVE_HOME=C:\beehive-alpha
+
+REM location of a JDK
+set JAVA_HOME=C:\jdk1.5.0
+
+REM location of Ant
+set ANT_HOME=C:\apache-ant-1.6.2
+
+REM location of Tomcat
+set CATALINA_HOME=C:\jakarta-tomcat-5.0.25</source>
+                <p>When you finished editing <code>beehiveUser.cmd</code>, save and close the file.</p>
+                <p>Open a command shell.</p>
+                <p>cd to the directory where <code>beehiveUser.cmd</code> resides (= the directory where you installed the Beehive distribution).</p>
+                <p>At the command prompt, enter: <code>beehiveUser.cmd</code>
                 </p>
-                <p>Leave this command shell open so you can use it in the next step of the tutorial.</p>
+                <p>Leave the command shell open to use throughout the tutorial</p>
             </section>
         </section>
         <section id="step_2">
@@ -84,11 +74,11 @@
             <section>
                 <title>Introduction</title>
                 <p>
-				In this step you will create a Controller file and a JSP page.  These are the basic files in a Page Flow web application.  Each Page Flow contains one Controller file and any number of JSP pages. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the major features of a web application: how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources. The JSP pages determine what a visitor to the web sees in the browser.  (In terms of the Model-View-Controller paradigm for web applications: the Controller file is the Controller (naturally), and the JSP pages are the View.  The web application we are buildng in this tutorial does not contain a Model. <!--[tbd: more, explain]-->)
+			In this step you will create a Controller file and a JSP page.  These are the basic files in a Beehive Page Flow web application.  Each Page Flow contains one Controller file and any number of JSP pages. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the major features of a web application: how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources. The JSP pages determine what a visitor to the web sees in the browser.  (In terms of the Model-View-Controller paradigm for web applications: the Controller.jpf file is the Controller (naturally), and the JSP pages are the View.  This web application's Model is very simple: it consists of two fields that represent the user's age and name. <!--[tbd: more, explain]-->)
 				</p>
                 <p>	
-				Controller files contain Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do something complex, such as receive user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed. <!--[tbd: diagram, etc.]-->
-				</p>
+				Controller files contain Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do a complex set of tasks, such as receive user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed. <!--[tbd: diagram, etc.]-->
+                </p>
                 <p>
 				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
 				</p>
@@ -96,12 +86,11 @@
             <section>
                 <title>To Create a Controller File</title>
                 <p>In this step you will create the Controller file in place in the Tomcat deployment directory.</p>
-                <p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps</code>, create a directory called <code>pageflow_tutorial</code>.</p>
-                <p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file called <code>Controller.jpf</code>.</p>
+                <p>In the directory <code>CATALINA_HOME/webapps</code>, create a directory named <code>pageflow_tutorial</code>.</p>
+                <p>In the directory <code>CATALINA_HOME/webapps/pageflow_tutorial</code>, create a file named <code>Controller.jpf</code>.</p>
                 <p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-                <p>Edit Controller.jpf so it appears as follows.</p>
-                <source><![CDATA[
-import org.apache.beehive.netui.pageflow.PageFlowController;
+                <p>Edit <code>Controller.jpf</code> so it appears as follows.</p>
+                <source><![CDATA[import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 	 
@@ -117,15 +106,14 @@
     {
         return new Forward("success");
     }
-}
-				]]></source>
+}]]></source>
+		    <p>Save and close the file Controller.jpf.</p>
             </section>
             <section>
                 <title>To Create a JSP File</title>
-                <p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>index.jsp</code>.</p>
-                <p>Edit index.jsp so it looks like the following.</p>
-                <source><![CDATA[ 			
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+                <p>In the directory <code>CATALINA_HOME/webapps/pageflow_tutorial</code>, create a file named <code>index.jsp</code>.</p>
+                <p>Edit <code>index.jsp</code> so it looks like the following.</p>
+                <source><![CDATA[<%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <netui:html>
   <head>
@@ -137,65 +125,49 @@
       index.jsp
     </p>
   </netui:body>
-</netui:html>
-			]]></source>
+</netui:html>]]></source>
             </section>
             <section>
-                <title>To Create the WEB-INF directory, etc.</title>
-                <p>In this step you will assemble the JARs and other supporting files for your Page Flow application.  Most of these files are included in the WEB-INF directory.  It includes JAR files with the JSP tag handler classes, Struts config files, etc. <!--[tbd: for a complete list see...]--></p>
-                <p></p>
-                <p>Using the command shell opened in the previous step, at the command prompt, enter: <code>cd C:\beehive-src\trunk\netui\ant</code>
-                </p>
-                <p>At the command prompt, enter: <code>ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-                </p>
+                <title>To Add Beehive Runtime JARs to Your Web Application.</title>
+                <p>In this step you will assemble the runtime resources for your Page Flow application.  Most of these files are included in the WEB-INF directory.  It includes JAR files with the JSP tag handler classes, Struts config files, etc. <!--[tbd: for a complete list see...]--></p>
+                <p>Using the command shell opened in the previous step, at the command prompt, enter: </p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml deploy.beehive.webapp.runtime -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</source>
             </section>
             <section>
-                <title>Compile the Page Flow</title>
+                <title>To Compile the Page Flow</title>
                 <p>You are now ready to compile the Page Flow.</p>
-                <p>Using the command shell opened in the previous step, at the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
-                </p>
-                <p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-                </p>
-                <p>You should see the following response in the command shell:</p>
-                <source>C:\beehive-src\trunk\test\ant>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\
-installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial
-Buildfile: buildWebapp.xml
-
-build.webapp:
-[xmlbeanbuild] Could not find any xsd or wsdl files to process.
-     [echo] ========== Complie Java source in WEB-INF/src ==========
-     [echo] netui-compiler.jar: C:\dev-apache\beehive\trunk/netui/build/lib/beehive-netui-compiler.j
-ar
-     [echo] controls.jar: C:\dev-apache\beehive\trunk/controls/build/jars/controls.jar
-     [echo] ========== Generate and compile controls ==========
-    [mkdir] Created dir: C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutor
-ial\WEB-INF\.tmpbeansrc
-     [echo] ========== Compile Page Flows ==========
-      [apt] Compiling 2 source files to C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps
-\pageflow_tutorial\WEB-INF\classes
-     [echo] Copy all .properties files
-     [echo] Copy all .xml files</source>
+                <p>Using the command shell opened in the previous step, at the command prompt, enter:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</source>
+                <p>TODO:  <code>This step is blocked by the following error: BUILD FAILED
+C:\beehive-alpha\ant\buildWebappCore.xml:102: srcdir "C:\jakarta-tomcat-5.0.25\webapps\pageflow_tuto
+rial\WEB-INF\src" does not exist!</code></p>
+                <p>WORKAROUND: create the directory CATALINA_HOME/webapps/pageflowtutorial/WEB-INF/src and recompile.</p>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</code>
-                </p>
+                <p>At the command prompt, enter:</p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>
             <section>
                 <title>To Test the Page Flow Web Application</title>
-                <p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+                <p>Open a web browser and enter the following in the address bar:</p> 
+                <source>http://localhost:8080/pageflow_tutorial</source>
+                <p>You will be directed to the <code>index.jsp</code> page.</p>
+            </section>
+            <section>
+                <title>To Shutdown the Tomcat Server</title>
+                <p>At the command prompt, enter:
                 </p>
-                <p>You will be directed to the index.jsp page.</p>
+                 <source>%CATALINA_HOME%\bin\shutdown.bat</source>
             </section>
         </section>
         <section id="step_3">
             <title>Step 3: Navigation</title>
             <section>
-                <title>Create a Destination JSP Page</title>
-                <p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
+                <title>To Create a Destination JSP Page</title>
+                <p>In the directory <code>CATALINA_HOME/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
                 <p>Edit page2.jsp so it looks like the following.</p>
-                <source><![CDATA[					
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+                <source><![CDATA[<%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <netui:html>
   <head>
@@ -207,13 +179,13 @@
       Welcome to page2.jsp!
     </p>
   </netui:body>
-</netui:html>
-				]]></source>
+</netui:html>]]></source>
+            <p>Save and close <code>page2.jsp</code>.</p>
             </section>
             <section>
-                <title>Create a Link to the Destination Page</title>
-                <p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
-                <p>Edit index.jsp so it appears as follows.</p>
+                <title>To Create a Link to the Destination Page</title>
+                <p>Open the file <code>CATALINA_HOME/webapps/pageflow_tutorial/index.jsp</code>.</p>
+                <p>Edit <code>index.jsp</code> so it appears as follows.</p>
                 <source><![CDATA[
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
@@ -234,12 +206,11 @@
 				]]></source>
             </section>
             <section>
-                <title>Add an Action Method to Handle the Link</title>
-                <p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
-                <p>Edit Controller.jpf so it appears as follows.</p>
-                <source><![CDATA[
+                <title>To Add an Action Method to Handle the Link</title>
+                <p>Open the file <code>CATALINA_HOME/webapps/pageflow_tutorial/Controller.jpf</code>.</p>
+                <p>Edit <code>Controller.jpf</code> so it appears as follows.</p>
+                <source><![CDATA[import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller 
@@ -265,40 +236,40 @@
     {
         return new Forward("success");
     }
-}
-				]]></source>
+}]]></source>
             </section>
             <section>
-                <title>Compile the Page Flow</title>
-                <p>Using the same command shell used in previous steps, at the command prompt, enter: <code>ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-                </p>
+                <title>To Compile the Page Flow</title>
+                <p>At the command prompt, enter:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</source>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</code>
-                </p>
+                <p>At the command prompt, enter:  </p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>
             <section>
                 <title>To Test the Page Flow Web Application</title>
-                <p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+                <p>Open a web browser and enter the following in the address bar: 
                 </p>
+                <source>http://localhost:8080/pageflow_tutorial</source>
                 <p>You will be directed to the index.jsp page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
             </section>
             <section>
-                <title>Shutdown Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</code>
+                <title>To Shutdown the Tomcat Server</title>
+                <p>At the command prompt, enter:
                 </p>
+                 <source>%CATALINA_HOME%\bin\shutdown.bat</source>
             </section>
         </section>
         <section id="step_4">
             <title>Step 4: Submitting Data</title>
             <section>
                 <title>To Create a Submission Form</title>
-                <p>Edit the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
-                <source><![CDATA[
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+                <p>Edit the file <code>CATALINA_HOME/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
+                <source><![CDATA[<%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <netui:html>
   <head>
@@ -317,14 +288,14 @@
       </netui:form>
     </p>	
   </netui:body>
-</netui:html>
-				]]></source>
+</netui:html>]]></source>
+<p>Save and close <code>page2.jsp</code>.</p>
             </section>
             <section>
                 <title>To Edit the Controller File to Handle the Submitted Data</title>
-                <p>Open the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</code>
+                <p>Open the file <code>CATALINA_HOME/webapps/pageflow_tutorial/Controller.jpf</code>
                 </p>
-                <p>Edit Controller.jpf so it appears as follows.</p>
+                <p>Edit <code>Controller.jpf</code> so it appears as follows.</p>
                 <source><![CDATA[
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
@@ -393,21 +364,23 @@
     }
 }
 				]]></source>
+			<p>Save and close <code>Controller.jpf</code>.</p>
             </section>
-            <section>
-                <title>Compile the Page Flow</title>
-                <p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-                </p>
-                <p></p>
+             <section>
+                <title>To Compile the Page Flow</title>
+                <p>At the command prompt, enter:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</source>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</code></p>
+                <p>At the command prompt, enter:  </p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>
-            <section>
+           <section>
                 <title>To Test the Page Flow Web Application</title>
-                <p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+                <p>Open a web browser and enter the following in the address bar: 
                 </p>
+                <source>http://localhost:8080/pageflow_tutorial</source>
                 <p>You will be directed to the index.jsp page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
@@ -415,9 +388,10 @@
                 <p>Notice the name and age values you entered are displayed in the Tomcat console shell.</p>
             </section>
             <section>
-                <title>Shutdown Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</code>
+                <title>To Shutdown the Tomcat Server</title>
+                <p>At the command prompt, enter:
                 </p>
+                 <source>%CATALINA_HOME%\bin\shutdown.bat</source>
             </section>
         </section>
         <section id="step_5">
@@ -425,8 +399,7 @@
             <section>
                 <title>To Process the Submitted Data</title>
                 <p>Edit the processData method in the Controller.jpf file so it appears as follows. Code to add appears in red.</p>
-                <source><![CDATA[
-@Jpf.Action(
+                <source><![CDATA[@Jpf.Action(
 	forwards = { 
 		@Jpf.Forward( name = "success", path = "showData.jsp" )
 	}
@@ -437,14 +410,12 @@
 	System.out.println("Age: " + form.age);
 	getRequest().setAttribute("data", form);
 	return new Forward("success");
-}
-				]]></source>
+}]]></source>
             </section>
             <section>
                 <title>To Create a JSP Page to Display Submitted Data</title>
-                <p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
-                <source><![CDATA[
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+                <p>Create a file named <code>displayData.jsp</code> in the directory CATALINA_HOME/pageflow_tutorial. Edit <code>displayData.jsp</code> so it appears as follows.</p>
+                <source><![CDATA[<%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <netui:html>
   <head>
@@ -455,23 +426,23 @@
       <p>Name:<netui:span value="${requestScope.data.name}"/>
       <p>Age:<netui:span value="${requestScope.data.age}"/>
   </netui:body>
-</netui:html>
-				]]></source>
+</netui:html>]]></source>
             </section>
-            <section>
-                <title>Compile the Page Flow</title>
-                <p>At the command prompt, enter: <code>ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-                </p>
+             <section>
+                <title>To Compile the Page Flow</title>
+                <p>At the command prompt, enter:</p>
+                <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\pageflow_tutorial</source>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</code>
-                </p>
+                <p>At the command prompt, enter:  </p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>
             <section>
                 <title>To Test the Page Flow Web Application</title>
-                <p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+                <p>Open a web browser and enter the following in the address bar:
                 </p>
+                 <source>http://localhost:8080/pageflow_tutorial</source>
                 <p>You will be directed to the index.jsp page.</p>
                 <p>Click the link.</p>
                 <p>You will be directed to page2.jsp.</p>
@@ -479,16 +450,19 @@
                 <p>You will be forwarded to the showData.jsp page.  Notice the values you entered are displayed.</p>
             </section>
             <section>
-                <title>Shutdown Tomcat Server</title>
-                <p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\shutdown.bat</code>
+                <title>To Shutdown the Tomcat Server</title>
+                <p>At the command prompt, enter:
                 </p>
+                 <source>%CATALINA_HOME%\bin\shutdown.bat</source>
             </section>
         </section>
         <section id="summary">
             <title>Summary: Page Flow Tutorial</title>
             <p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
             <p>Concepts and Tasks Introduced in This Tutorial</p>
-            <p><!--[tbd: more detailed summary]--></p>
+            <p>
+                [TODO: complete summary]
+            </p>
         </section>
     </body>
     <footer>

Modified: incubator/beehive/site/src/documentation/content/xdocs/site.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/site.xml	Mon Nov  1 13:09:10 2004
@@ -28,9 +28,9 @@
         </samples>
         <ref label="Reference Docs" href="reference.html"/>
         <!--<gloss label="Glossary" href="glossary.html"/>-->
-        <source label="Beehive Source">
+        <!--<source label="Beehive Source">
             <building label="Building Beehive" href="building.html"/>            
-        </source>
+        </source>-->
     </documentation>
     <community label="Community">
         <mailinglists label="Mailing Lists" href="mailinglists.html"/>

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	Mon Nov  1 13:09:10 2004
@@ -1,91 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
+<!--<!DOCTYPE document SYSTEM "C:\apache-forrest-0.5.1\context\resources\schema\dtd\document-v12.dtd">-->
 <document>
-	<header>
-		<title>Beehive Web Service Tutorial</title>
-	</header>
-	<body>
-		<section id="intro">
-			<title>Introduction to the Web Service Tutorial</title>
-			<section>
-				<title>Tutorial Goals</title>
-				<p>In this tutorial, you will learn:</p>
-				<ul>
-					<li>How to create a basic Beehive web service application.</li>
-					<li>How to use (JSR 175 and 181) metadata annotations.</li>
-					<li>How to deploy and test a web service to Tomcat</li>
-				</ul>
-			</section>
-			<section>
-				<title>Note on the Current State of the Web Service Tutorial</title>
-				<p>This tutorial is currently a work in progress, and will by changed and amended in the coming weeks.  The tutorial assumes that you are using a Windows machine.  But, with a little common sense, it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
-				<p>Please send any comments to  Steve Hanson, at <code>steveh at bea.com</code>.</p>
-				</section>
-		</section>
-		<section id="step1">
-			<title>Step 1: Begin the Web Service Tutorial</title>
-			<section>
-				<title>Download and Install JDK5</title>
-				<p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download and install the latest version.  (Note: it is important that you install version beta51 or later.)</p>
-				<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <code>C:/jdk1.5.0</code>.</p>
-				<p></p>
-			</section>
-			<section>
-				<title>Install ANT 1.6.2</title>
-				<p>If you do not have Ant 1.6.2 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</fork></p>
-				<p>After download is complete, unzip the file <code>apache-ant-1.6.2-bin.zip</code> into your C: drive.</p>
-				<p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/apache-ant-1.6.2</code>.</p>
-			</section>
-			<section>
-				<title>Download and Install Tomcat 5</title>
-				<p>If you do not have Tomcat 5 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</fork> and download the ZIP file.</p>
-                            <p>Unzip jakarta-tomcat-5.0.25.zip into the C: drive.</p>
-				<p>After the unzip is complete, confirm that the following directory exists: <code>C:/jakarta-tomcat-5.0.25</code>.</p>
-				<p></p>
-			</section>
-			<section>
-				<title>Download and Install a Beehive Binary Distribution</title>
-				<p>Visit [todo: distribution download link] and download the latest binary distribution of Beehive.</p>
-				<p>	Create a directory called <code>beehive-0.4</code> on your C: drive.  This directory will store the Beehive distribution JARs and all of your Beehive projects.</p>
-				<p>Unzip the distribution JAR into <code>C:/beehive-0.4</code></p>
-			</section>
-			<section>
-				<title>Set up the Development Environment</title>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>set JAVA_HOME=C:/jdk1.5.0</code>
-				</p>
-				<p>&nbsp;&nbsp;&nbsp;&nbsp;Note: if you have JDK5 installed in a different directory, set JAVA_HOME to that location.</p>
-				<p>At the command prompt, enter: <code>set CATALINA_HOME=C:/jakarta-tomcat-5.0.25</code>
-				</p>
-				<p>At the command prompt, enter: <code>set ANT_HOME=C:/apache-ant-1.6.2</code>
-				</p>
-				<p>At the command prompt, enter:  <code>set PATH=%PATH%;C:/apache-ant-1.6.2/bin;C:/jdk1.5.0/bin</code>
-				</p>
-				<p>Leave the command shell open to use throughout the tutorial</p>
-			</section>
-			<section>
-				<title>Set Up Drop In Deployment</title>
-				<p>Copy the folder <code>[todo]/AnnotatedAxis</code> into the directory <code>C:/jakarta-tomcat-5.0.25/webapps</code>.</p>
-				<p>Confirm that the following directory structure exists: <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code></p>
-				<p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/startup.bat</code></p>
-				<p>Visit <fork href="http://localhost:8080/AnnotatedAxis/index.html">http://localhost:8080/AnnotatedAxis/index.html</fork> to confirm AnnotatedAxis is installed on Tomcat.  If you do not see an information page on AnnotatedAxis, then something is wrong.  Ensure that the AnnotatedAxis directory has been copied to C:/jakarta-tomcat-5.0.25/webapps, restart Tomcat, and try again.</p>
-				<p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/shutdown.bat</code></p>
-			</section>
-		</section>
-		<section id="step_2">
-			<title>Step 2: Create a New Web Service</title>
-			<section>
-				<title>Introduction</title>
-				<p>[todo]</p>
-				<p>	</p>
-				<p>	</p>
-			</section>
-			<section>
-				<title>To Create a JWS File</title>
-				<p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code>, create a folder named <code>ws_tutorial</code>.</p>
-				<p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis/ws_tutorial</code>, create a file named <code>HelloWorld.jws</code>.</p>
-				<p>Edit HelloWorld.jws so it looks like the following:</p>
-				<source><![CDATA[
+    <header>
+        <title>Beehive Web Service Tutorial</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>Introduction to the Web Service Tutorial</title>
+            <section>
+                <title>Tutorial Goals</title>
+                <p>In this tutorial, you will learn:</p>
+                <ul>
+                    <li>How to create a basic Beehive web service application.</li>
+                    <li>How to use (JSR 175 and 181) metadata annotations.</li>
+                    <li>How to deploy and test a web service to Tomcat</li>
+                </ul>
+            </section>
+        </section>
+        <section id="step1">
+            <title>Step 1: Begin the Web Service Tutorial</title>
+            <section>
+                <title>Download and Install JDK5</title>
+                <p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download and install the latest version.</p>
+            </section>
+            <section>
+                <title>Install ANT 1.6.2</title>
+                <p>If you do not have Ant 1.6.2 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</fork>
+                </p>
+                <p>After download is complete, unzip the file <code>apache-ant-1.6.2-bin.zip</code> into your C: drive.</p>
+                <p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/apache-ant-1.6.2</code>.</p>
+            </section>
+            <section>
+                <title>Download and Install Tomcat 5</title>
+                <p>If you do not have Tomcat 5 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</fork> and download the ZIP file.</p>
+                <p>Unzip jakarta-tomcat-5.0.25.zip into the C: drive.</p>
+                <p>After the unzip is complete, confirm that the following directory exists: <code>C:/jakarta-tomcat-5.0.25</code>.</p>
+                <p/>
+            </section>
+            <section>
+                <title>Download and Install a Beehive Binary Distribution</title>
+                <p>Visit [todo: distribution download link] and download the latest binary distribution of Beehive.</p>
+                <p>	Create a directory called <code>beehive-0.4</code> on your C: drive.  This directory will store the Beehive distribution JARs and all of your Beehive projects.</p>
+                <p>Unzip the distribution JAR into <code>C:/beehive-0.4</code>
+                </p>
+            </section>
+            <section>
+                <title>Set up the Development Environment</title>
+                <p>Open a command shell.</p>
+                <p>At the command prompt, enter: <code>set JAVA_HOME=C:/jdk1.5.0</code>
+                </p>
+                <p>&nbsp;&nbsp;&nbsp;&nbsp;Note: if you have JDK5 installed in a different directory, set JAVA_HOME to that location.</p>
+                <p>At the command prompt, enter: <code>set CATALINA_HOME=C:/jakarta-tomcat-5.0.25</code>
+                </p>
+                <p>At the command prompt, enter: <code>set ANT_HOME=C:/apache-ant-1.6.2</code>
+                </p>
+                <p>At the command prompt, enter:  <code>set PATH=%PATH%;C:/apache-ant-1.6.2/bin;C:/jdk1.5.0/bin</code>
+                </p>
+                <p>Leave the command shell open to use throughout the tutorial</p>
+            </section>
+            <section>
+                <title>Set Up Drop In Deployment</title>
+                <p>Copy the folder <code>[todo]/AnnotatedAxis</code> into the directory <code>C:/jakarta-tomcat-5.0.25/webapps</code>.</p>
+                <p>Confirm that the following directory structure exists: <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code>
+                </p>
+                <p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/startup.bat</code>
+                </p>
+                <p>Visit <fork href="http://localhost:8080/AnnotatedAxis/index.html">http://localhost:8080/AnnotatedAxis/index.html</fork> to confirm AnnotatedAxis is installed on Tomcat.  If you do not see an information page on AnnotatedAxis, then something is wrong.  Ensure that the AnnotatedAxis directory has been copied to C:/jakarta-tomcat-5.0.25/webapps, restart Tomcat, and try again.</p>
+                <p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/shutdown.bat</code>
+                </p>
+            </section>
+        </section>
+        <section id="step_2">
+            <title>Step 2: Create a New Web Service</title>
+            <section>
+                <title>Introduction</title>
+                <p>[todo]</p>
+                <p>	</p>
+                <p>	</p>
+            </section>
+            <section>
+                <title>To Create a JWS File</title>
+                <p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code>, create a folder named <code>ws_tutorial</code>.</p>
+                <p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis/ws_tutorial</code>, create a file named <code>HelloWorld.jws</code>.</p>
+                <p>Edit HelloWorld.jws so it looks like the following:</p>
+                <source><![CDATA[
 import javax.jws.WebService;
 import javax.jws.WebMethod;
 
@@ -100,24 +99,26 @@
     }
 }
 			]]></source>
-			</section>			
-			<section>
-				<title>Test the Web Service: URL Invocation of the web service</title>
-				<p>In this step you will test the web service by generating a WSDL for the web service....[todo: explain what a WSDL is]</p>
-				<p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/startup.bat</code></p>				
-                           <p>Open a browser, and enter the following URL in the browser's address bar:  <fork href="http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl">http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl</fork></p>
-                           <p>The URL above will show the web service WSDL file.</p>
-                           <p>Enter the following URL in the browser address bar: <fork href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</fork></p>
-			</section>
-		</section>
-		
-		<section id="step_3">
-			<title>Step 3: Add a Parameter to the <code>hello</code> Method</title>
-			<section>
-				<title>Edit the JWS File</title>
-				<p></p>
-				<p></p>
-				<source><![CDATA[
+            </section>
+            <section>
+                <title>Test the Web Service: URL Invocation of the web service</title>
+                <p>In this step you will test the web service by generating a WSDL for the web service....[todo: explain what a WSDL is]</p>
+                <p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/startup.bat</code>
+                </p>
+                <p>Open a browser, and enter the following URL in the browser's address bar:  <fork href="http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl">http://localhost:8080/AnnotatedAxis/ws_tutorial/HelloWorld.jws?wsdl</fork>
+                </p>
+                <p>The URL above will show the web service WSDL file.</p>
+                <p>Enter the following URL in the browser address bar: <fork href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</fork>
+                </p>
+            </section>
+        </section>
+        <section id="step_3">
+            <title>Step 3: Add a Parameter to the <code>hello</code> Method</title>
+            <section>
+                <title>Edit the JWS File</title>
+                <p/>
+                <p/>
+                <source><![CDATA[
 import javax.jws.WebService;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -144,15 +145,15 @@
     }
 }
 				]]></source>
-			</section>
-			<section>
-                        <title>Test the Web Service</title>
-                        <p>
-                        <fork href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</fork>
-                        </p>
-                    </section>
-		</section>
-		<!--<section id="step_4">
+            </section>
+            <section>
+                <title>Test the Web Service</title>
+                <p>
+                    <fork href="http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello">http://localhost:8080/AnnotatedAxis/HelloWorld.jws?method=sayHello</fork>
+                </p>
+            </section>
+        </section>
+        <!--<section id="step_4">
 			<title>Step 4: Submitting Data</title>
 			<section>
 				<title>To Create a Submission Form</title>
@@ -375,10 +376,10 @@
 			<p>[todo: more detailed summary]</p>
 		</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/>
+    </body>
+    <footer>
+        <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
 	&copy; 2004, Apache Software Foundation
 	</legal>
-	</footer>
+    </footer>
 </document>