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/15 22:38:02 UTC

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

Author: steveh
Date: Mon Nov 15 13:38:01 2004
New Revision: 71511

Added:
   incubator/beehive/site/build/site/setup.html   (contents, props changed)
   incubator/beehive/site/src/documentation/content/xdocs/setup.xml   (contents, props changed)
Modified:
   incubator/beehive/site/build/site/Controls.html
   incubator/beehive/site/build/site/contributors.html
   incubator/beehive/site/build/site/controls/sample_controls-blank.html
   incubator/beehive/site/build/site/controls/sample_controls-db.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/pageflow_altering.html
   incubator/beehive/site/build/site/pageflow/pageflow_building.html
   incubator/beehive/site/build/site/pageflow/pageflow_controllers.html
   incubator/beehive/site/build/site/pageflow/pageflow_jsp.html
   incubator/beehive/site/build/site/pageflow/pageflow_overview.html
   incubator/beehive/site/build/site/pageflow/sample_netui-blank.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/sample_Dashboard.html
   incubator/beehive/site/build/site/wsm/sample_wsm-blank.html
   incubator/beehive/site/build/site/wsm/tutorial_wsm.html
   incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml
   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:
Added general "set up" topic, tutorials now refer this topic.  Boilerplate text removed from tutorials.

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/controls/sample_controls-blank.html
==============================================================================
--- incubator/beehive/site/build/site/controls/sample_controls-blank.html	(original)
+++ incubator/beehive/site/build/site/controls/sample_controls-blank.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/controls/sample_controls-db.html
==============================================================================
--- incubator/beehive/site/build/site/controls/sample_controls-db.html	(original)
+++ incubator/beehive/site/build/site/controls/sample_controls-db.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -302,18 +306,6 @@
 <a href="#step1">Step 1: Begin the Page Flow Tutorial</a>
 <ul class="minitoc">
 <li>
-<a href="#To+Download+and+Install+J2SE5">To Download and Install J2SE5</a>
-</li>
-<li>
-<a href="#To+Install+ANT+1.6.2">To Install ANT 1.6.2</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+Tomcat+5">To Download and Install Tomcat 5</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+a+Beehive+Binary+Distribution">To Download and Install a Beehive Binary Distribution</a>
-</li>
-<li>
 <a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
 </li>
 </ul>
@@ -391,79 +383,36 @@
 <a name="N1003C"></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><a name="To+Download+and+Install+J2SE5"></a>
-<h4>To Download and Install J2SE5</h4>
-<div style="margin-left: 0 ; border: 2px">
-<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="N10053"></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>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="N10064"></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>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>Download the ZIP file and unzip it on your machine.</p>
-</div>
-<a name="N10074"></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>Visit <a target="_blank" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a> and download the latest binary distribution of Beehive.</p>
-<p>Unzip the distribution file on your machine</p>
-</div>
-<a name="N10085"></a><a name="To+Set+up+the+Development+Environment"></a>
+<a name="N10042"></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>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>Follow the setup directions at <a target="_blank" href="../setup.html">Beehive Installation and Setup</a>
 </p>
-<p>Leave the command shell open to use throughout the tutorial</p>
+<p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
 </div>
 </div>
         
-<a name="N100C2"></a><a name="step_2"></a>
+<a name="N10053"></a><a name="step_2"></a>
 <h3>Step 2: Create Control Implementation and Interface Files</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100C8"></a><a name="Introduction"></a>
+<a name="N10059"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>A Beehive Control consists of two files: an interface file (with the JAVA file extension) and an implementation file (with the JCS file extension).  The interface file is the public face of your control.  It lists all of the methods which can be invoked by users.  The implementation file contains the implementation code for the methods listed in the interface file.</p>
 </div>
-<a name="N100D2"></a><a name="To+Create+a+Control+Application+Folder"></a>
+<a name="N10063"></a><a name="To+Create+a+Control+Application+Folder"></a>
 <h4>To Create a Control Application Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the directory <span class="codefrag">CATALINA_HOME/webapps/</span>, create a directory called <span class="codefrag">control_tutorial</span>.</p>
 </div>
-<a name="N100E2"></a><a name="To+Add+Beehive+Runtime+JARs+to+Your+Application."></a>
+<a name="N10073"></a><a name="To+Add+Beehive+Runtime+JARs+to+Your+Application."></a>
 <h4>To Add Beehive Runtime JARs to Your Application.</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will assemble the runtime resources for your Control.  Most of these files are included in the WEB-INF directory.  It includes JAR files with the JSP tag handler classes, the Controls runtime JAR, 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\control_tutorial</pre>
 </div>
-<a name="N100F5"></a><a name="To+Create+the+Control%27s+Implementation+File"></a>
+<a name="N10086"></a><a name="To+Create+the+Control%27s+Implementation+File"></a>
 <h4>To Create the Control's Implementation File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will create the implementation file for your Beehive Control.  This is a JAVA file, that contains the bulk of your Control's working code.</p>
@@ -486,7 +435,7 @@
 }</pre>
 <p>Save and close <span class="codefrag">HelloImpl.jcs</span>.</p>
 </div>
-<a name="N1012B"></a><a name="To+Create+the+Control%27s+Interface+File"></a>
+<a name="N100BC"></a><a name="To+Create+the+Control%27s+Interface+File"></a>
 <h4>To Create the Control's Interface File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>The interface file is a JAVA file, that defines the public face of your control. <!--[tbd]-->
@@ -503,7 +452,7 @@
     public String hello();
 }</pre>
 </div>
-<a name="N10148"></a><a name="To+Create+a+JSP+Page+to+Test+the+Control"></a>
+<a name="N100D9"></a><a name="To+Create+a+JSP+Page+to+Test+the+Control"></a>
 <h4>To Create a JSP Page to Test the Control</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To test your Beehive Control, you need to call the control from some other resource, such as a JAVA application, JSP page, or Page Flow web application.  In this step you will call the 
@@ -527,20 +476,20 @@
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N10163"></a><a name="To+Compile+the+Control"></a>
+<a name="N100F4"></a><a name="To+Compile+the+Control"></a>
 <h4>To Compile the Control</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile the control.</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\control_tutorial</pre>
 </div>
-<a name="N10175"></a><a name="To+Start+the+Tomcat+Server"></a>
+<a name="N10106"></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:</p>
 <pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
 </div>
-<a name="N10184"></a><a name="To+Test+the+Control"></a>
+<a name="N10115"></a><a name="To+Test+the+Control"></a>
 <h4>To Test the Control</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/control_tutorial/hello.jsp</span>
@@ -550,7 +499,7 @@
 <p>Note the message on the page: "Hello, World!"</p>
 <p>This message is provided by the Hello control.</p>
 </div>
-<a name="N1019A"></a><a name="To+Shutdown+the+Tomcat+Server"></a>
+<a name="N1012B"></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:
@@ -559,7 +508,7 @@
 </div>
 </div>
             
-<a name="N101AA"></a><a name="Step+3%3A+Add+a+Parameterized+Method+to+the+Control"></a>
+<a name="N1013B"></a><a name="Step+3%3A+Add+a+Parameterized+Method+to+the+Control"></a>
 <h3>Step 3: Add a Parameterized Method to the Control</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>[TODO: This step is coming soon.]</p>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_altering.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_altering.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_altering.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_building.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_building.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_building.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_controllers.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_controllers.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_controllers.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_jsp.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_jsp.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_jsp.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/pageflow_overview.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/pageflow_overview.html	(original)
+++ incubator/beehive/site/build/site/pageflow/pageflow_overview.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/pageflow/sample_netui-blank.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/sample_netui-blank.html	(original)
+++ incubator/beehive/site/build/site/pageflow/sample_netui-blank.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -302,18 +306,6 @@
 <a href="#step1">Step 1: Begin the Page Flow Tutorial</a>
 <ul class="minitoc">
 <li>
-<a href="#To+Download+and+Install+J2SE5">To Download and Install J2SE5</a>
-</li>
-<li>
-<a href="#To+Install+ANT+1.6.2">To Install ANT 1.6.2</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+Tomcat+5">To Download and Install Tomcat 5</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+a+Beehive+Binary+Distribution">To Download and Install a Beehive Binary Distribution</a>
-</li>
-<li>
 <a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
 </li>
 <li>
@@ -369,7 +361,7 @@
 <a href="#To+Compile+and+Redeploy+the+Page+Flow">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10257">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N101E9">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -386,10 +378,10 @@
 <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="#To+Compile+and+Redeploy+the+Page+Flow-N102E1">To Compile and Redeploy the Page Flow</a>
+<a href="#To+Compile+and+Redeploy+the+Page+Flow-N10273">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N102EF">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N10281">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -403,10 +395,10 @@
 <a href="#To+Process+the+Submitted+Data">To Process the Submitted Data</a>
 </li>
 <li>
-<a href="#To+Compile+and+Redeploy+the+Page+Flow-N1033C">To Compile and Redeploy the Page Flow</a>
+<a href="#To+Compile+and+Redeploy+the+Page+Flow-N102CE">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N1034A">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N102DC">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -443,57 +435,14 @@
 <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="N1003F"></a><a name="To+Download+and+Install+J2SE5"></a>
-<h4>To Download and Install J2SE5</h4>
-<div style="margin-left: 0 ; border: 2px">
-<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="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>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="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>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>Download the ZIP file and unzip it on your machine.</p>
-</div>
-<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>Visit <a target="_blank" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a> and download the latest binary distribution of Beehive.</p>
-<p>Unzip the distribution file on your machine</p>
-</div>
-<a name="N10082"></a><a name="To+Set+up+the+Development+Environment"></a>
+<a name="N1003F"></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>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>Follow the setup directions at <a target="_blank" href="../setup.html">Beehive Installation and Setup</a>
 </p>
-<p>Leave the command shell open to use throughout the tutorial</p>
+<p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
 </div>
-<a name="N100BE"></a><a name="Add+a+Manager+Role+to+Tomcat"></a>
+<a name="N1004F"></a><a name="Add+a+Manager+Role+to+Tomcat"></a>
 <h4>Add a Manager Role to Tomcat</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <span class="codefrag">runTomcat.xml</span>.  This file is provided as a convenience for managing the Tomcat server.</p>
@@ -509,7 +458,7 @@
   &lt;user username="manager" password="manager" roles="manager"/&gt;
 &lt;/tomcat-users&gt;</pre>
 </div>
-<a name="N100D6"></a><a name="To+Start+the+Tomcat+Server"></a>
+<a name="N10067"></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:</p>
@@ -517,10 +466,10 @@
 </div>
 </div>
         
-<a name="N100E6"></a><a name="step_2"></a>
+<a name="N10077"></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="N100EC"></a><a name="Introduction"></a>
+<a name="N1007D"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -533,7 +482,7 @@
 				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="N10100"></a><a name="Make+a+Project+Folder"></a>
+<a name="N10091"></a><a name="Make+a+Project+Folder"></a>
 <h4>Make a Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>On your C: drive, create a directory named <span class="codefrag">beehive_projects</span>.</p>
@@ -544,7 +493,7 @@
   beehive_projects
     pageflow_tutorial</pre>
 </div>
-<a name="N1011D"></a><a name="To+Copy+Page+Flow+Resources+into+the+Project+Folder"></a>
+<a name="N100AE"></a><a name="To+Copy+Page+Flow+Resources+into+the+Project+Folder"></a>
 <h4>To Copy Page Flow Resources into the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will copy (most of) the Page Flow application template into your project folder.  The application template gives the basic directory structure for a Page Flow web app, and it includes some common resources, for example: image files, supporting JavaScript files, and web app configuration files.</p>
@@ -574,7 +523,7 @@
       netui-blank  -  WRONG!</pre>
 <p></p>
 </div>
-<a name="N1016B"></a><a name="To+Copy+Runtime+JARs+to+the+Project+Folder"></a>
+<a name="N100FC"></a><a name="To+Copy+Runtime+JARs+to+the+Project+Folder"></a>
 <h4>To Copy Runtime JARs to the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will assemble the runtime resources for your Page Flow application.  The runtime JARs include the Page Flow runtime, the &lt;netui&gt; tag library, etc. These resources are loaded into your project's <span class="codefrag">WEB-INF/lib</span> folder using the Ant command below.</p>
@@ -591,7 +540,7 @@
         lib
           [many JAR files]</pre>
 </div>
-<a name="N10188"></a><a name="To+Create+a+Controller+File"></a>
+<a name="N10119"></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, the central file on any Page Flow.</p>
@@ -617,7 +566,7 @@
 }</pre>
 <p>Save and close the file Controller.jpf.</p>
 </div>
-<a name="N101AE"></a><a name="To+Create+a+JSP+File"></a>
+<a name="N1013F"></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_projects/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
@@ -636,7 +585,7 @@
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N101C9"></a><a name="To+Compile+and+Deploy+the+Page+Flow"></a>
+<a name="N1015A"></a><a name="To+Compile+and+Deploy+the+Page+Flow"></a>
 <h4>To Compile and Deploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile the Page Flow and deploy it to Tomcat.</p>
@@ -655,7 +604,7 @@
   undeploy</pre>
 <p>When the undeploy is complete, then compile and deploy again.</p>
 </div>
-<a name="N101E9"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
+<a name="N1017A"></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>Visit the following address:</p>
@@ -666,10 +615,10 @@
 </div>
 </div>
         
-<a name="N101FF"></a><a name="step_3"></a>
+<a name="N10190"></a><a name="step_3"></a>
 <h3>Step 3: Navigation</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10205"></a><a name="To+Create+a+Destination+JSP+Page"></a>
+<a name="N10196"></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_projects/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
@@ -689,7 +638,7 @@
 &lt;/netui:html&gt;</pre>
 <p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
-<a name="N10223"></a><a name="To+Create+a+Link+to+the+Destination+Page"></a>
+<a name="N101B4"></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 <span class="codefrag">C:/beehive_projects/pageflow_tutorial/index.jsp</span>.</p>
@@ -713,7 +662,7 @@
 &lt;/netui:html&gt;
 				</pre>
 </div>
-<a name="N1023E"></a><a name="To+Add+an+Action+Method+to+Handle+the+Link"></a>
+<a name="N101CF"></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 <span class="codefrag">C:/beehive_projects/pageflow_tutorial/Controller.jpf</span>.</p>
@@ -746,7 +695,7 @@
     }</strong>
 }</pre>
 </div>
-<a name="N10259"></a><a name="To+Compile+and+Redeploy+the+Page+Flow"></a>
+<a name="N101EA"></a><a name="To+Compile+and+Redeploy+the+Page+Flow"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -758,7 +707,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N10268"></a><a name="To+Test+the+Page+Flow+Web+Application-N10257"></a>
+<a name="N101F9"></a><a name="To+Test+the+Page+Flow+Web+Application-N101E9"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 
@@ -772,10 +721,10 @@
 </div>
 </div>
         
-<a name="N10281"></a><a name="step_4"></a>
+<a name="N10212"></a><a name="step_4"></a>
 <h3>Step 4: Submitting Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10287"></a><a name="To+Create+a+Submission+Form"></a>
+<a name="N10218"></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_projects/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
@@ -801,7 +750,7 @@
 &lt;/netui:html&gt;</pre>
 <p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
-<a name="N102A2"></a><a name="To+Create+a+Server+Side+Representation+of+the+Submission+Form"></a>
+<a name="N10233"></a><a name="To+Create+a+Server+Side+Representation+of+the+Submission+Form"></a>
 <h4>To Create a Server Side Representation of the Submission Form</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will create a Java class that represents the submission form created in the previous task.  When the form data is submitted, the Java class will be instantiated, and the form data will be loaded into the members of the Java class.</p>
@@ -837,7 +786,7 @@
 }</pre>
 <p>Save and close <span class="codefrag">ProfileForm.java</span>.</p>
 </div>
-<a name="N102CF"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
+<a name="N10260"></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_projects/pageflow_tutorial/Controller.jpf</span>
@@ -886,7 +835,7 @@
 }</pre>
 <p>Save and close <span class="codefrag">Controller.jpf</span>.</p>
 </div>
-<a name="N102F5"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N102E1"></a>
+<a name="N10286"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N10273"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -898,7 +847,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N10304"></a><a name="To+Test+the+Page+Flow+Web+Application-N102EF"></a>
+<a name="N10295"></a><a name="To+Test+the+Page+Flow+Web+Application-N10281"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 
@@ -914,10 +863,10 @@
 </div>
 </div>
         
-<a name="N10323"></a><a name="step_5"></a>
+<a name="N102B4"></a><a name="step_5"></a>
 <h3>Step 5: Processing and Displaying Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10329"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
+<a name="N102BA"></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>In the directory <span class="codefrag">C:/pageflow_tutorial</span> Create a file named <span class="codefrag">displayData.jsp</span>. Edit <span class="codefrag">displayData.jsp</span> so it appears as follows.</p>
@@ -934,7 +883,7 @@
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N10341"></a><a name="To+Process+the+Submitted+Data"></a>
+<a name="N102D2"></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 bold.</p>
@@ -951,7 +900,7 @@
         return new Forward("success");
     }</pre>
 </div>
-<a name="N10353"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N1033C"></a>
+<a name="N102E4"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N102CE"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -963,7 +912,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N10362"></a><a name="To+Test+the+Page+Flow+Web+Application-N1034A"></a>
+<a name="N102F3"></a><a name="To+Test+the+Page+Flow+Web+Application-N102DC"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Added: incubator/beehive/site/build/site/setup.html
==============================================================================
--- (empty file)
+++ incubator/beehive/site/build/site/setup.html	Mon Nov 15 13:38:01 2004
@@ -0,0 +1,415 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Beehive Installation and Setup</title>
+<link type="text/css" href="skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org/"><img border="0" class="logoImage" alt="Apache Incubator" src="images/_incubator-logo.gif"></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/beehive"><img border="0" class="logoImage" alt="Apache Beehive" src="images/_beehive_logo_wide.gif"></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Apache Beehive site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">Beehive</font>
+<ul>
+        
+<li>
+<a href="index.html">Welcome</a>
+</li>
+        
+<li>
+<a href="license.html">License</a>
+</li>
+        
+<li>
+<a href="downloads.html">Downloads</a>
+</li>
+        
+<li>
+<a href="faq.html">FAQ</a>
+</li>
+    
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Documentation</font>
+<ul>
+        
+<li>
+<span class="sel"><font color="#ffcc00">Set Up the Dev Environment</font></span>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Page Flows</font>
+<ul>
+            
+<li>
+<a href="pageflow/pageflow_overview.html">Page Flow Overview</a>
+</li>
+            
+<li>
+<a href="pageflow/pageflow_controllers.html">Page Flow Controllers</a>
+</li>
+            
+<li>
+<a href="pageflow/pageflow_jsp.html">Page Flow JSP</a>
+</li>
+            
+<li>
+<a href="pageflow/pageflow_building.html">Building a Page Flow Web-App</a>
+</li>
+            
+<li>
+<a href="pageflow/pageflow_altering.html">Altering a Page Flow</a>
+</li>        
+            
+<li>
+<a href="pageflow/tutorial_pageflow.html">Page Flow Tutorial</a>
+</li>
+            
+<li>
+<a href="pageflow/guide.html">Page Flow Programming</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Controls</font>
+<ul>
+            
+<li>
+<a href="controls/tutorial_controls.html">Control Tutorial</a>
+</li>
+            
+<li>
+<a href="Controls.html">Control Programming</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Web Services</font>
+<ul>
+            
+<li>
+<a href="wsm/tutorial_wsm.html">Web Services Tutorial</a>
+</li>
+            
+<li>
+<a href="webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="jpetstore.html">Petstore</a>
+</li>
+            
+<li>
+<a href="wsm/sample_Dashboard.html">Petstore Dashboard</a>
+</li>
+            
+<li>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="pageflow/sample_netui-blank.html">Page Flow Project</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+    
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Community</font>
+<ul>
+        
+<li>
+<a href="mailinglists.html">Mailing Lists</a>
+</li>
+        
+<li>
+<a href="contributors.html">Contributors</a>
+</li>
+    
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Beehive Installation and Setup</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#To+Download+and+Install+J2SE5">To Download and Install J2SE5</a>
+</li>
+<li>
+<a href="#To+Install+ANT+1.6.2">To Install ANT 1.6.2</a>
+</li>
+<li>
+<a href="#To+Download+and+Install+Tomcat+5">To Download and Install Tomcat 5</a>
+</li>
+<li>
+<a href="#To+Download+and+Install+a+Beehive+Binary+Distribution">To Download and Install a Beehive Binary Distribution</a>
+</li>
+<li>
+<a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
+</li>
+<li>
+<a href="#Add+a+Manager+Role+to+Tomcat+%28Optional%29">Add a Manager Role to Tomcat (Optional)</a>
+</li>
+</ul>
+        
+<p>This topic explains how to install and set up the Beehive development environment on your machine.</p>
+        
+<a name="N1000F"></a><a name="To+Download+and+Install+J2SE5"></a>
+<h3>To Download and Install J2SE5</h3>
+<div style="margin-left: 0 ; border: 2px">
+<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="N10020"></a><a name="To+Install+ANT+1.6.2"></a>
+<h3>To Install ANT 1.6.2</h3>
+<div style="margin-left: 0 ; border: 2px">
+<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="N10031"></a><a name="To+Download+and+Install+Tomcat+5"></a>
+<h3>To Download and Install Tomcat 5</h3>
+<div style="margin-left: 0 ; border: 2px">
+<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>Download the ZIP file and unzip it on your machine.</p>
+</div>
+        
+<a name="N10042"></a><a name="To+Download+and+Install+a+Beehive+Binary+Distribution"></a>
+<h3>To Download and Install a Beehive Binary Distribution</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Visit (<a target="_blank" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a>) and download the latest binary distribution of Beehive. Note that the current release of Beehive is an alpha: it is <em>not</em> for building production-level applcations.</p>
+<p>Unzip the Beehive distribution file on your machine</p>
+</div>
+        
+<a name="N10056"></a><a name="To+Set+up+the+Development+Environment"></a>
+<h3>To Set up the Development Environment</h3>
+<div style="margin-left: 0 ; border: 2px">
+<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 top level directory of the Beehive distribution).</p>
+<p>At the command prompt, enter: <span class="codefrag">beehiveUser.cmd</span>
+            
+</p>
+</div>
+        
+<a name="N1008F"></a><a name="Add+a+Manager+Role+to+Tomcat+%28Optional%29"></a>
+<h3>Add a Manager Role to Tomcat (Optional)</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <span class="codefrag">runTomcat.xml</span>.  This file is provided as a convenience for managing the Tomcat server.</p>
+<p>Edit the file <span class="codefrag">CATALINA_HOME/conf/tomcat-users.xml</span> so it appears as follows:</p>
+<pre class="code">&lt;?xml version='1.0' encoding='utf-8'?&gt;
+&lt;tomcat-users&gt;
+  &lt;role rolename="tomcat"/&gt;
+  &lt;role rolename="role1"/&gt;
+  &lt;role rolename="manager"/&gt;
+  &lt;user username="tomcat" password="tomcat" roles="tomcat"/&gt;
+  &lt;user username="role1" password="tomcat" roles="role1"/&gt;
+  &lt;user username="both" password="tomcat" roles="tomcat,role1"/&gt;
+  &lt;user username="manager" password="manager" roles="manager"/&gt;
+&lt;/tomcat-users&gt;</pre>
+</div>
+    
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="skin/images/spacer.gif" class="spacer"><a href="skin/images/label.gif"></a><a href="skin/images/page.gif"></a><a href="skin/images/chapter.gif"></a><a href="skin/images/chapter_open.gif"></a><a href="skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;The Apache Software Foundation. All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/wsm/sample_Dashboard.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_Dashboard.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_Dashboard.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

Modified: incubator/beehive/site/build/site/wsm/sample_wsm-blank.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_wsm-blank.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_wsm-blank.html	Mon Nov 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>

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 15 13:38:01 2004
@@ -121,6 +121,10 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
+<li>
+<a href="../setup.html">Set Up the Dev Environment</a>
+</li>
+        
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -294,18 +298,6 @@
 <a href="#step1">Step 1: Begin the Web Service Tutorial</a>
 <ul class="minitoc">
 <li>
-<a href="#To+Download+and+Install+J2SE5">To Download and Install J2SE5</a>
-</li>
-<li>
-<a href="#To+Install+ANT+1.6.2">To Install ANT 1.6.2</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+Tomcat+5">To Download and Install Tomcat 5</a>
-</li>
-<li>
-<a href="#To+Download+and+Install+a+Beehive+Binary+Distribution">To Download and Install a Beehive Binary Distribution</a>
-</li>
-<li>
 <a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
 </li>
 <li>
@@ -357,7 +349,7 @@
 <a href="#Step+4%3A+Add+a+Non-Web+Invokable+Method">Step 4: Add a Non-Web Invokable Method</a>
 <ul class="minitoc">
 <li>
-<a href="#Compile+and+Redeploy+the+Web+Service-N101F8">Compile and Redeploy the Web Service</a>
+<a href="#Compile+and+Redeploy+the+Web+Service-N10189">Compile and Redeploy the Web Service</a>
 </li>
 <li>
 <a href="#To+Test+the+Non-Web+Invokable+Method">To Test the Non-Web Invokable Method</a>
@@ -391,58 +383,14 @@
 <a name="N10030"></a><a name="step1"></a>
 <h3>Step 1: Begin the Web Service Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10036"></a><a name="To+Download+and+Install+J2SE5"></a>
-<h4>To Download and Install J2SE5</h4>
-<div style="margin-left: 0 ; border: 2px">
-<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="N10047"></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>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="N10058"></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>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>Download the ZIP file and unzip it on your machine.</p>
-</div>
-<a name="N10069"></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>Visit (<a target="_blank" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a>) and download the latest binary distribution of Beehive.</p>
-<p>Unzip the distribution file on your machine</p>
-</div>
-<a name="N1007A"></a><a name="To+Set+up+the+Development+Environment"></a>
+<a name="N10036"></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>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 top level directory of the Beehive distribution).  Throughout this tutorial, this directory will be refered to as BEEHIVE_HOME.</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveUser.cmd</span>
-                
+<p>Follow the setup directions at <a target="_blank" href="../setup.html">Beehive Installation and Setup</a>
 </p>
-<p>Leave the command shell open to use throughout the tutorial</p>
+<p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
 </div>
-<a name="N100B6"></a><a name="Add+a+Manager+Role+to+Tomcat"></a>
+<a name="N10046"></a><a name="Add+a+Manager+Role+to+Tomcat"></a>
 <h4>Add a Manager Role to Tomcat</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <span class="codefrag">runTomcat.xml</span>.  This file is provided as a convenience for managing the Tomcat server.</p>
@@ -458,7 +406,7 @@
   &lt;user username="manager" password="manager" roles="manager"/&gt;
 &lt;/tomcat-users&gt;</pre>
 </div>
-<a name="N100CE"></a><a name="To+Start+the+Tomcat+Server"></a>
+<a name="N1005E"></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:</p>
@@ -466,10 +414,10 @@
 </div>
 </div>
         
-<a name="N100DE"></a><a name="step_2"></a>
+<a name="N1006E"></a><a name="step_2"></a>
 <h3>Step 2: Install the Web Service Template</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100E6"></a><a name="Make+a+Project+Folder"></a>
+<a name="N10076"></a><a name="Make+a+Project+Folder"></a>
 <h4>Make a Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>On your C: drive, create a directory called <span class="codefrag">beehive_projects</span>.</p>
@@ -479,7 +427,7 @@
   beehive_projects
     ws_tutorial</pre>
 </div>
-<a name="N10101"></a><a name="To+Copy+the+Web+Services+Application+Template"></a>
+<a name="N10091"></a><a name="To+Copy+the+Web+Services+Application+Template"></a>
 <h4>To Copy the Web Services Application Template</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will copy the Web Services project template into your project folder.  The project template contains a simple web service and a test JSP page.</p>
@@ -496,7 +444,7 @@
       happyaxis.jsp
       index.html</pre>
 </div>
-<a name="N1012F"></a><a name="Copy+the+Runtime+JARs+into+the+Project+Folder"></a>
+<a name="N100BF"></a><a name="Copy+the+Runtime+JARs+into+the+Project+Folder"></a>
 <h4>Copy the Runtime JARs into the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To copy the runtime JARs into your project, run the following Ant command:</p>
@@ -506,7 +454,7 @@
   deploy.wsm.webapp.runtime</pre>
 <p>This will copy the JAR files from <span class="codefrag">BEEHIVE_HOME/lib/wsm</span> into <span class="codefrag">C:/beehive_projects/ws_tutorial/WEB-INF/lib</span>.</p>
 </div>
-<a name="N10147"></a><a name="Examine+the+Blank.jws+Web+Service"></a>
+<a name="N100D7"></a><a name="Examine+the+Blank.jws+Web+Service"></a>
 <h4>Examine the Blank.jws Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile and run your web service.</p>
@@ -533,14 +481,14 @@
 <p>
 <span class="codefrag">@WebService</span> and <span class="codefrag">@WebMethod</span> are "metadata annotations", a.k.a. "annotations".  Annotations allow you to set properties on Java classes and methods.  They can be used to generate compile-time artifacts such as configuration files or Java classes (this is how many Beehive Control annotations work) or to determine some runtime behavior (this is how Beehive Web Service annotations work).  <span class="codefrag">@WebService</span> annotates (or "decorates") the class Blank: this tells the runtime that Blank is a web service that listens for SOAP messages and responds in kind.  <span class="codefrag">@WebMethod</span> annotates the method sayHelloWorld(): this tells the runtime that the method can be invoked over the web.</p>
 </div>
-<a name="N10172"></a><a name="Compile+and+Deploy+the+Web+Service"></a>
+<a name="N10102"></a><a name="Compile+and+Deploy+the+Web+Service"></a>
 <h4>Compile and Deploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will compile the web service and deploy it to Tomcat, all in one step.</p>
 <p>Run the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp deploy</pre>
 </div>
-<a name="N10184"></a><a name="To+Run+the+Web+Service+Provided+in+the+Template"></a>
+<a name="N10114"></a><a name="To+Run+the+Web+Service+Provided+in+the+Template"></a>
 <h4>To Run the Web Service Provided in the Template</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the index.jsp page: <a target="_blank" href="http://localhost:8080/ws_tutorial/index.jsp">http://localhost:8080/ws_tutorial/index.jsp</a>.</p>
@@ -550,10 +498,10 @@
 </div>
 </div>
         
-<a name="N1019C"></a><a name="step_3"></a>
+<a name="N1012C"></a><a name="step_3"></a>
 <h3>Step 3: Add a Parameterized Method to the Web Service</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N101A2"></a><a name="Edit+the+JWS+File"></a>
+<a name="N10132"></a><a name="Edit+the+JWS+File"></a>
 <h4>Edit the JWS File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p></p>
@@ -584,14 +532,14 @@
 }</pre>
 <p>The <span class="codefrag">@WebParam</span> you just added lets you pass a String parameter to the method over the web.</p>
 </div>
-<a name="N101C2"></a><a name="Compile+and+Redeploy+the+Web+Service"></a>
+<a name="N10152"></a><a name="Compile+and+Redeploy+the+Web+Service"></a>
 <h4>Compile and Redeploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 <p>This Ant command compiles the app, undeploys it, and then deploys it.  Calling <span class="codefrag">ant ... redeploy</span> is equivalent to calling <span class="codefrag">ant ... undeploy deploy</span>.</p>
 </div>
-<a name="N101DA"></a><a name="Test+the+Parameterized+Method"></a>
+<a name="N1016A"></a><a name="Test+the+Parameterized+Method"></a>
 <h4>Test the Parameterized Method</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>
@@ -608,7 +556,7 @@
 </div>
 </div>
         
-<a name="N101F0"></a><a name="Step+4%3A+Add+a+Non-Web+Invokable+Method"></a>
+<a name="N10180"></a><a name="Step+4%3A+Add+a+Non-Web+Invokable+Method"></a>
 <h3>Step 4: Add a Non-Web Invokable Method</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Edit the file <span class="codefrag">C:/beehive_projects/ws_tutorial/WEB-INF/src/template/Blank.jws</span> so it appears as follows. Code to add appears in bold type.</p>
@@ -643,14 +591,14 @@
 }
 </pre>
 <p>Note that the method added, sayNothingOverTheWeb(), does not have the annotation @WebMethod, indicating that it cannot be invoked by SOAP messages over the web.</p>
-<a name="N10207"></a><a name="Compile+and+Redeploy+the+Web+Service-N101F8"></a>
+<a name="N10197"></a><a name="Compile+and+Redeploy+the+Web+Service-N10189"></a>
 <h4>Compile and Redeploy the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 <p>This Ant command compiles the app, undeploys it, and then deploys it.  Calling <span class="codefrag">ant ... redeploy</span> is equivalent to calling <span class="codefrag">ant ... undeploy deploy</span>.</p>
 </div>
-<a name="N1021F"></a><a name="To+Test+the+Non-Web+Invokable+Method"></a>
+<a name="N101AF"></a><a name="To+Test+the+Non-Web+Invokable+Method"></a>
 <h4>To Test the Non-Web Invokable Method</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>
@@ -668,7 +616,7 @@
   &lt;/soapenv:Body&gt;
 &lt;/soapenv:Envelope&gt; </pre>
 </div>
-<a name="N10234"></a><a name="Step+5%3A+Change+the+SOAP+Style"></a>
+<a name="N101C4"></a><a name="Step+5%3A+Change+the+SOAP+Style"></a>
 <h4>Step 5: Change the SOAP Style</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>The default SOAP style for JSR-181 web services is DOC-literal.  In this step you will change the style to RPC-encoded.</p>
@@ -704,13 +652,13 @@
         return "Not for for Web consumption!";
     }
 }</pre>
-<a name="N1024E"></a><a name="Compile+and+Redeploy+the+Web+Service-N1023C"></a>
+<a name="N101DE"></a><a name="Compile+and+Redeploy+the+Web+Service-N101CD"></a>
 <h5>Compile and Redeploy the Web Service</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter the following Ant command:</p>
 <pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial -Dcontext.path=ws_tutorial build.webapp redeploy</pre>
 </div>
-<a name="N1025D"></a><a name="To+Test+the+Non-Web+Invokable+Method-N1024A"></a>
+<a name="N101ED"></a><a name="To+Test+the+Non-Web+Invokable+Method-N101DB"></a>
 <h5>To Test the Non-Web Invokable Method</h5>
 <div style="margin-left: 0 ; border: 2px">
 <p>Enter the following URL in the address bar of your browser. </p>

Modified: incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml	Mon Nov 15 13:38:01 2004
@@ -27,47 +27,9 @@
         <section id="step1">
             <title>Step 1: Begin the Page Flow Tutorial</title>
             <section>
-                <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>Download and install the latest version of J2SE5.</p>
-            </section>
-            <section>
-                <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>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>To Download and Install a Beehive Binary Distribution</title>
-                <p>Visit <fork href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</fork> and download the latest binary distribution of Beehive.</p>
-                <p>Unzip the distribution file on your machine</p>
-            </section>
-            <section>
                 <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 the command shell open to use throughout the tutorial</p>
+                <p>Follow the setup directions at <fork href="../setup.html">Beehive Installation and Setup</fork></p>
+                <p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
             </section>
         </section>
         <section id="step_2">

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 15 13:38:01 2004
@@ -26,47 +26,9 @@
         <section id="step1">
             <title>Step 1: Begin the Page Flow Tutorial</title>
             <section>
-                <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>Download and install the latest version of J2SE5.</p>
-            </section>
-            <section>
-                <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>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>To Download and Install a Beehive Binary Distribution</title>
-                <p>Visit <fork href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</fork> and download the latest binary distribution of Beehive.</p>
-                <p>Unzip the distribution file on your machine</p>
-            </section>
-            <section>
                 <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 the command shell open to use throughout the tutorial</p>
+                <p>Follow the setup directions at <fork href="../setup.html">Beehive Installation and Setup</fork></p>
+                <p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
             </section>
             <section>
                 <title>Add a Manager Role to Tomcat</title>

Added: incubator/beehive/site/src/documentation/content/xdocs/setup.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/site/src/documentation/content/xdocs/setup.xml	Mon Nov 15 13:38:01 2004
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+<document>
+    <header>
+        <title>Beehive Installation and Setup</title>
+    </header>
+    <body>
+        <p>This topic explains how to install and set up the Beehive development environment on your machine.</p>
+        <section>
+            <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>Download and install the latest version of J2SE5.</p>
+        </section>
+        <section>
+            <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>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>To Download and Install a Beehive Binary Distribution</title>
+            <p>Visit (<fork href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</fork>) and download the latest binary distribution of Beehive. Note that the current release of Beehive is an alpha: it is <em>not</em> for building production-level applcations.</p>
+            <p>Unzip the Beehive distribution file on your machine</p>
+        </section>
+        <section>
+            <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 top level directory of the Beehive distribution).</p>
+            <p>At the command prompt, enter: <code>beehiveUser.cmd</code>
+            </p>
+        </section>
+        <section>
+            <title>Add a Manager Role to Tomcat (Optional)</title>
+            <p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <code>runTomcat.xml</code>.  This file is provided as a convenience for managing the Tomcat server.</p>
+            <p>Edit the file <code>CATALINA_HOME/conf/tomcat-users.xml</code> so it appears as follows:</p>
+            <source><![CDATA[<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <role rolename="manager"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="manager" password="manager" roles="manager"/>
+</tomcat-users>]]></source>
+        </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/>
+	&copy; 2004, Apache Software Foundation
+	</legal>
+    </footer>
+</document>

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 15 13:38:01 2004
@@ -7,6 +7,7 @@
         <faq label="FAQ" href="faq.html"/>
     </about>
     <documentation label="Documentation">
+        <setup label="Set Up the Dev Environment" href="setup.html" />
         <!--<beehive label="Beehive">
             <guide label="Putting the Pieces Together" href="beehive/guide.html"/>
         </beehive>-->

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 15 13:38:01 2004
@@ -19,49 +19,10 @@
         </section>
         <section id="step1">
             <title>Step 1: Begin the Web Service Tutorial</title>
-            <section>
-                <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>Download and install the latest version of J2SE5.</p>
-            </section>
-            <section>
-                <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>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>To Download and Install a Beehive Binary Distribution</title>
-                <p>Visit (<fork href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</fork>) and download the latest binary distribution of Beehive.</p>
-                <p>Unzip the distribution file on your machine</p>
-            </section>
-            <section>
+<section>
                 <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 top level directory of the Beehive distribution).  Throughout this tutorial, this directory will be refered to as BEEHIVE_HOME.</p>
-                <p>At the command prompt, enter: <code>beehiveUser.cmd</code>
-                </p>
-                <p>Leave the command shell open to use throughout the tutorial</p>
+                <p>Follow the setup directions at <fork href="../setup.html">Beehive Installation and Setup</fork></p>
+                <p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
             </section>
             <section>
                 <title>Add a Manager Role to Tomcat</title>