Author: steveh
Date: Tue Nov 16 10:35:35 2004
New Revision: 76006

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/setup.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/sample_controls-blank.xml
   incubator/beehive/site/src/documentation/content/xdocs/index.xml
   
incubator/beehive/site/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
   incubator/beehive/site/src/documentation/content/xdocs/setup.xml
   incubator/beehive/site/src/documentation/content/xdocs/site.xml
   
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
   
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
Log:
General cleanup of site:
(1) new links, (2) improved 'set up' page, (3) getting ready for move to 
Forrest 0.6.

Modified: incubator/beehive/site/build/site/Controls.html
==============================================================================
--- incubator/beehive/site/build/site/Controls.html     (original)
+++ incubator/beehive/site/build/site/Controls.html     Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/contributors.html
==============================================================================
--- incubator/beehive/site/build/site/contributors.html (original)
+++ incubator/beehive/site/build/site/contributors.html Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

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       
Tue Nov 16 10:35:35 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Control Project Sample</title>
+<title>Control Project Template</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         
@@ -286,13 +286,13 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Control Project Sample</h1>
+<h1>Control Project Template</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">The Control Application Template</a>
+<a href="#intro">Introduction</a>
 </li>
 <li>
 <a href="#Using+the+Control+Project+Template">Using the Control Project 
Template</a>
@@ -300,9 +300,9 @@
 </ul>
             
 <a name="N1000C"></a><a name="intro"></a>
-<h3>The Control Application Template</h3>
+<h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>Use the "blank" Control sample (located at <span 
class="codefrag">BEEHIVE_HOME/samples/controls-blank</span>) is a template for 
building your own Control projects.  
+<p>Use the "blank" Control sample (located at <span 
class="codefrag">BEEHIVE_HOME/samples/controls-blank</span>) as a template for 
building your own Control projects.  
 
 </p>
 <p>The template contains a basic 'Hello World' control to get you started.  
Control projects can be archived in a JAR file and then imported into multiple 
applications.  Simply import the JAR archive into the application's WEB-INF/lib 
directory. </p>

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  Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/controls/tutorial_controls.html
==============================================================================
--- incubator/beehive/site/build/site/controls/tutorial_controls.html   
(original)
+++ incubator/beehive/site/build/site/controls/tutorial_controls.html   Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/downloads.html
==============================================================================
--- incubator/beehive/site/build/site/downloads.html    (original)
+++ incubator/beehive/site/build/site/downloads.html    Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/faq.html
==============================================================================
--- incubator/beehive/site/build/site/faq.html  (original)
+++ incubator/beehive/site/build/site/faq.html  Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/index.html
==============================================================================
--- incubator/beehive/site/build/site/index.html        (original)
+++ incubator/beehive/site/build/site/index.html        Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         
@@ -295,19 +295,19 @@
 <a href="#Beehive+releases+a+V1+Alpha">Beehive releases a V1 Alpha</a>
 </li>
 <li>
-<a href="#News-N1001C">News</a>
+<a href="#Introduction-N1001C">Introduction</a>
 </li>
 <li>
-<a href="#Introduction-N10044">Introduction</a>
+<a href="#Downloads-N10039">Downloads</a>
 </li>
 <li>
-<a href="#Downloads-N1005D">Downloads</a>
+<a href="#News-N1004A">News</a>
 </li>
 <li>
 <a href="#Get+Involved">Get Involved</a>
 </li>
 </ul>
-    <!--
+        <!--
     Beehive
         Welcome<should link to the HTML page created from Welcome.doc>
         License<should link to http://www.apache.org/licenses/LICENSE-2.0>
@@ -322,81 +322,79 @@
         Mailing Lists<should link to HTML Page created from MailingLists.doc>
         Contributers<should link to HTML Page created from Contributers.doc>
     -->
-    
-    
+        
 <a name="N1000E"></a><a name="Beehive+releases+a+V1+Alpha"></a>
 <h3>Beehive releases a V1 Alpha</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Yes.  That's right.  The Beehive team released a V1 alpha.  We'd love it if 
you'd <a href="downloads.html">give it a whirl</a>!</p>
 </div>
-    
-<a name="N1001C"></a><a name="News-N1001C"></a>
-<h3>News</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="News"></a>
-<ul>
-       
-<li>Beehive now has a <a target="_blank" 
href="http://wiki.apache.org/beehive";>wiki</a>.</li>
-       
-<li>File bugs or feature requests in <a target="_blank" 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570";>jira</a>
 for Beehive.</li>
-       
-<li>
-<a target="_blank" href="http://www.eclipse.org/pollinate/";>Pollinate</a> is a 
project to build an Eclipse-based IDE on the Beehive Framework.  The project 
proposal is currently under review.  Feedback is welcome.</li>
-       
-<li>Would you like to contribute?  Subscribe now to the -dev, -user or 
-commits mailing lists for Beehive.  See the <a 
href="mailinglists.html">Mailing Lists</a> for subscription and archive 
infomation.</li>
-     
-</ul>
-</div>
-    
-    
-<a name="N10044"></a><a name="Introduction-N10044"></a>
+        
+<a name="N1001C"></a><a name="Introduction-N1001C"></a>
 <h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
 <a name="Introduction"></a>
-<p> Welcome to Beehive! This is the project working on making J2EE easier 
-        by building a simple object model on J2EE and Struts. The goal is to 
take 
-        the new JSR-175 metadata annotations and use them to reduce the coding 
+<p> Welcome to Beehive! Our goal is to make J2EE programming easier 
+        by building a simple object model on J2EE and Struts. Using 
+        the new JSR-175 and JSR-181 metadata annotations Beehive reduces the 
coding 
         necessary for J2EE. The initial Beehive project has three pieces.</p>
 <ul>
-        
-<li>NetUI PageFlows &ndash; These are built on top of struts, and allow easier 
-          tooling as well as automatic updating of struts config files with 
the 
+                
+<li>NetUI PageFlows &ndash; A web application framework built on top of Struts 
allowing easier 
+          tooling as well as automatic updating of Struts configuration files 
with the 
           use of metadata.</li>
-        
-<li> Controls &ndash; These are a lightweight component framework that 
+                
+<li> Controls &ndash; Lightweight component framework that 
           helps programmers build components that incorporate metadata into 
their 
-          programming model. This project will come with a few pre-made 
controls 
-          as well.</li>
-        
-<li>Web Services &ndash; This will be the Reference Implementation of JSR-181, 
which is 
-          an annotation driven programming model for Web Services.</li>
-      
+          programming model. This project comes with a few pre-made controls 
+          as well, for example, see the <a 
href="controls/sample_controls-db.html">Database Control Sample</a>.</li>
+                
+<li>Web Services &ndash; An Implementation of JSR-181, 
+          an annotation driven programming model for web services.</li>
+            
 </ul>
 </div>
-
-    
-<a name="N1005D"></a><a name="Downloads-N1005D"></a>
+        
+<a name="N10039"></a><a name="Downloads-N10039"></a>
 <h3>Downloads</h3>
 <div style="margin-left: 0 ; border: 2px">
 <a name="Downloads"></a>
 <p> See <a href="downloads.html">downloads</a>
+            
 </p>
 </div>
-    
-    
-<a name="N1006D"></a><a name="Get+Involved"></a>
+        
+<a name="N1004A"></a><a name="News-N1004A"></a>
+<h3>News</h3>
+<div style="margin-left: 0 ; border: 2px">
+<a name="News"></a>
+<ul>
+                
+<li>Beehive now has a <a target="_blank" 
href="http://wiki.apache.org/beehive";>wiki</a>.</li>
+                
+<li>File bugs or feature requests in <a target="_blank" 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570";>jira</a>
 for Beehive.</li>
+                
+<li>
+                    
+<a target="_blank" href="http://www.eclipse.org/pollinate/";>Pollinate</a> is a 
project to build an Eclipse-based IDE on the Beehive Framework.  The project 
proposal is currently under review.  Feedback is welcome.</li>
+                
+<li>Would you like to contribute?  Subscribe now to the -dev, -user or 
-commits mailing lists for Beehive.  See the <a 
href="mailinglists.html">Mailing Lists</a> for subscription and archive 
infomation.</li>
+            
+</ul>
+</div>
+        
+<a name="N10073"></a><a name="Get+Involved"></a>
 <h3>Get Involved</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-      
+                
 <a href="mailinglists.html">Mailing Lists</a>
+                
 <br>
-      
+                
 <a href="contributors.html">Contributors</a>
-      
+            
 </p>
 </div>
-
     
 <div class="attribution"></div>
 </div>

Modified: incubator/beehive/site/build/site/jpetstore.html
==============================================================================
--- incubator/beehive/site/build/site/jpetstore.html    (original)
+++ incubator/beehive/site/build/site/jpetstore.html    Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/license.html
==============================================================================
--- incubator/beehive/site/build/site/license.html      (original)
+++ incubator/beehive/site/build/site/license.html      Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/mailinglists.html
==============================================================================
--- incubator/beehive/site/build/site/mailinglists.html (original)
+++ incubator/beehive/site/build/site/mailinglists.html Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/pageflow/guide.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/guide.html       (original)
+++ incubator/beehive/site/build/site/pageflow/guide.html       Tue Nov 16 
10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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   Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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   Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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        
Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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        Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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   Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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  Tue Nov 
16 10:35:35 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Page Flow Project Sample</title>
+<title>Page Flow Project Template</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         
@@ -286,13 +286,13 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Page Flow Project Sample</h1>
+<h1>Page Flow Project Template</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">The Page Flow Application Template</a>
+<a href="#intro">Introduction</a>
 </li>
 <li>
 <a href="#Using+the+Page+Flow+Web+App+Template">Using the Page Flow Web App 
Template</a>
@@ -300,7 +300,7 @@
 </ul>
         
 <a name="N1000C"></a><a name="intro"></a>
-<h3>The Page Flow Application Template</h3>
+<h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Use the "blank" Page Flow sample (located at <span 
class="codefrag">BEEHIVE_HOME/samples/netui-blank</span>) as a template for 
building your own Page Flow applications.  
 The sample contains everything needed in a basic Page Flow application, except 
for the runtime  and &lt;netui&gt; tag library JAR files.  

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   Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/reference.html
==============================================================================
--- incubator/beehive/site/build/site/reference.html    (original)
+++ incubator/beehive/site/build/site/reference.html    Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/setup.html
==============================================================================
--- incubator/beehive/site/build/site/setup.html        (original)
+++ incubator/beehive/site/build/site/setup.html        Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<span class="sel"><font color="#ffcc00">Set Up the Dev 
Environment</font></span>
+<span class="sel"><font color="#ffcc00">Installation and Setup</font></span>
 </li>
         
         
@@ -292,6 +292,9 @@
 </table>
 <ul class="minitoc">
 <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+Download+and+Install+J2SE5">To Download and Install J2SE5</a>
 </li>
 <li>
@@ -301,19 +304,29 @@
 <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>
+<li>
+<a href="#Start+Tomcat+%28Optional%29">Start Tomcat (Optional)</a>
+</li>
+<li>
+<a href="#What+Now%3F">What Now?</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>
+<a name="N1000F"></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="N10023"></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>.
 
@@ -321,7 +334,7 @@
 <p>Download and install the latest version of J2SE5.</p>
 </div>
         
-<a name="N10020"></a><a name="To+Install+ANT+1.6.2"></a>
+<a name="N10034"></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>.
  
@@ -329,7 +342,7 @@
 <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>
+<a name="N10045"></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>
@@ -338,19 +351,12 @@
 <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>
+<p>Open the top level directory of the Beehive distribution (for example, 
<span class="codefrag">C:/apache-beehive-incubating-1.0-alpha-snapshot</span>). 
 Open the file <span class="codefrag">beehiveUser.cmd</span> in a text editor 
and edit it 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
+set BEEHIVE_HOME=C:\apache-beehive-incubating-1.0-alpha-snapshot
 
 REM location of a JDK
 set JAVA_HOME=C:\jdk1.5.0
@@ -371,18 +377,85 @@
 <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>
+<p>Adding the manager role to Tomcat server allows you to run 
deployment-related targets in the Ant file <span 
class="codefrag">BEEEHIVE_HOME/ant/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.  Elements to add are shown in bold type.</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;
+  <strong>&lt;role rolename="manager"/&gt;</strong>
   &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;
+  <strong>&lt;user username="manager" password="manager" 
roles="manager"/&gt;</strong>
 &lt;/tomcat-users&gt;</pre>
+</div>
+        
+<a name="N100AD"></a><a name="Start+Tomcat+%28Optional%29"></a>
+<h3>Start Tomcat (Optional)</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Before running the samples and tutorials ensure that Tomcat is turned on.  
Run the following Ant command to startup Tomcat:</p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
+<p>Or use the Ant command provided in the distribution: </p>
+<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</pre>
+<p>If you use the provided Ant command, you will have to press <span 
class="codefrag">Ctrl+C</span> to continue issuing commands in that command 
shell.</p>
+</div>
+        
+<a name="N100CA"></a><a name="What+Now%3F"></a>
+<h3>What Now?</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>You are now ready to begin developing Beehive applications.  The following 
tutorials introduce the basic development cycle:</p>
+<ul>
+            
+<li>
+<a href="controls/tutorial_controls.html">Beehive Controls Tutorial</a>
+</li>
+            
+<li>
+<a href="pageflow/tutorial_pageflow.html">Beehive Page Flow Tutorial</a>
+</li>
+            
+<li>
+<a href="wsm/tutorial_wsm.html">Beehive Web Service Tutorial</a>
+</li>
+        
+</ul>
+<p>You can also begin running the following samples:</p>
+<ul>
+            
+<li>
+<a href="jpetstore.html">Beehive Sample: Petstore</a>
+</li>
+            
+<li>
+<a href="wsm/sample_Dashboard.html">Beehive Web Service Sample: Petstore 
Dashboard</a>
+</li>
+            
+<li>
+<a href="wsm/sample_AddressBook.html">Beehive AddressBookWS and EmployeeWS 
Samples</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control Sample</a>
+</li>
+        
+</ul>
+<p>The following application templates will help you get a project started:</p>
+<ul>
+            
+<li>
+<a href="pageflow/sample_netui-blank.html">Page Flow Project Template</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project Template</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project Template</a>
+</li>
+        
+</ul>
 </div>
     
 <div class="attribution"></div>

Modified: incubator/beehive/site/build/site/webservices.html
==============================================================================
--- incubator/beehive/site/build/site/webservices.html  (original)
+++ incubator/beehive/site/build/site/webservices.html  Tue Nov 16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="setup.html">Set Up the Dev Environment</a>
+<a href="setup.html">Installation and Setup</a>
 </li>
         
         

Modified: incubator/beehive/site/build/site/wsm/sample_AddressBook.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_AddressBook.html       
(original)
+++ incubator/beehive/site/build/site/wsm/sample_AddressBook.html       Tue Nov 
16 10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

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 Tue Nov 16 
10:35:35 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Beehive Web Service Samples: Petstore Dashboard</title>
+<title>Beehive Web Service Sample: Petstore Dashboard</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         
@@ -286,7 +286,7 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Beehive Web Service Samples: Petstore Dashboard</h1>
+<h1>Beehive Web Service Sample: Petstore Dashboard</h1>
 </td>
 </tr>
 </table>

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 Tue Nov 16 
10:35:35 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Web Service Project Sample</title>
+<title>Web Service Project Sample Template</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         
@@ -286,13 +286,13 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Web Service Project Sample</h1>
+<h1>Web Service Project Sample Template</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">The Web Service Application Template</a>
+<a href="#intro">Introduction</a>
 </li>
 <li>
 <a href="#Using+the+Web+Service+Template">Using the Web Service Template</a>
@@ -300,7 +300,7 @@
 </ul>
         
 <a name="N1000C"></a><a name="intro"></a>
-<h3>The Web Service Application Template</h3>
+<h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Use the "blank" web service sample (located at <span 
class="codefrag">BEEHIVE_HOME/samples/wsm-blank</span>) as a template for 
building your own web service applications.  
 

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     Tue Nov 16 
10:35:35 2004
@@ -122,7 +122,7 @@
 <ul>
         
 <li>
-<a href="../setup.html">Set Up the Dev Environment</a>
+<a href="../setup.html">Installation and Setup</a>
 </li>
         
         

Modified: 
incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml
==============================================================================
--- 
incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml
   (original)
+++ 
incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml
   Tue Nov 16 10:35:35 2004
@@ -2,12 +2,12 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"http://forrest.apache.org/dtd/document-v13.dtd";>
 <document>
     <header>
-        <title>Control Project Sample</title>
+        <title>Control Project Template</title>
     </header>
     <body>
             <section id="intro">
-            <title>The Control Application Template</title>
-<p>Use the "blank" Control sample (located at 
<code>BEEHIVE_HOME/samples/controls-blank</code>) is a template for building 
your own Control projects.  
+            <title>Introduction</title>
+<p>Use the "blank" Control sample (located at 
<code>BEEHIVE_HOME/samples/controls-blank</code>) as a template for building 
your own Control projects.  
 
 </p>
 

Modified: incubator/beehive/site/src/documentation/content/xdocs/index.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/index.xml    
(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/index.xml    Tue Nov 
16 10:35:35 2004
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"document-v12.dtd">
-
 <document>
-
-<header>
-    <title>The Apache Beehive Project</title>
-</header>
-
-<body>
-    <!--
+    <header>
+        <title>The Apache Beehive Project</title>
+    </header>
+    <body>
+        <!--
     Beehive
         Welcome<should link to the HTML page created from Welcome.doc>
         License<should link to http://www.apache.org/licenses/LICENSE-2.0>
@@ -23,62 +20,58 @@
         Mailing Lists<should link to HTML Page created from MailingLists.doc>
         Contributers<should link to HTML Page created from Contributers.doc>
     -->
-    
-    <section>
-    <title>Beehive releases a V1 Alpha</title>
-    <p>Yes.  That's right.  The Beehive team released a V1 alpha.  We'd love 
it if you'd <link href="downloads.html">give it a whirl</link>!</p>
-    </section>
-    <section>
-     <title>News</title>
-     <anchor id="News"></anchor>
-     <ul>
-       <li>Beehive now has a <fork 
href="http://wiki.apache.org/beehive";>wiki</fork>.</li>
-       <li>File bugs or feature requests in <fork 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570";>jira</fork>
 for Beehive.</li>
-       <li><fork href="http://www.eclipse.org/pollinate/";>Pollinate</fork> is 
a project to build an Eclipse-based IDE on the Beehive Framework.  The project 
proposal is currently under review.  Feedback is welcome.</li>
-       <li>Would you like to contribute?  Subscribe now to the -dev, -user or 
-commits mailing lists for Beehive.  See the <link 
href="mailinglists.html">Mailing Lists</link> for subscription and archive 
infomation.</li>
-     </ul>
-    </section>
-    
-    <section>
-      <title>Introduction</title>
-      <anchor id="Introduction" />
-      <p> Welcome to Beehive! This is the project working on making J2EE 
easier 
-        by building a simple object model on J2EE and Struts. The goal is to 
take 
-        the new JSR-175 metadata annotations and use them to reduce the coding 
+        <section>
+            <title>Beehive releases a V1 Alpha</title>
+            <p>Yes.  That's right.  The Beehive team released a V1 alpha.  
We'd love it if you'd <link href="downloads.html">give it a whirl</link>!</p>
+        </section>
+        <section>
+            <title>Introduction</title>
+            <anchor id="Introduction"/>
+            <p> Welcome to Beehive! Our goal is to make J2EE programming 
easier 
+        by building a simple object model on J2EE and Struts. Using 
+        the new JSR-175 and JSR-181 metadata annotations Beehive reduces the 
coding 
         necessary for J2EE. The initial Beehive project has three pieces.</p>
-      <ul>
-        <li>NetUI PageFlows &#8211; These are built on top of struts, and 
allow easier 
-          tooling as well as automatic updating of struts config files with 
the 
+            <ul>
+                <li>NetUI PageFlows &#8211; A web application framework built 
on top of Struts allowing easier 
+          tooling as well as automatic updating of Struts configuration files 
with the 
           use of metadata.</li>
-        <li> Controls &#8211; These are a lightweight component framework that 
+                <li> Controls &#8211; Lightweight component framework that 
           helps programmers build components that incorporate metadata into 
their 
-          programming model. This project will come with a few pre-made 
controls 
-          as well.</li>
-        <li>Web Services &#8211; This will be the Reference Implementation of 
JSR-181, which is 
-          an annotation driven programming model for Web Services.</li>
-      </ul>
-    </section>
-
-    <section>
-      <title>Downloads</title>
-      <anchor id="Downloads" />
-      <p> See <link href="downloads.html">downloads</link></p>
-    </section>
-    
-    <section>
-      <title>Get Involved</title>
-      <p>
-      <link href="mailinglists.html">Mailing Lists</link><br />
-      <link href="contributors.html">Contributors</link>
-      </p>
-    </section>
-
+          programming model. This project comes with a few pre-made controls 
+          as well, for example, see the <link 
href="controls/sample_controls-db.html">Database Control Sample</link>.</li>
+                <li>Web Services &#8211; An Implementation of JSR-181, 
+          an annotation driven programming model for web services.</li>
+            </ul>
+        </section>
+        <section>
+            <title>Downloads</title>
+            <anchor id="Downloads"/>
+            <p> See <link href="downloads.html">downloads</link>
+            </p>
+        </section>
+        <section>
+            <title>News</title>
+            <anchor id="News"/>
+            <ul>
+                <li>Beehive now has a <fork 
href="http://wiki.apache.org/beehive";>wiki</fork>.</li>
+                <li>File bugs or feature requests in <fork 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570";>jira</fork>
 for Beehive.</li>
+                <li>
+                    <fork 
href="http://www.eclipse.org/pollinate/";>Pollinate</fork> is a project to build 
an Eclipse-based IDE on the Beehive Framework.  The project proposal is 
currently under review.  Feedback is welcome.</li>
+                <li>Would you like to contribute?  Subscribe now to the -dev, 
-user or -commits mailing lists for Beehive.  See the <link 
href="mailinglists.html">Mailing Lists</link> for subscription and archive 
infomation.</li>
+            </ul>
+        </section>
+        <section>
+            <title>Get Involved</title>
+            <p>
+                <link href="mailinglists.html">Mailing Lists</link>
+                <br/>
+                <link href="contributors.html">Contributors</link>
+            </p>
+        </section>
     </body>
-    
     <footer>
-       <legal>Java, J2EE, and JCP are trademarks or registered trademarks of 
Sun Microsystems, Inc. in the United States and other countries.<br />
+        <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/pageflow/sample_netui-blank.xml
==============================================================================
--- 
incubator/beehive/site/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
      (original)
+++ 
incubator/beehive/site/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
      Tue Nov 16 10:35:35 2004
@@ -2,11 +2,11 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"http://forrest.apache.org/dtd/document-v13.dtd";>
 <document>
     <header>
-        <title>Page Flow Project Sample</title>
+        <title>Page Flow Project Template</title>
     </header>
     <body>
         <section id="intro">
-            <title>The Page Flow Application Template</title>
+            <title>Introduction</title>
 <p>Use the "blank" Page Flow sample (located at 
<code>BEEHIVE_HOME/samples/netui-blank</code>) as a template for building your 
own Page Flow applications.  
 The sample contains everything needed in a basic Page Flow application, except 
for the runtime  and &lt;netui> tag library JAR files.  
 </p>

Modified: incubator/beehive/site/src/documentation/content/xdocs/setup.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/setup.xml    
(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/setup.xml    Tue Nov 
16 10:35:35 2004
@@ -7,6 +7,11 @@
     <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 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 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>
@@ -25,15 +30,10 @@
             <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>
+            <p>Open the top level directory of the Beehive distribution (for 
example, <code>C:/apache-beehive-incubating-1.0-alpha-snapshot</code>).  Open 
the file <code>beehiveUser.cmd</code> in a text editor and edit it 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
+set BEEHIVE_HOME=C:\apache-beehive-incubating-1.0-alpha-snapshot
 
 REM location of a JDK
 set JAVA_HOME=C:\jdk1.5.0
@@ -51,18 +51,48 @@
         </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>
+            <p>Adding the manager role to Tomcat server allows you to run 
deployment-related targets in the Ant file 
<code>BEEEHIVE_HOME/ant/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.  Elements to add are shown in bold type.</p>
+            <source>&lt;?xml version='1.0' encoding='utf-8'?>
+&lt;tomcat-users>
+  &lt;role rolename="tomcat"/>
+  &lt;role rolename="role1"/>
+  <strong>&lt;role rolename="manager"/></strong>
+  &lt;user username="tomcat" password="tomcat" roles="tomcat"/>
+  &lt;user username="role1" password="tomcat" roles="role1"/>
+  &lt;user username="both" password="tomcat" roles="tomcat,role1"/>
+  <strong>&lt;user username="manager" password="manager" 
roles="manager"/></strong>
+&lt;/tomcat-users></source>
+        </section>
+        <section>
+            <title>Start Tomcat (Optional)</title>
+                <p>Before running the samples and tutorials ensure that Tomcat 
is turned on.  Run the following Ant command to startup Tomcat:</p>
+                 <source>%CATALINA_HOME%\bin\startup.bat</source>  
+                 <p>Or use the Ant command provided in the distribution: </p>
+                 <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
start</source> 
+                 <p>If you use the provided Ant command, you will have to 
press <code>Ctrl+C</code> to continue issuing commands in that command 
shell.</p>
+        </section>
+        <section>
+            <title>What Now?</title>
+        <p>You are now ready to begin developing Beehive applications.  The 
following tutorials introduce the basic development cycle:</p>
+        <ul>
+            <li><link href="controls/tutorial_controls.html">Beehive Controls 
Tutorial</link></li>
+            <li><link href="pageflow/tutorial_pageflow.html">Beehive Page Flow 
Tutorial</link></li>
+            <li><link href="wsm/tutorial_wsm.html">Beehive Web Service 
Tutorial</link></li>
+        </ul>
+        <p>You can also begin running the following samples:</p>
+        <ul>
+            <li><link href="jpetstore.html">Beehive Sample: 
Petstore</link></li>
+            <li><link href="wsm/sample_Dashboard.html">Beehive Web Service 
Sample: Petstore Dashboard</link></li>
+            <li><link href="wsm/sample_AddressBook.html">Beehive AddressBookWS 
and EmployeeWS Samples</link></li>
+            <li><link href="controls/sample_controls-db.html">Database Control 
Sample</link></li>
+        </ul>
+        <p>The following application templates will help you get a project 
started:</p>
+        <ul>
+            <li><link href="pageflow/sample_netui-blank.html">Page Flow 
Project Template</link></li>
+            <li><link href="controls/sample_controls-blank.html">Control 
Project Template</link></li>
+            <li><link href="wsm/sample_wsm-blank.html">Web Service Project 
Template</link></li>
+        </ul>
         </section>
     </body>
     <footer>

Modified: incubator/beehive/site/src/documentation/content/xdocs/site.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/site.xml     
(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/site.xml     Tue Nov 
16 10:35:35 2004
@@ -7,7 +7,7 @@
         <faq label="FAQ" href="faq.html"/>
     </about>
     <documentation label="Documentation">
-        <setup label="Set Up the Dev Environment" href="setup.html" />
+        <setup label="Installation and Setup" 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/sample_Dashboard.xml
==============================================================================
--- 
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml 
    (original)
+++ 
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_Dashboard.xml 
    Tue Nov 16 10:35:35 2004
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"http://forrest.apache.org/dtd/document-v13.dtd";>
 <document>
     <header>
-        <title>Beehive Web Service Samples: Petstore Dashboard</title>
+        <title>Beehive Web Service Sample: Petstore Dashboard</title>
     </header>
     <body>
         <section>

Modified: 
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
==============================================================================
--- 
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml 
    (original)
+++ 
incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml 
    Tue Nov 16 10:35:35 2004
@@ -2,11 +2,11 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" 
"http://forrest.apache.org/dtd/document-v13.dtd";>
 <document>
     <header>
-        <title>Web Service Project Sample</title>
+        <title>Web Service Project Sample Template</title>
     </header>
     <body>
         <section id="intro">
-            <title>The Web Service Application Template</title>
+            <title>Introduction</title>
 <p>Use the "blank" web service sample (located at 
<code>BEEHIVE_HOME/samples/wsm-blank</code>) as a template for building your 
own web service applications.  
 
 </p>

Reply via email to