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/10/23 00:32:12 UTC

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

Author: steveh
Date: Fri Oct 22 15:32:11 2004
New Revision: 55333

Added:
   incubator/beehive/trunk/site/build/site/beehive/
   incubator/beehive/trunk/site/build/site/beehive/guide.html   (contents, props changed)
   incubator/beehive/trunk/site/build/site/glossary.html   (contents, props changed)
   incubator/beehive/trunk/site/src/documentation/content/xdocs/beehive/
   incubator/beehive/trunk/site/src/documentation/content/xdocs/beehive/guide.xml   (contents, props changed)
   incubator/beehive/trunk/site/src/documentation/content/xdocs/glossary.xml   (contents, props changed)
Modified:
   incubator/beehive/trunk/site/build/site/Controls.html
   incubator/beehive/trunk/site/build/site/building.html
   incubator/beehive/trunk/site/build/site/contributors.html
   incubator/beehive/trunk/site/build/site/controls/tutorial_controls.html
   incubator/beehive/trunk/site/build/site/downloads.html
   incubator/beehive/trunk/site/build/site/faq.html
   incubator/beehive/trunk/site/build/site/index.html
   incubator/beehive/trunk/site/build/site/jpetstore.html
   incubator/beehive/trunk/site/build/site/license.html
   incubator/beehive/trunk/site/build/site/mailinglists.html
   incubator/beehive/trunk/site/build/site/pageflow/guide.html
   incubator/beehive/trunk/site/build/site/pageflow/tutorial_pageflow.html
   incubator/beehive/trunk/site/build/site/reference.html
   incubator/beehive/trunk/site/build/site/webservices.html
   incubator/beehive/trunk/site/build/site/wsm/sample_AddressBook.html
   incubator/beehive/trunk/site/build/site/wsm/tutorial_wsm.html
   incubator/beehive/trunk/site/src/documentation/content/xdocs/jpetstore.xml
   incubator/beehive/trunk/site/src/documentation/content/xdocs/pageflow/guide.xml
   incubator/beehive/trunk/site/src/documentation/content/xdocs/site.xml
   incubator/beehive/trunk/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
Log:
Adding place-holder files for the Beehive user guide, and a glossary page.

Modified: incubator/beehive/trunk/site/build/site/Controls.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/Controls.html	(original)
+++ incubator/beehive/trunk/site/build/site/Controls.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Added: incubator/beehive/trunk/site/build/site/beehive/guide.html
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/site/build/site/beehive/guide.html	Fri Oct 22 15:32:11 2004
@@ -0,0 +1,375 @@
+<!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>Putting the Pieces Together</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>
+<font color="#CFDCED">Beehive</font>
+<ul>
+            
+<li>
+<span class="sel"><font color="#ffcc00">Putting the Pieces Together</font></span>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Page Flows</font>
+<ul>
+            
+<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="../webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="../jpetstore.html">Beehive Samples: JPetStore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="../reference.html">Reference Docs</a>
+</li>
+        
+<li>
+<a href="../glossary.html">Glossary</a>
+</li>
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</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>Putting the Pieces Together</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#intro">How Do Page Flows, Controls, and Web Services Fit Together?</a>
+</li>
+<li>
+<a href="#How+Do+Page+Flows+Work%3F">How Do Page Flows Work?</a>
+</li>
+<li>
+<a href="#nav">Navigation</a>
+</li>
+<li>
+<a href="#submit">Submitting Data: Form Beans, and Data Binding</a>
+</li>
+<li>
+<a href="#processing_data">Processing Data</a>
+</li>
+<li>
+<a href="#displaying_data">Displaying Data</a>
+</li>
+<li>
+<a href="#controls">Accessing Back-End Resources with Controls</a>
+</li>
+<li>
+<a href="#validation">Validation</a>
+</li>
+<li>
+<a href="#security">Security</a>
+</li>
+</ul>
+        
+<a name="N1000C"></a><a name="intro"></a>
+<h3>How Do Page Flows, Controls, and Web Services Fit Together?</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p>
+</div>
+        
+<a name="N10016"></a><a name="How+Do+Page+Flows+Work%3F"></a>
+<h3>How Do Page Flows Work?</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
+            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+<p>The JSP files use special tags (the "&lt;netui&gt;" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            </p>
+<p>tbd: need diagram here</p>
+<p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
+            The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
+            While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>
+<p>The programming model: annotations, data binding expressions, &lt;netui&gt; tags, etc.</p>
+</div>
+        
+<a name="N1002C"></a><a name="nav"></a>
+<h3>Navigation</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10033"></a><a name="submit"></a>
+<h3>Submitting Data: Form Beans, and Data Binding</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N1003A"></a><a name="processing_data"></a>
+<h3>Processing Data</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10041"></a><a name="displaying_data"></a>
+<h3>Displaying Data</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10048"></a><a name="controls"></a>
+<h3>Accessing Back-End Resources with Controls</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N1004F"></a><a name="validation"></a>
+<h3>Validation</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10056"></a><a name="security"></a>
+<h3>Security</h3>
+<div style="margin-left: 0 ; border: 2px"></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/trunk/site/build/site/building.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/building.html	(original)
+++ incubator/beehive/trunk/site/build/site/building.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<span class="sel"><font color="#ffcc00">Building Beehive</font></span>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<span class="sel"><font color="#ffcc00">Building Beehive</font></span>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/contributors.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/contributors.html	(original)
+++ incubator/beehive/trunk/site/build/site/contributors.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/controls/tutorial_controls.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/controls/tutorial_controls.html	(original)
+++ incubator/beehive/trunk/site/build/site/controls/tutorial_controls.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="../webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="../wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/downloads.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/downloads.html	(original)
+++ incubator/beehive/trunk/site/build/site/downloads.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/faq.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/faq.html	(original)
+++ incubator/beehive/trunk/site/build/site/faq.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Added: incubator/beehive/trunk/site/build/site/glossary.html
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/site/build/site/glossary.html	Fri Oct 22 15:32:11 2004
@@ -0,0 +1,350 @@
+<!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>Glossary of Terms</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>
+<font color="#CFDCED">Beehive</font>
+<ul>
+            
+<li>
+<a href="beehive/guide.html">Putting the Pieces Together</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Page Flows</font>
+<ul>
+            
+<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="webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="jpetstore.html">Beehive Samples: JPetStore</a>
+</li>
+            
+<li>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="reference.html">Reference Docs</a>
+</li>
+        
+<li>
+<span class="sel"><font color="#ffcc00">Glossary</font></span>
+</li>
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</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>Glossary of Terms</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#Terms">Terms</a>
+</li>
+</ul>
+        
+<a name="N1000C"></a><a name="Terms"></a>
+<h3>Terms</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+<a name="bee_control"></a>Beehive Control -- Beehive Controls are designed to make it easier to integrate complex resources into your Java application.  For example, the     A Beehive Control consists of two JAVA files: a Control implementation file, and a Control interface file.  </p>
+<p>Contoller file</p>
+<p>Contoller implementation</p>
+<p>Contoller interface</p>
+<p>Contoller file</p>
+<p>Data Binding</p>
+<p>Form Bean  --  Typically, a Form Bean is a server-side representation of a HTML &lt;netui:form&gt; tag.  Form Beans follow ordinary Java Bean syntax: each Form Bean is a class consisting of any number of members, each member having a setter and a getter method
+            associated with it.  Form Beans must extend the class org.apache.beehive.netui.pageflow.FormData.  The Sample Form Bean below has two members, each member has a getter and setter method associated with it.</p>
+<pre class="code">
+    public static class ProfileFormBean extends FormData
+    {
+        private int age;
+
+        private String name;
+
+        public void setAge(int age)
+        {
+            this.age = age;
+        }
+
+        public int getAge()
+        {
+            return this.age;
+        }
+        
+        public void setName(String name)
+        {
+            this.name = name;
+        }
+
+        public String getName()
+        {
+            return this.name;
+        }
+    }
+            </pre>
+<p>Form Beans are most often used to pick up data that is submitted from a &lt;netui:form&gt; tag, or incoming data from a back-end resource.  Once the data has been picked up by a Form Bean instance, it is then passed to an Action method.</p>
+<p>JWS</p>
+<p>JPF</p>
+<p>JCS</p>
+<p>&lt;netui&gt; tag library</p>
+<p>Page Flow</p>
+</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/trunk/site/build/site/index.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/index.html	(original)
+++ incubator/beehive/trunk/site/build/site/index.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,18 +157,37 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
 </li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</li>
     
 </ul>
 </li>
@@ -245,20 +261,20 @@
 <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>
-
-    Documentation
-        FAQ<should link to the HTML page created from FAQ.doc>
-        Controls Overview<should link to Kyle's control Overview>
-        Controls Programming<should link to Kyle's Controls programming pdf>
-        Web Services (JSR 181)<should link to http://jcp.org/en/jsr/detail?id=181>
-
-    Contributing
-        Mailing Lists<should link to HTML Page created from MailingLists.doc>
-        Contributers<should link to HTML Page created from Contributers.doc>
+    <!--
+    Beehive
+        Welcome<should link to the HTML page created from Welcome.doc>
+        License<should link to http://www.apache.org/licenses/LICENSE-2.0>
+
+    Documentation
+        FAQ<should link to the HTML page created from FAQ.doc>
+        Controls Overview<should link to Kyle's control Overview>
+        Controls Programming<should link to Kyle's Controls programming pdf>
+        Web Services (JSR 181)<should link to http://jcp.org/en/jsr/detail?id=181>
+
+    Contributing
+        Mailing Lists<should link to HTML Page created from MailingLists.doc>
+        Contributers<should link to HTML Page created from Contributers.doc>
     -->
     
     

Modified: incubator/beehive/trunk/site/build/site/jpetstore.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/jpetstore.html	(original)
+++ incubator/beehive/trunk/site/build/site/jpetstore.html	Fri Oct 22 15:32:11 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Apache Beehive Web Services</title>
+<title>Beehive Sample: PetStore</title>
 <link type="text/css" href="skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -20,9 +20,9 @@
 <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>
+<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>
+<!--================= 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">
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -175,7 +172,11 @@
 <ul>
             
 <li>
-<span class="sel"><font color="#ffcc00">JPetStore Samples</font></span>
+<span class="sel"><font color="#ffcc00">Beehive Samples: JPetStore</font></span>
+</li>
+            
+<li>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
@@ -184,6 +185,18 @@
 <li>
 <a href="reference.html">Reference Docs</a>
 </li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</li>
     
 </ul>
 </li>
@@ -239,18 +252,34 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Apache Beehive Web Services</h1>
+<h1>Beehive Sample: PetStore</h1>
 </td>
 </tr>
 </table>
-
-
-<p>
-See the <a target="_blank" href="http://wiki.apache.org/beehive/Web_20Services">WSM on the Beehive wiki</a> and the 
-<a target="_blank" href="http://jcp.org/en/jsr/detail?id=181">JSR 181 Spec</a> for more information.
-</p>
-
-
+<ul class="minitoc">
+<li>
+<a href="#Anatomy+of+PetStore">Anatomy of PetStore</a>
+</li>
+</ul>
+        
+<a name="N1000C"></a><a name="Anatomy+of+PetStore"></a>
+<h3>Anatomy of PetStore</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        <!-- Just a sketch for now...will re-write from a distribution point of view later 
+        <section>
+            <title>Running the PetStore Sample</title>
+            <p>To run the Petstore sample, you need to (1) add the Beehive supporting JARs (and other files) to the sample's WEB-INF directory, (2) compile the Petstore source, (3) deploy the sample to Tomcat, or some other servlet container, and (4) start up your servlet container.</p>
+            <p>(1) To add the supporting JARs to the WEB-INF directory, run the following target:</p>
+            <source>ant -f C:\beehive-src\trunk\netui\ant\webappTemplate.xml -Dwebapp.dist.dir=C:\dev-apache\beehive\trunk\samples\petstoreWeb</source>
+            <p>(2) To compile the sample source code, run the following target:</p>
+            <source>ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\dev-apache\beehive\trunk\samples\petstoreWeb</source>
+            <p>(3) To deploy the sample to Tomcat, copy the petstoreWeb folder to Tomcat's webapps directory. (C:\dev-apache\beehive\trunk\installed\jakarta-tomcat-5.0.25\webapps) :</p>
+            <p>(4) To start up the Tomcat server, run the following:</p>
+            <source>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</source>
+            <p>Now visit http://localhost:8080/petstoreWeb/index.jsp to see the Petstore application runnng.</p>
+        </section>
+        -->
+    
 <div class="attribution"></div>
 </div>
 </td><td width="10"><img width="10" height="1" alt="" src="skin/images/spacer.gif" class="spacer"></td>

Modified: incubator/beehive/trunk/site/build/site/license.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/license.html	(original)
+++ incubator/beehive/trunk/site/build/site/license.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/mailinglists.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/mailinglists.html	(original)
+++ incubator/beehive/trunk/site/build/site/mailinglists.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/pageflow/guide.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/pageflow/guide.html	(original)
+++ incubator/beehive/trunk/site/build/site/pageflow/guide.html	Fri Oct 22 15:32:11 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Beehive Page Flow Tutorial</title>
+<title>Page Flow Users Guide</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -20,9 +20,9 @@
 <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>
+<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>
+<!--================= 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">
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -175,7 +172,11 @@
 <ul>
             
 <li>
-<a href="../jpetstore.html">JPetStore Samples</a>
+<a href="../jpetstore.html">Beehive Samples: JPetStore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
@@ -184,6 +185,18 @@
 <li>
 <a href="../reference.html">Reference Docs</a>
 </li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</li>
     
 </ul>
 </li>
@@ -239,754 +252,89 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Beehive Page Flow Tutorial</h1>
+<h1>Page Flow Users Guide</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">Introduction To the Page Flow Tutorial</a>
-<ul class="minitoc">
-<li>
-<a href="#Tutorial+Goals">Tutorial Goals</a>
-</li>
-<li>
-<a href="#Note+on+the+Current+State+of+the+Page+Flow+Tutorial">Note on the Current State of the Page Flow Tutorial</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step1">Step 1: Begin the Page Flow Tutorial</a>
-<ul class="minitoc">
-<li></li>
-<li>
-<a href="#Download+and+Install+JDK5">Download and Install JDK5</a>
-</li>
-<li>
-<a href="#Download+and+Install+SVN+%28Subversion+Source+Control%29">Download and Install SVN (Subversion Source Control)</a>
-</li>
-<li>
-<a href="#Download+and+Install+Beehive">Download and Install Beehive</a>
-</li>
-<li>
-<a href="#Install+ANT">Install ANT</a>
-</li>
-<li>
-<a href="#Run+the+">Run the bootstrap Target</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_2">Step 2: Create a New Page Flow Application</a>
-<ul class="minitoc">
-<li>
-<a href="#Introduction">Introduction</a>
-</li>
-<li>
-<a href="#To+Create+a+Controller+File">To Create a Controller File</a>
-</li>
-<li>
-<a href="#To+Create+a+JSP+File">To Create a JSP File</a>
-</li>
-<li>
-<a href="#To+Create+the+WEB-INF+directory">To Create the WEB-INF directory</a>
-</li>
-<li>
-<a href="#Compile+the+Page+Flow">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server">To Start the Tomcat Server</a>
-</li>
-<li>
-<a href="#To+Test+the+Page+Flow+Web+Application">To Test the Page Flow Web Application</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_3">Step 3: Navigation</a>
-<ul class="minitoc">
-<li>
-<a href="#Create+a+Destination+JSP+Page">Create a Destination JSP Page</a>
-</li>
-<li>
-<a href="#Create+a+Link+to+the+Destination+Page">Create a Link to the Destination Page</a>
-</li>
-<li>
-<a href="#Add+an+Action+Method+to+Handle+the+Link">Add an Action Method to Handle the Link</a>
-</li>
-<li>
-<a href="#Compile+the+Page+Flow-N101D6">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server-N101FE">To Start the Tomcat Server</a>
-</li>
-<li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10214">To Test the Page Flow Web Application</a>
-</li>
-<li>
-<a href="#Shutdown+Tomcat+Server">Shutdown Tomcat Server</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_4">Step 4: Submitting Data</a>
-<ul class="minitoc">
-<li>
-<a href="#To+Create+a+Submission+Form">To Create a Submission Form</a>
+<a href="#intro">What's So Great About Page Flows?</a>
 </li>
 <li>
-<a href="#To+Edit+the+Controller+File+to+Handle+the+Submitted+Data">To Edit the Controller File to Handle the Submitted Data</a>
+<a href="#How+Do+Page+Flows+Work%3F">How Do Page Flows Work?</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N10263">Compile the Page Flow</a>
+<a href="#nav">Navigation</a>
 </li>
 <li>
-<a href="#To+Start+the+Tomcat+Server-N1028B">To Start the Tomcat Server</a>
+<a href="#submit">Submitting Data: Form Beans, and Data Binding</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N102A1">To Test the Page Flow Web Application</a>
+<a href="#processing_data">Processing Data</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server-N102B7">Shutdown Tomcat Server</a>
-</li>
-</ul>
+<a href="#displaying_data">Displaying Data</a>
 </li>
 <li>
-<a href="#step_5">Step 5: Processing and Displaying Data</a>
-<ul class="minitoc">
-<li>
-<a href="#To+Process+the+Submitted+Data">To Process the Submitted Data</a>
+<a href="#controls">Accessing Back-End Resources with Controls</a>
 </li>
 <li>
-<a href="#To+Create+a+JSP+Page+to+Display+Submitted+Data">To Create a JSP Page to Display Submitted Data</a>
+<a href="#validation">Validation</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N102E7">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server-N1030F">To Start the Tomcat Server</a>
-</li>
-<li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10325">To Test the Page Flow Web Application</a>
-</li>
-<li>
-<a href="#Shutdown+Tomcat+Server-N1033B">Shutdown Tomcat Server</a>
+<a href="#security">Security</a>
 </li>
 </ul>
-</li>
-<li>
-<a href="#summary">Summary: Page Flow Tutorial</a>
-</li>
-</ul>
-		
+        
 <a name="N1000C"></a><a name="intro"></a>
-<h3>Introduction To the Page Flow Tutorial</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N10012"></a><a name="Tutorial+Goals"></a>
-<h4>Tutorial Goals</h4>
+<h3>What's So Great About Page Flows?</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>In this tutorial, you will learn:</p>
-<ul>
-					
-<li>How to create a basic Page Flow web application</li>
-					
-<li>How to coordinate user navigation with Forward methods</li>
-					
-<li>How to handle data submission and processing with data binding and Form Beans</li>
-					
-<li>How to create a user interface with the &lt;neuti&gt; JSP tag library</li>
-					
-<li>How Page Flows help to separate data processing and data presentation</li>
-				
-</ul>
+<p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p>
 </div>
-<a name="N1002E"></a><a name="Note+on+the+Current+State+of+the+Page+Flow+Tutorial"></a>
-<h4>Note on the Current State of the Page Flow Tutorial</h4>
+        
+<a name="N10016"></a><a name="How+Do+Page+Flows+Work%3F"></a>
+<h3>How Do Page Flows Work?</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>This tutorial is currently a work in progress.  Unfinished portions of the tutorial are marked [tbd], standing for "to be done".  Also the tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
-<p>Please send any comments to  Steve Hanson, at <span class="codefrag">steveh@bea.com</span>.</p>
+<p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
+            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+<p>The JSP files use special tags (the "&lt;netui&gt;" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            </p>
+<p>tbd: need diagram here</p>
+<p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
+            The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
+            While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>
+<p>The programming model: annotations, data binding expressions, &lt;netui&gt; tags, etc.</p>
 </div>
-</div>
-		
-<a name="N1003F"></a><a name="step1"></a>
-<h3>Step 1: Begin the Page Flow Tutorial</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N10045"></a>
-<h4></h4>
+        
+<a name="N1002C"></a><a name="nav"></a>
+<h3>Navigation</h3>
 <div style="margin-left: 0 ; border: 2px"></div>
-<a name="N1004B"></a><a name="Download+and+Install+JDK5"></a>
-<h4>Download and Install JDK5</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download the latest version of JDK5.</p>
-<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <span class="codefrag">C:\jdk1.5.0</span>
-</p>
-<p>[tbd: more detailed installation instructions]</p>
-</div>
-<a name="N10061"></a><a name="Download+and+Install+SVN+%28Subversion+Source+Control%29"></a>
-<h4>Download and Install SVN (Subversion Source Control)</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Visit <a target="_blank" href="http://subversion.tigris.org">http://subversion.tigris.org</a> and install the SVN source control system.</p>
-<p>[tbd: more detailed installation instructions]</p>
-</div>
-<a name="N10072"></a><a name="Download+and+Install+Beehive"></a>
-<h4>Download and Install Beehive</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>
-					Create a directory called <span class="codefrag">beehive-src</span> on your C: drive.  Confirm that the the following directory structure exists: <span class="codefrag">C:/beehive-src</span>.  This directory will store the Beehive source and all of your Beehive projects.					</p>
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">cd beehive-src</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</span>
-				
-</p>
-<p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
-<p>At the command prompt, enter: <span class="codefrag">exit</span>
-				
-</p>
-</div>
-<a name="N1009A"></a><a name="Install+ANT"></a>
-<h4>Install ANT</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Create a directory named <span class="codefrag">installed</span>at <span class="codefrag">C:/beehive-src/trunk/installed</span>.</p>
-<p>Unzip the file <span class="codefrag">C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</span> into <span class="codefrag">C:/beehive-src/Beehive/installed</span>.</p>
-<p>After the file has unzipped, confirm that the following directory structure exists: <span class="codefrag">C:/beehive-src/trunk/installed/apache-ant-1.6.2</span>.</p>
-</div>
-<a name="N100B9"></a><a name="Run+the+"></a>
-<h4>Run the bootstrap Target</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">set BEEHIVE_HOME=C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter:  <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant bootstrap</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">exit</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N100E8"></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="N100EE"></a><a name="Introduction"></a>
-<h4>Introduction</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>
-				In this step you will create a Controller file and a JSP page. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the 				major features of a web application:	how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources.
-				</p>
-<p>	
-				Controller files control the features of a web application through the use of Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do something complex, such as 				receive 	user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed.
-				</p>
-<p>
-				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
-				</p>
-</div>
-<a name="N100FE"></a><a name="To+Create+a+Controller+File"></a>
-<h4>To Create a Controller File</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>In this step you will create the Controller file in place in the Tomcat deployment directory.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps</span>, create a directory called <span class="codefrag">pageflow_tutorial</span>.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file called <span class="codefrag">Controller.jpf</span>.</p>
-<p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-	 
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        return new Forward("success");
-    }
-}
-				</pre>
-</div>
-<a name="N10125"></a><a name="To+Create+a+JSP+File"></a>
-<h4>To Create a JSP File</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
-<p>Edit index.jsp so it looks like the following.</p>
-<pre class="code"> 			
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;index.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
-      index.jsp
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-			</pre>
-</div>
-<a name="N1013D"></a><a name="To+Create+the+WEB-INF+directory"></a>
-<h4>To Create the WEB-INF directory</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>	Open a command shell.</p>
-<p>At the command prompt, enter:  <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\netui\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N1015F"></a><a name="Compile+the+Page+Flow"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10172"></a><a name="To+Start+the+Tomcat+Server"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N10188"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-</div>
-</div>
-		
-<a name="N10199"></a><a name="step_3"></a>
-<h3>Step 3: Navigation</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N1019F"></a><a name="Create+a+Destination+JSP+Page"></a>
-<h4>Create a Destination JSP Page</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
-<p>Edit page2.jsp so it looks like the following.</p>
-<pre class="code">					
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;page2.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
-      Welcome to page2.jsp!
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N101B7"></a><a name="Create+a+Link+to+the+Destination+Page"></a>
-<h4>Create a Link to the Destination Page</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
-<p>Edit index.jsp so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;index.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
-      index.jsp
-    &lt;/p&gt;
-    &lt;p&gt;
-      &lt;netui:anchor action="toPage2"&gt;Link to page2.jsp&lt;/netui:anchor&gt;
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N101C9"></a><a name="Add+an+Action+Method+to+Handle+the+Link"></a>
-<h4>Add an Action Method to Handle the Link</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
- 
-public class Controller 
-    extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="page2.jsp")
-        }
-    )
-    public Forward toPage2()
-    {
-        return new Forward("success");
-    }
-}
-				</pre>
-</div>
-<a name="N101DB"></a><a name="Compile+the+Page+Flow-N101D6"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10203"></a><a name="To+Start+the+Tomcat+Server-N101FE"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N10219"></a><a name="To+Test+the+Page+Flow+Web+Application-N10214"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N1022F"></a><a name="Shutdown+Tomcat+Server"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N1023D"></a><a name="step_4"></a>
-<h3>Step 4: Submitting Data</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N10243"></a><a name="To+Create+a+Submission+Form"></a>
-<h4>To Create a Submission Form</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Edit the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;page2.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
-      Welcome to page2.jsp!
-    &lt;/p&gt;
-    &lt;p&gt;
-      &lt;netui:form action="processData"&gt;
-        &lt;p&gt;Name:&lt;netui:textBox dataSource="actionForm.name"/&gt;
-        &lt;p&gt;Age:&lt;netui:textBox dataSource="actionForm.age"/&gt;
-       &lt;p&gt;&lt;netui:button type="submit"&gt;Submit&lt;/netui:button&gt;
-      &lt;/netui:form&gt;
-    &lt;/p&gt;	
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N10255"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
-<h4>To Edit the Controller File to Handle the Submitted Data</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</span>
-				
-</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.FormData;
- 
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    public Forward begin()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="page2.jsp")
-        }
-    )
-    public Forward toPage2()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards = { 
-            @Jpf.Forward(name = "success", path = "showData.jsp")
-        }
-    )
-    public Forward processData(ProcessDataForm form)
-    {
-	    System.out.println("Name: " + form.name);
-	    System.out.println("Age: " + form.age);
-        return new Forward("success");
-    }
-
-    public static class ProcessDataForm extends FormData
-    {
-        private int age;
-        private String name;
-
-        public void setName(String name)
-        {
-            this.name = name;
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
-
-        public void setAge(int age)
-        {
-            this.age = age;
-        }
-
-        public int getAge()
-        {
-            return this.age;
-        }
-    }
-}
-				</pre>
-</div>
-<a name="N1026A"></a><a name="Compile+the+Page+Flow-N10263"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10292"></a><a name="To+Start+the+Tomcat+Server-N1028B"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N102A8"></a><a name="To+Test+the+Page+Flow+Web+Application-N102A1"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N102BE"></a><a name="Shutdown+Tomcat+Server-N102B7"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N102CC"></a><a name="step_5"></a>
-<h3>Step 5: Processing and Displaying Data</h3>
-<div style="margin-left: 0 ; border: 2px">
-<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 red.</p>
-<pre class="code">
-@Jpf.Action(
-	forwards = { 
-		@Jpf.Forward( name = "success", path = "showData.jsp" )
-	}
-)
-public Forward processData( ProcessDataForm form )
-{
-	System.out.println("Name: " + form.name);
-	System.out.println("Age: " + form.age);
-	getRequest().setAttribute("data", form);
-	return new Forward("success");
-}
-				</pre>
-</div>
-<a name="N102E1"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
-<h4>To Create a JSP Page to Display Submitted Data</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;showData.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-      &lt;p&gt;Name:&lt;netui:span value="${requestScope.data.name}"/&gt;
-      &lt;p&gt;Age:&lt;netui:span value="${requestScope.data.age}"/&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N102F0"></a><a name="Compile+the+Page+Flow-N102E7"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10318"></a><a name="To+Start+the+Tomcat+Server-N1030F"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N1032E"></a><a name="To+Test+the+Page+Flow+Web+Application-N10325"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N10344"></a><a name="Shutdown+Tomcat+Server-N1033B"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N10352"></a><a name="summary"></a>
-<h3>Summary: Page Flow Tutorial</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
-<p>Concepts and Tasks Introduced in This Tutorial</p>
-<p>[tbd: more detailed summary]</p>
-</div>
-	
+        
+<a name="N10033"></a><a name="submit"></a>
+<h3>Submitting Data: Form Beans, and Data Binding</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N1003A"></a><a name="processing_data"></a>
+<h3>Processing Data</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10041"></a><a name="displaying_data"></a>
+<h3>Displaying Data</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10048"></a><a name="controls"></a>
+<h3>Accessing Back-End Resources with Controls</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N1004F"></a><a name="validation"></a>
+<h3>Validation</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+        
+<a name="N10056"></a><a name="security"></a>
+<h3>Security</h3>
+<div style="margin-left: 0 ; border: 2px"></div>
+    
 <div class="attribution"></div>
 </div>
 </td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>

Modified: incubator/beehive/trunk/site/build/site/pageflow/tutorial_pageflow.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/pageflow/tutorial_pageflow.html	(original)
+++ incubator/beehive/trunk/site/build/site/pageflow/tutorial_pageflow.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="../webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="../wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/reference.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/reference.html	(original)
+++ incubator/beehive/trunk/site/build/site/reference.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <span class="sel"><font color="#ffcc00">Reference Docs</font></span>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/webservices.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/webservices.html	(original)
+++ incubator/beehive/trunk/site/build/site/webservices.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <span class="sel"><font color="#ffcc00">Web Services (JSR 181)</font></span>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook Sample</a>
+<a href="wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/wsm/sample_AddressBook.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/wsm/sample_AddressBook.html	(original)
+++ incubator/beehive/trunk/site/build/site/wsm/sample_AddressBook.html	Fri Oct 22 15:32:11 2004
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -160,17 +157,36 @@
 <li>
 <a href="../webservices.html">Web Services (JSR 181)</a>
 </li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
             
 <li>
-<span class="sel"><font color="#ffcc00">AddressBook Sample</font></span>
+<span class="sel"><font color="#ffcc00">WSM Sample: AddressBook</font></span>
 </li>
         
 </ul>
 </li>
         
-        
 <li>
 <a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
 </li>
     
 </ul>

Modified: incubator/beehive/trunk/site/build/site/wsm/tutorial_wsm.html
==============================================================================
--- incubator/beehive/trunk/site/build/site/wsm/tutorial_wsm.html	(original)
+++ incubator/beehive/trunk/site/build/site/wsm/tutorial_wsm.html	Fri Oct 22 15:32:11 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Beehive Page Flow Tutorial</title>
+<title>Beehive Web Service Tutorial</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -20,9 +20,9 @@
 <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>
+<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>
+<!--================= 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">
@@ -121,9 +121,6 @@
 <font color="#CFDCED">Documentation</font>
 <ul>
         
-<li>
-<a href="../building.html">Building Beehive</a>
-</li>
         
 <li>
 <font color="#CFDCED">Page Flows</font>
@@ -175,7 +172,11 @@
 <ul>
             
 <li>
-<a href="../jpetstore.html">JPetStore Samples</a>
+<a href="../jpetstore.html">Beehive Samples: JPetStore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">WSM Sample: AddressBook</a>
 </li>
         
 </ul>
@@ -184,6 +185,18 @@
 <li>
 <a href="../reference.html">Reference Docs</a>
 </li>
+        
+        
+<li>
+<font color="#CFDCED">Beehive Source</font>
+<ul>
+            
+<li>
+<a href="../building.html">Building Beehive</a>
+</li>            
+        
+</ul>
+</li>
     
 </ul>
 </li>
@@ -239,148 +252,66 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Beehive Page Flow Tutorial</h1>
+<h1>Beehive Web Service Tutorial</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#intro">Introduction To the Page Flow Tutorial</a>
+<a href="#intro">Introduction to the Web Service Tutorial</a>
 <ul class="minitoc">
 <li>
 <a href="#Tutorial+Goals">Tutorial Goals</a>
 </li>
 <li>
-<a href="#Note+on+the+Current+State+of+the+Page+Flow+Tutorial">Note on the Current State of the Page Flow Tutorial</a>
+<a href="#Note+on+the+Current+State+of+the+Web+Service+Tutorial">Note on the Current State of the Web Service Tutorial</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#step1">Step 1: Begin the Page Flow Tutorial</a>
+<a href="#step1">Step 1: Begin the Web Service Tutorial</a>
 <ul class="minitoc">
-<li></li>
 <li>
 <a href="#Download+and+Install+JDK5">Download and Install JDK5</a>
 </li>
 <li>
-<a href="#Download+and+Install+SVN+%28Subversion+Source+Control%29">Download and Install SVN (Subversion Source Control)</a>
-</li>
-<li>
-<a href="#Download+and+Install+Beehive">Download and Install Beehive</a>
-</li>
-<li>
 <a href="#Install+ANT">Install ANT</a>
 </li>
 <li>
-<a href="#Run+the+">Run the bootstrap Target</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_2">Step 2: Create a New Page Flow Application</a>
-<ul class="minitoc">
-<li>
-<a href="#Introduction">Introduction</a>
-</li>
-<li>
-<a href="#To+Create+a+Controller+File">To Create a Controller File</a>
-</li>
-<li>
-<a href="#To+Create+a+JSP+File">To Create a JSP File</a>
-</li>
-<li>
-<a href="#To+Create+the+WEB-INF+directory">To Create the WEB-INF directory</a>
-</li>
-<li>
-<a href="#Compile+the+Page+Flow">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server">To Start the Tomcat Server</a>
-</li>
-<li>
-<a href="#To+Test+the+Page+Flow+Web+Application">To Test the Page Flow Web Application</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_3">Step 3: Navigation</a>
-<ul class="minitoc">
-<li>
-<a href="#Create+a+Destination+JSP+Page">Create a Destination JSP Page</a>
-</li>
-<li>
-<a href="#Create+a+Link+to+the+Destination+Page">Create a Link to the Destination Page</a>
-</li>
-<li>
-<a href="#Add+an+Action+Method+to+Handle+the+Link">Add an Action Method to Handle the Link</a>
-</li>
-<li>
-<a href="#Compile+the+Page+Flow-N101D6">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server-N101FE">To Start the Tomcat Server</a>
-</li>
-<li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10214">To Test the Page Flow Web Application</a>
-</li>
-<li>
-<a href="#Shutdown+Tomcat+Server">Shutdown Tomcat Server</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#step_4">Step 4: Submitting Data</a>
-<ul class="minitoc">
-<li>
-<a href="#To+Create+a+Submission+Form">To Create a Submission Form</a>
-</li>
-<li>
-<a href="#To+Edit+the+Controller+File+to+Handle+the+Submitted+Data">To Edit the Controller File to Handle the Submitted Data</a>
-</li>
-<li>
-<a href="#Compile+the+Page+Flow-N10263">Compile the Page Flow</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server-N1028B">To Start the Tomcat Server</a>
+<a href="#Download+and+Install+Tomcat+5">Download and Install Tomcat 5</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N102A1">To Test the Page Flow Web Application</a>
+<a href="#Download+and+Install+a+Beehive+Binary+Distribution">Download and Install a Beehive Binary Distribution</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server-N102B7">Shutdown Tomcat Server</a>
+<a href="#Set+up+the+Development+Environment">Set up the Development Environment</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#step_5">Step 5: Processing and Displaying Data</a>
+<a href="#step_2">Step 2: Create a New Web Service</a>
 <ul class="minitoc">
 <li>
-<a href="#To+Process+the+Submitted+Data">To Process the Submitted Data</a>
-</li>
-<li>
-<a href="#To+Create+a+JSP+Page+to+Display+Submitted+Data">To Create a JSP Page to Display Submitted Data</a>
+<a href="#Introduction">Introduction</a>
 </li>
 <li>
-<a href="#Compile+the+Page+Flow-N102E7">Compile the Page Flow</a>
+<a href="#Set+Up+Drop+In+Deployment">Set Up Drop In Deployment</a>
 </li>
 <li>
-<a href="#To+Start+the+Tomcat+Server-N1030F">To Start the Tomcat Server</a>
+<a href="#To+Create+a+JWS+File">To Create a JWS File</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10325">To Test the Page Flow Web Application</a>
+<a href="#Compile+the+Web+Service">Compile the Web Service</a>
 </li>
 <li>
-<a href="#Shutdown+Tomcat+Server-N1033B">Shutdown Tomcat Server</a>
+<a href="#Test+the+Web+Service">Test the Web Service</a>
 </li>
 </ul>
 </li>
-<li>
-<a href="#summary">Summary: Page Flow Tutorial</a>
-</li>
 </ul>
 		
 <a name="N1000C"></a><a name="intro"></a>
-<h3>Introduction To the Page Flow Tutorial</h3>
+<h3>Introduction to the Web Service Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
 <a name="N10012"></a><a name="Tutorial+Goals"></a>
 <h4>Tutorial Goals</h4>
@@ -388,267 +319,207 @@
 <p>In this tutorial, you will learn:</p>
 <ul>
 					
-<li>How to create a basic Page Flow web application</li>
+<li>How to create a basic Beehive web service application.</li>
 					
-<li>How to coordinate user navigation with Forward methods</li>
+<li>How to use (JSR 175 and 181) metadata annotations.</li>
 					
-<li>How to handle data submission and processing with data binding and Form Beans</li>
-					
-<li>How to create a user interface with the &lt;neuti&gt; JSP tag library</li>
-					
-<li>How Page Flows help to separate data processing and data presentation</li>
+<li>How to deploy and test a web service to Tomcat</li>
 				
 </ul>
 </div>
-<a name="N1002E"></a><a name="Note+on+the+Current+State+of+the+Page+Flow+Tutorial"></a>
-<h4>Note on the Current State of the Page Flow Tutorial</h4>
+<a name="N10028"></a><a name="Note+on+the+Current+State+of+the+Web+Service+Tutorial"></a>
+<h4>Note on the Current State of the Web Service Tutorial</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>This tutorial is currently a work in progress.  Unfinished portions of the tutorial are marked [tbd], standing for "to be done".  Also the tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
-<p>Please send any comments to  Steve Hanson, at <span class="codefrag">steveh@bea.com</span>.</p>
+<p>This tutorial is currently a work in progress, and will by changed and amended in the coming weeks. The tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
+<p>Please send any comments to  Steve Hanson, at <span class="codefrag">steveh at bea.com</span>.</p>
 </div>
 </div>
 		
-<a name="N1003F"></a><a name="step1"></a>
-<h3>Step 1: Begin the Page Flow Tutorial</h3>
+<a name="N10039"></a><a name="step1"></a>
+<h3>Step 1: Begin the Web Service Tutorial</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10045"></a>
-<h4></h4>
-<div style="margin-left: 0 ; border: 2px"></div>
-<a name="N1004B"></a><a name="Download+and+Install+JDK5"></a>
+<a name="N1003F"></a><a name="Download+and+Install+JDK5"></a>
 <h4>Download and Install JDK5</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download the latest version of JDK5.</p>
-<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <span class="codefrag">C:\jdk1.5.0</span>
-</p>
-<p>[tbd: more detailed installation instructions]</p>
+<p>If you do not have JDK5 installed on your machine, visit <a target="_blank" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a> and download and install the latest version.  (Note: it is important that you install version beta51 or later.)</p>
+<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <span class="codefrag">C:\jdk1.5.0</span>.</p>
+<p></p>
 </div>
-<a name="N10061"></a><a name="Download+and+Install+SVN+%28Subversion+Source+Control%29"></a>
-<h4>Download and Install SVN (Subversion Source Control)</h4>
+<a name="N10055"></a><a name="Install+ANT"></a>
+<h4>Install ANT</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Visit <a target="_blank" href="http://subversion.tigris.org">http://subversion.tigris.org</a> and install the SVN source control system.</p>
-<p>[tbd: more detailed installation instructions]</p>
+<p>If you do not have Ant 1.6.2 installed on your machine, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</a>
+</p>
+<p>After download is complete, unzip the file <span class="codefrag">apache-ant-1.6.2-bin.zip</span> into your C: drive.</p>
+<p>After the file has unzipped, confirm that the following directory structure exists: <span class="codefrag">C:/apache-ant-1.6.2</span>.</p>
 </div>
-<a name="N10072"></a><a name="Download+and+Install+Beehive"></a>
-<h4>Download and Install Beehive</h4>
+<a name="N1006E"></a><a name="Download+and+Install+Tomcat+5"></a>
+<h4>Download and Install Tomcat 5</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>
-					Create a directory called <span class="codefrag">beehive-src</span> on your C: drive.  Confirm that the the following directory structure exists: <span class="codefrag">C:/beehive-src</span>.  This directory will store the Beehive source and all of your Beehive projects.					</p>
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">cd beehive-src</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</span>
-				
-</p>
-<p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
-<p>At the command prompt, enter: <span class="codefrag">exit</span>
-				
-</p>
+<p>If you do not have Tomcat 5 installed on your machine, visit <a target="_blank" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</a> and download the ZIP file.</p>
+<p>Unzip jakarta-tomcat-5.0.25.zip into the C: drive.</p>
+<p>After the unzip is complete, confirm that the following directory exists: <span class="codefrag">C:/jakarta-tomcat-5.0.25</span>.</p>
+<p></p>
 </div>
-<a name="N1009A"></a><a name="Install+ANT"></a>
-<h4>Install ANT</h4>
+<a name="N10087"></a><a name="Download+and+Install+a+Beehive+Binary+Distribution"></a>
+<h4>Download and Install a Beehive Binary Distribution</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Create a directory named <span class="codefrag">installed</span>at <span class="codefrag">C:/beehive-src/trunk/installed</span>.</p>
-<p>Unzip the file <span class="codefrag">C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</span> into <span class="codefrag">C:/beehive-src/Beehive/installed</span>.</p>
-<p>After the file has unzipped, confirm that the following directory structure exists: <span class="codefrag">C:/beehive-src/trunk/installed/apache-ant-1.6.2</span>.</p>
+<p>Visit [tbd: distribution download link] and download the latest binary distribution of Beehive.</p>
+<p>
+				Create a directory called <span class="codefrag">beehive-0.4</span> on your C: drive.  Confirm that the the following directory structure exists: <span class="codefrag">C:/beehive-0.4</span>.  This directory will store the Beehive distribution JARs and all of your Beehive projects.	
+                            </p>
 </div>
-<a name="N100B9"></a><a name="Run+the+"></a>
-<h4>Run the bootstrap Target</h4>
+<a name="N1009A"></a><a name="Set+up+the+Development+Environment"></a>
+<h4>Set up the Development Environment</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
 				
 </p>
-<p>At the command prompt, enter: <span class="codefrag">set BEEHIVE_HOME=C:\beehive-src\trunk</span>
+<p>&nbsp;&nbsp;&nbsp;&nbsp;Note: if you have JDK5 installed in a different directory, set JAVA_HOME to that location.</p>
+<p>At the command prompt, enter: <span class="codefrag">set CATALINA_HOME=C:/jakarta-tomcat-5.0.25</span>
 				
 </p>
-<p>At the command prompt, enter:  <span class="codefrag">cd C:\beehive-src\trunk</span>
+<p>At the command prompt, enter: <span class="codefrag">set ANT_HOME=C:\apache-ant-1.6.2</span>
 				
 </p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant bootstrap</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">exit</span>
+<p>At the command prompt, enter:  <span class="codefrag">set PATH=%PATH%;C:\apache-ant-1.6.2\bin</span>
 				
 </p>
+<p>Leave the command shell open to use throughout the tutorial</p>
+<p>You are now ready to create a Beehive web service.
+				</p>
 </div>
 </div>
 		
-<a name="N100E8"></a><a name="step_2"></a>
-<h3>Step 2: Create a New Page Flow Application</h3>
+<a name="N100C3"></a><a name="step_2"></a>
+<h3>Step 2: Create a New Web Service</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100EE"></a><a name="Introduction"></a>
+<a name="N100C9"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>
-				In this step you will create a Controller file and a JSP page. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the 				major features of a web application:	how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources.
-				</p>
+<p>[tbd]</p>
 <p>	
-				Controller files control the features of a web application through the use of Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do something complex, such as 				receive 	user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed.
-				</p>
-<p>
-				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
-				</p>
+</p>
+<p>	
+</p>
 </div>
-<a name="N100FE"></a><a name="To+Create+a+Controller+File"></a>
-<h4>To Create a Controller File</h4>
+<a name="N100D9"></a><a name="Set+Up+Drop+In+Deployment"></a>
+<h4>Set Up Drop In Deployment</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In this step you will create the Controller file in place in the Tomcat deployment directory.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps</span>, create a directory called <span class="codefrag">pageflow_tutorial</span>.</p>
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file called <span class="codefrag">Controller.jpf</span>.</p>
-<p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-	 
-@Jpf.Controller
-public class Controller extends PageFlowController
+<p>Copy the folder <span class="codefrag">[tbd]/AnnotatedAxis</span> into the directory <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps</span>.</p>
+<p>Confirm that the following directory structure exists: <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</span>
+</p>
+<p>At the command prompt, enter: <span class="codefrag">C:/jakarta-tomcat-5.0.25/bin/startup.bat</span>
+</p>
+<p>Visit <a target="_blank" href="http://localhost:8080/AnnotatedAxis/index.html">http://localhost:8080/AnnotatedAxis/index.html</a> to confirm AnnotatedAxis is installed on Tomcat.  If you do not see an information page on AnnotatedAxis, then something is wrong.  Ensure that AnnotatedAxis directory is in C:/jakarta-tomcat-5.0.25/webapps, restart Tomcat, and try again.</p>
+<p>At the command prompt, enter: <span class="codefrag">C:/jakarta-tomcat-5.0.25/bin/shutdown.bat</span>
+</p>
+</div>
+<a name="N100FF"></a><a name="To+Create+a+JWS+File"></a>
+<h4>To Create a JWS File</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>In the directory <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</span>, create a folder named <span class="codefrag">myWebservice</span>.</p>
+<p>In the directory <span class="codefrag">C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis/myWebservice</span>, create a file named <span class="codefrag">HelloWorld.jws</span>.</p>
+<p>Edit HelloWorld.jws so it looks like the following:</p>
+<pre class="code"> 			
+package myWebservice;
+
+import java.rmi.RemoteException;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService( targetNamespace="http://www.beehive.com/myWebService/HelloWorld")
+public class HelloWorld 
 {
-    @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
+    /**
+     * @throws java.rmi.RemoteException
+     */
+    @WebMethod
+    public String hello() throws RemoteException 
     {
-        return new Forward("success");
+        return String "Hello, World!";
     }
 }
-				</pre>
-</div>
-<a name="N10125"></a><a name="To+Create+a+JSP+File"></a>
-<h4>To Create a JSP File</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
-<p>Edit index.jsp so it looks like the following.</p>
-<pre class="code"> 			
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;index.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
-      index.jsp
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
 			</pre>
 </div>
-<a name="N1013D"></a><a name="To+Create+the+WEB-INF+directory"></a>
-<h4>To Create the WEB-INF directory</h4>
+<a name="N10120"></a><a name="Compile+the+Web+Service"></a>
+<h4>Compile the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>	Open a command shell.</p>
-<p>At the command prompt, enter:  <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\netui\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N1015F"></a><a name="Compile+the+Page+Flow"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
+<p>At the command prompt, enter: <span class="codefrag">ant -f C:\beehive-0.4\ant\buildWebappCore.xml build.webapp -Dwebapp.dir=C:\jakarta-tomcat-5.0.25\webapps\AnnotatedAxis</span>
 				
 </p>
+<p>[tbd: currently gives a Can't find xmlbean class error.  Use ant -f C:\dev-apache\beehive\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\jakarta-tomcat-5.0.25\webapps\AnnotatedAxis as a temp. workaround.]</p>
 </div>
-<a name="N10172"></a><a name="To+Start+the+Tomcat+Server"></a>
-<h4>To Start the Tomcat Server</h4>
+<a name="N10130"></a><a name="Test+the+Web+Service"></a>
+<h4>Test the Web Service</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
+<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-0.4\trunk\test\ant</span>
 				
 </p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
+<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
 				
 </p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
 </div>
-<a name="N10188"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
 </div>
-</div>
-		
-<a name="N10199"></a><a name="step_3"></a>
-<h3>Step 3: Navigation</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N1019F"></a><a name="Create+a+Destination+JSP+Page"></a>
-<h4>Create a Destination JSP Page</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
-<p>Edit page2.jsp so it looks like the following.</p>
-<pre class="code">					
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;page2.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
+		<!--
+		<section id="step_3">
+			<title>Step 3: Navigation</title>
+			<section>
+				<title>Create a Destination JSP Page</title>
+				<p>In the directory <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
+				<p>Edit page2.jsp so it looks like the following.</p>
+				<source><![CDATA[					
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+  <head>
+    <title>page2.jsp</title>
+    <netui:base/>
+  </head>
+  <netui:body>
+    <p>
       Welcome to page2.jsp!
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N101B7"></a><a name="Create+a+Link+to+the+Destination+Page"></a>
-<h4>Create a Link to the Destination Page</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
-<p>Edit index.jsp so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;index.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
+    </p>
+  </netui:body>
+</netui:html>
+				]]></source>
+			</section>
+			<section>
+				<title>Create a Link to the Destination Page</title>
+				<p>Open the file C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
+				<p>Edit index.jsp so it appears as follows.</p>
+				<source><![CDATA[
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+  <head>
+    <title>index.jsp</title>
+    <netui:base/>
+  </head>
+  <netui:body>
+    <p>
       index.jsp
-    &lt;/p&gt;
-    &lt;p&gt;
-      &lt;netui:anchor action="toPage2"&gt;Link to page2.jsp&lt;/netui:anchor&gt;
-    &lt;/p&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N101C9"></a><a name="Add+an+Action+Method+to+Handle+the+Link"></a>
-<h4>Add an Action Method to Handle the Link</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
+    </p>
+    <p>
+      <netui:anchor action="toPage2">Link to page2.jsp</netui:anchor>
+    </p>
+  </netui:body>
+</netui:html>
+				]]></source>
+			</section>
+			<section>
+				<title>Add an Action Method to Handle the Link</title>
+				<p>Open the file C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
+				<p>Edit Controller.jpf so it appears as follows.</p>
+				<source><![CDATA[
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
@@ -676,98 +547,80 @@
         return new Forward("success");
     }
 }
-				</pre>
-</div>
-<a name="N101DB"></a><a name="Compile+the+Page+Flow-N101D6"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10203"></a><a name="To+Start+the+Tomcat+Server-N101FE"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N10219"></a><a name="To+Test+the+Page+Flow+Web+Application-N10214"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N1022F"></a><a name="Shutdown+Tomcat+Server"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N1023D"></a><a name="step_4"></a>
-<h3>Step 4: Submitting Data</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N10243"></a><a name="To+Create+a+Submission+Form"></a>
-<h4>To Create a Submission Form</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Edit the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;page2.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-    &lt;p&gt;
+				]]></source>
+			</section>
+			<section>
+				<title>Compile the Page Flow</title>
+				<p>Open a command shell.</p>
+				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
+				</p>
+				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
+				</p>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				</p>
+			</section>
+			<section>
+				<title>To Start the Tomcat Server</title>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				</p>
+				<p>At the command prompt, enter: <code>startup.bat</code>
+				</p>
+				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
+			</section>
+			<section>
+				<title>To Test the Page Flow Web Application</title>
+				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+				</p>
+				<p>You will be directed to the index.jsp page.</p>
+				<p>Click the link.</p>
+				<p>You will be directed to page2.jsp.</p>
+			</section>
+			<section>
+				<title>Shutdown Tomcat Server</title>
+				<p>At the command prompt, enter: <code>shutdown.bat</code>
+				</p>
+			</section>
+		</section>
+		<section id="step_4">
+			<title>Step 4: Submitting Data</title>
+			<section>
+				<title>To Create a Submission Form</title>
+				<p>Edit the file <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
+				<source><![CDATA[
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+  <head>
+    <title>page2.jsp</title>
+    <netui:base/>
+  </head>
+  <netui:body>
+    <p>
       Welcome to page2.jsp!
-    &lt;/p&gt;
-    &lt;p&gt;
-      &lt;netui:form action="processData"&gt;
-        &lt;p&gt;Name:&lt;netui:textBox dataSource="actionForm.name"/&gt;
-        &lt;p&gt;Age:&lt;netui:textBox dataSource="actionForm.age"/&gt;
-       &lt;p&gt;&lt;netui:button type="submit"&gt;Submit&lt;/netui:button&gt;
-      &lt;/netui:form&gt;
-    &lt;/p&gt;	
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N10255"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
-<h4>To Edit the Controller File to Handle the Submitted Data</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open the file <span class="codefrag">C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</span>
-				
-</p>
-<p>Edit Controller.jpf so it appears as follows.</p>
-<pre class="code">
+    </p>
+    <p>
+      <netui:form action="processData">
+        <p>Name:<netui:textBox dataSource="actionForm.name"/>
+        <p>Age:<netui:textBox dataSource="actionForm.age"/>
+       <p><netui:button type="submit">Submit</netui:button>
+      </netui:form>
+    </p>	
+  </netui:body>
+</netui:html>
+				]]></source>
+			</section>
+			<section>
+				<title>To Edit the Controller File to Handle the Submitted Data</title>
+				<p>Open the file <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</code>
+				</p>
+				<p>Edit Controller.jpf so it appears as follows.</p>
+				<source><![CDATA[
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
@@ -834,66 +687,50 @@
         }
     }
 }
-				</pre>
-</div>
-<a name="N1026A"></a><a name="Compile+the+Page+Flow-N10263"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10292"></a><a name="To+Start+the+Tomcat+Server-N1028B"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N102A8"></a><a name="To+Test+the+Page+Flow+Web+Application-N102A1"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N102BE"></a><a name="Shutdown+Tomcat+Server-N102B7"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N102CC"></a><a name="step_5"></a>
-<h3>Step 5: Processing and Displaying Data</h3>
-<div style="margin-left: 0 ; border: 2px">
-<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 red.</p>
-<pre class="code">
+				]]></source>
+			</section>
+			<section>
+				<title>Compile the Page Flow</title>
+				<p>Open a command shell.</p>
+				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
+				</p>
+				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
+				</p>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				</p>
+			</section>
+			<section>
+				<title>To Start the Tomcat Server</title>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				</p>
+				<p>At the command prompt, enter: <code>startup.bat</code>
+				</p>
+				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
+			</section>
+			<section>
+				<title>To Test the Page Flow Web Application</title>
+				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+				</p>
+				<p>You will be directed to the index.jsp page.</p>
+				<p>Click the link.</p>
+				<p>You will be directed to page2.jsp.</p>
+			</section>
+			<section>
+				<title>Shutdown Tomcat Server</title>
+				<p>At the command prompt, enter: <code>shutdown.bat</code>
+				</p>
+			</section>
+		</section>
+		<section id="step_5">
+			<title>Step 5: Processing and Displaying Data</title>
+			<section>
+				<title>To Process the Submitted Data</title>
+				<p>Edit the processData method in the Controller.jpf file so it appears as follows. Code to add appears in red.</p>
+				<source><![CDATA[
 @Jpf.Action(
 	forwards = { 
 		@Jpf.Forward( name = "success", path = "showData.jsp" )
@@ -906,86 +743,71 @@
 	getRequest().setAttribute("data", form);
 	return new Forward("success");
 }
-				</pre>
-</div>
-<a name="N102E1"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
-<h4>To Create a JSP Page to Display Submitted Data</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
-<pre class="code">
-&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%&gt;
-&lt;netui:html&gt;
-  &lt;head&gt;
-    &lt;title&gt;showData.jsp&lt;/title&gt;
-    &lt;netui:base/&gt;
-  &lt;/head&gt;
-  &lt;netui:body&gt;
-      &lt;p&gt;Name:&lt;netui:span value="${requestScope.data.name}"/&gt;
-      &lt;p&gt;Age:&lt;netui:span value="${requestScope.data.age}"/&gt;
-  &lt;/netui:body&gt;
-&lt;/netui:html&gt;
-				</pre>
-</div>
-<a name="N102F0"></a><a name="Compile+the+Page+Flow-N102E7"></a>
-<h4>Compile the Page Flow</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a command shell.</p>
-<p>At the command prompt, enter: <span class="codefrag">set JAVA_HOME=C:\jdk1.5.0</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">beehiveEnv.cmd</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\test\ant</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</span>
-				
-</p>
-</div>
-<a name="N10318"></a><a name="To+Start+the+Tomcat+Server-N1030F"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</span>
-				
-</p>
-<p>At the command prompt, enter: <span class="codefrag">startup.bat</span>
-				
-</p>
-<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-</div>
-<a name="N1032E"></a><a name="To+Test+the+Page+Flow+Web+Application-N10325"></a>
-<h4>To Test the Page Flow Web Application</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/pageflow_tutorial</span>
-				
-</p>
-<p>You will be directed to the index.jsp page.</p>
-<p>Click the link.</p>
-<p>You will be directed to page2.jsp.</p>
-</div>
-<a name="N10344"></a><a name="Shutdown+Tomcat+Server-N1033B"></a>
-<h4>Shutdown Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter: <span class="codefrag">shutdown.bat</span>
-				
-</p>
-</div>
-</div>
-		
-<a name="N10352"></a><a name="summary"></a>
-<h3>Summary: Page Flow Tutorial</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
-<p>Concepts and Tasks Introduced in This Tutorial</p>
-<p>[tbd: more detailed summary]</p>
-</div>
+				]]></source>
+			</section>
+			<section>
+				<title>To Create a JSP Page to Display Submitted Data</title>
+				<p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
+				<source><![CDATA[
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+  <head>
+    <title>showData.jsp</title>
+    <netui:base/>
+  </head>
+  <netui:body>
+      <p>Name:<netui:span value="${requestScope.data.name}"/>
+      <p>Age:<netui:span value="${requestScope.data.age}"/>
+  </netui:body>
+</netui:html>
+				]]></source>
+			</section>
+			<section>
+				<title>Compile the Page Flow</title>
+				<p>Open a command shell.</p>
+				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
+				</p>
+				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
+				</p>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
+				</p>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				</p>
+			</section>
+			<section>
+				<title>To Start the Tomcat Server</title>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				</p>
+				<p>At the command prompt, enter: <code>startup.bat</code>
+				</p>
+				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
+			</section>
+			<section>
+				<title>To Test the Page Flow Web Application</title>
+				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
+				</p>
+				<p>You will be directed to the index.jsp page.</p>
+				<p>Click the link.</p>
+				<p>You will be directed to page2.jsp.</p>
+			</section>
+			<section>
+				<title>Shutdown Tomcat Server</title>
+				<p>At the command prompt, enter: <code>shutdown.bat</code>
+				</p>
+			</section>
+		</section>
+		<section id="summary">
+			<title>Summary: Page Flow Tutorial</title>
+			<p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
+			<p>Concepts and Tasks Introduced in This Tutorial</p>
+			<p>[tbd: more detailed summary]</p>
+		</section>
+		-->
 	
 <div class="attribution"></div>
 </div>

Added: incubator/beehive/trunk/site/src/documentation/content/xdocs/beehive/guide.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/beehive/guide.xml	Fri Oct 22 15:32:11 2004
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<document>
+    <header>
+        <title>Putting the Pieces Together</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>How Do Page Flows, Controls, and Web Services Fit Together?</title>
+            <p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p> 
+        </section>
+        <section>
+            <title>How Do Page Flows Work?</title>
+            <p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
+            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+            <p>The JSP files use special tags (the "&lt;netui>" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            </p>
+            <p>tbd: need diagram here</p> 
+            <p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
+            The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
+            While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>    
+            <p>The programming model: annotations, data binding expressions, &lt;netui> tags, etc.</p>
+        </section>
+        <section id="nav">
+            <title>Navigation</title>
+        </section>
+        <section id="submit">
+            <title>Submitting Data: Form Beans, and Data Binding</title>
+        </section>
+        <section id="processing_data">
+            <title>Processing Data</title>
+        </section>
+        <section id="displaying_data">
+            <title>Displaying Data</title>
+        </section>
+        <section id="controls">
+            <title>Accessing Back-End Resources with Controls</title>
+        </section>
+        <section id="validation">
+            <title>Validation</title>
+        </section>
+        <section id="security">
+            <title>Security</title>
+        </section>
+    </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>

Added: incubator/beehive/trunk/site/src/documentation/content/xdocs/glossary.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/glossary.xml	Fri Oct 22 15:32:11 2004
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<document>
+	<header>
+		<title>Glossary of Terms</title>
+	</header>
+	<body>
+        <section>
+            <title>Terms</title>
+            <p id="bee_control">Beehive Control -- Beehive Controls are designed to make it easier to integrate complex resources into your Java application.  For example, the     A Beehive Control consists of two JAVA files: a Control implementation file, and a Control interface file.  </p>
+            <p>Contoller file</p>
+            <p>Contoller implementation</p>
+            <p>Contoller interface</p>
+            <p>Contoller file</p>
+            <p>Data Binding</p>
+            <p>Form Bean  --  Typically, a Form Bean is a server-side representation of a HTML &lt;netui:form> tag.  Form Beans follow ordinary Java Bean syntax: each Form Bean is a class consisting of any number of members, each member having a setter and a getter method
+            associated with it.  Form Beans must extend the class org.apache.beehive.netui.pageflow.FormData.  The Sample Form Bean below has two members, each member has a getter and setter method associated with it.</p>
+            <source><![CDATA[
+    public static class ProfileFormBean extends FormData
+    {
+        private int age;
+
+        private String name;
+
+        public void setAge(int age)
+        {
+            this.age = age;
+        }
+
+        public int getAge()
+        {
+            return this.age;
+        }
+        
+        public void setName(String name)
+        {
+            this.name = name;
+        }
+
+        public String getName()
+        {
+            return this.name;
+        }
+    }
+            ]]></source>
+            <p>Form Beans are most often used to pick up data that is submitted from a &lt;netui:form> tag, or incoming data from a back-end resource.  Once the data has been picked up by a Form Bean instance, it is then passed to an Action method.</p>
+            <p>JWS</p>
+            <p>JPF</p>
+            <p>JCS</p>
+            <p>&lt;netui> tag library</p>
+            <p>Page Flow</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/>
+	&copy; 2004, Apache Software Foundation
+	</legal>
+	</footer>
+</document>

Modified: incubator/beehive/trunk/site/src/documentation/content/xdocs/jpetstore.xml
==============================================================================
--- incubator/beehive/trunk/site/src/documentation/content/xdocs/jpetstore.xml	(original)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/jpetstore.xml	Fri Oct 22 15:32:11 2004
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
-
 <document>
-
-<header>
-    <title>Apache Beehive Web Services</title>
-</header>
-
-<body>
-
-<p>
-See the <fork href="http://wiki.apache.org/beehive/Web_20Services">WSM on the Beehive wiki</fork> and the 
-<fork href="http://jcp.org/en/jsr/detail?id=181">JSR 181 Spec</fork> for more information.
-</p>
-
-</body>
-    
-<footer>
-    	<legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br />
+    <header>
+        <title>Beehive Sample: PetStore</title>
+    </header>
+    <body>
+        <section>
+            <title>Anatomy of PetStore</title>
+        </section>
+        <!-- Just a sketch for now...will re-write from a distribution point of view later 
+        <section>
+            <title>Running the PetStore Sample</title>
+            <p>To run the Petstore sample, you need to (1) add the Beehive supporting JARs (and other files) to the sample's WEB-INF directory, (2) compile the Petstore source, (3) deploy the sample to Tomcat, or some other servlet container, and (4) start up your servlet container.</p>
+            <p>(1) To add the supporting JARs to the WEB-INF directory, run the following target:</p>
+            <source>ant -f C:\beehive-src\trunk\netui\ant\webappTemplate.xml -Dwebapp.dist.dir=C:\dev-apache\beehive\trunk\samples\petstoreWeb</source>
+            <p>(2) To compile the sample source code, run the following target:</p>
+            <source>ant -f C:\beehive-src\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\dev-apache\beehive\trunk\samples\petstoreWeb</source>
+            <p>(3) To deploy the sample to Tomcat, copy the petstoreWeb folder to Tomcat's webapps directory. (C:\dev-apache\beehive\trunk\installed\jakarta-tomcat-5.0.25\webapps) :</p>
+            <p>(4) To start up the Tomcat server, run the following:</p>
+            <source>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</source>
+            <p>Now visit http://localhost:8080/petstoreWeb/index.jsp to see the Petstore application runnng.</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/>
 	&copy; 2004, Apache Software Foundation
 	</legal>
-</footer>
-
+    </footer>
 </document>

Modified: incubator/beehive/trunk/site/src/documentation/content/xdocs/pageflow/guide.xml
==============================================================================
--- incubator/beehive/trunk/site/src/documentation/content/xdocs/pageflow/guide.xml	(original)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/pageflow/guide.xml	Fri Oct 22 15:32:11 2004
@@ -1,522 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
 <document>
-	<header>
-		<title>Beehive Page Flow Tutorial</title>
-	</header>
-	<body>
-		<section id="intro">
-			<title>Introduction To the Page Flow Tutorial</title>
-			<section>
-				<title>Tutorial Goals</title>
-				<p>In this tutorial, you will learn:</p>
-				<ul>
-					<li>How to create a basic Page Flow web application</li>
-					<li>How to coordinate user navigation with Forward methods</li>
-					<li>How to handle data submission and processing with data binding and Form Beans</li>
-					<li>How to create a user interface with the &lt;neuti> JSP tag library</li>
-					<li>How Page Flows help to separate data processing and data presentation</li>
-				</ul>
-			</section>
-			<section>
-				<title>Note on the Current State of the Page Flow Tutorial</title>
-				<p>This tutorial is currently a work in progress.  Unfinished portions of the tutorial are marked [tbd], standing for "to be done".  Also the tutorial assumes that you are using a Windows machine, however, with a little common sense it is very easy to run through the tutorial on a Linux machine.  For example, where the tutorial tells you to run FOO.cmd, instead run FOO.sh.</p>
-				<p>Please send any comments to  Steve Hanson, at <code>steveh@bea.com</code>.</p>
-				</section>
-		</section>
-		<section id="step1">
-			<title>Step 1: Begin the Page Flow Tutorial</title>
-			<section>
-				<title/>
-			</section>
-			<section>
-				<title>Download and Install JDK5</title>
-				<p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download the latest version of JDK5.</p>
-				<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <code>C:\jdk1.5.0</code></p>
-				<p>[tbd: more detailed installation instructions]</p>
-			</section>
-			<section>
-				<title>Download and Install SVN (Subversion Source Control)</title>
-				<p>Visit <fork href="http://subversion.tigris.org">http://subversion.tigris.org</fork> and install the SVN source control system.</p>
-				<p>[tbd: more detailed installation instructions]</p>
-			</section>
-			<section>
-				<title>Download and Install Beehive</title>
-				<p>
-					Create a directory called <code>beehive-src</code> on your C: drive.  Confirm that the the following directory structure exists: <code>C:/beehive-src</code>.  This directory will store the Beehive source and all of your Beehive projects.					</p>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>cd beehive-src</code>
-				</p>
-				<p>At the command prompt, enter: <code>svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</code>
-				</p>
-				<p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
-				<p>At the command prompt, enter: <code>exit</code>
-				</p>
-			</section>
-			<section>
-				<title>Install ANT</title>
-				<p>Create a directory named <code>installed</code>at <code>C:/beehive-src/trunk/installed</code>.</p>
-				<p>Unzip the file <code>C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</code> into <code>C:/beehive-src/Beehive/installed</code>.</p>
-				<p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/beehive-src/trunk/installed/apache-ant-1.6.2</code>.</p>
-			</section>
-			<section>
-				<title>Run the <code>bootstrap</code> Target</title>
-				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
-				</p>
-				<p>At the command prompt, enter: <code>set BEEHIVE_HOME=C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter:  <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant bootstrap</code>
-				</p>
-				<p>At the command prompt, enter: <code>exit</code>
-				</p>
-			</section>
-		</section>
-		<section id="step_2">
-			<title>Step 2: Create a New Page Flow Application</title>
-			<section>
-				<title>Introduction</title>
-				<p>
-				In this step you will create a Controller file and a JSP page. A Controller file is a Java class (with the JPF file extension) that controls how your web application functions and what it does. The methods in the Controller file determines all of the 				major features of a web application:	how users navigate from page to page, how user requests are handled, and how the web application accesses back-end resources.
-				</p>
-				<p>	
-				Controller files control the features of a web application through the use of Action methods. An Action method may do something simple, such as forward a user from one JSP page to another; or it may do something complex, such as 				receive 	user input from a JSP page, calculate and/or retrieve other data based on the user input, and forward the user to a JSP page where the results are displayed.
-				</p>
-				<p>
-				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
-				</p>
-			</section>
-			<section>
-				<title>To Create a Controller File</title>
-				<p>In this step you will create the Controller file in place in the Tomcat deployment directory.</p>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps</code>, create a directory called <code>pageflow_tutorial</code>.</p>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file called <code>Controller.jpf</code>.</p>
-				<p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-				<p>Edit Controller.jpf so it appears as follows.</p>
-				<source><![CDATA[
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-	 
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        return new Forward("success");
-    }
-}
-				]]></source>
-			</section>
-			<section>
-				<title>To Create a JSP File</title>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>index.jsp</code>.</p>
-				<p>Edit index.jsp so it looks like the following.</p>
-				<source><![CDATA[ 			
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>index.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-    <p>
-      index.jsp
-    </p>
-  </netui:body>
-</netui:html>
-			]]></source>
-			</section>
-			<section>
-				<title>To Create the WEB-INF directory</title>
-				<p>	Open a command shell.</p>
-				<p>At the command prompt, enter:  <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\netui\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-				</p>
-			</section>
-			<section>
-				<title>Compile the Page Flow</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-				</p>
-			</section>
-			<section>
-				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
-				</p>
-				<p>At the command prompt, enter: <code>startup.bat</code>
-				</p>
-				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-			</section>
-			<section>
-				<title>To Test the Page Flow Web Application</title>
-				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
-				</p>
-				<p>You will be directed to the index.jsp page.</p>
-			</section>
-		</section>
-		<section id="step_3">
-			<title>Step 3: Navigation</title>
-			<section>
-				<title>Create a Destination JSP Page</title>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
-				<p>Edit page2.jsp so it looks like the following.</p>
-				<source><![CDATA[					
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>page2.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-    <p>
-      Welcome to page2.jsp!
-    </p>
-  </netui:body>
-</netui:html>
-				]]></source>
-			</section>
-			<section>
-				<title>Create a Link to the Destination Page</title>
-				<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
-				<p>Edit index.jsp so it appears as follows.</p>
-				<source><![CDATA[
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>index.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-    <p>
-      index.jsp
-    </p>
-    <p>
-      <netui:anchor action="toPage2">Link to page2.jsp</netui:anchor>
-    </p>
-  </netui:body>
-</netui:html>
-				]]></source>
-			</section>
-			<section>
-				<title>Add an Action Method to Handle the Link</title>
-				<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
-				<p>Edit Controller.jpf so it appears as follows.</p>
-				<source><![CDATA[
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
- 
-public class Controller 
-    extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="page2.jsp")
-        }
-    )
-    public Forward toPage2()
-    {
-        return new Forward("success");
-    }
-}
-				]]></source>
-			</section>
-			<section>
-				<title>Compile the Page Flow</title>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-				</p>
-			</section>
-			<section>
-				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
-				</p>
-				<p>At the command prompt, enter: <code>startup.bat</code>
-				</p>
-				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-			</section>
-			<section>
-				<title>To Test the Page Flow Web Application</title>
-				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
-				</p>
-				<p>You will be directed to the index.jsp page.</p>
-				<p>Click the link.</p>
-				<p>You will be directed to page2.jsp.</p>
-			</section>
-			<section>
-				<title>Shutdown Tomcat Server</title>
-				<p>At the command prompt, enter: <code>shutdown.bat</code>
-				</p>
-			</section>
-		</section>
-		<section id="step_4">
-			<title>Step 4: Submitting Data</title>
-			<section>
-				<title>To Create a Submission Form</title>
-				<p>Edit the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
-				<source><![CDATA[
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>page2.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-    <p>
-      Welcome to page2.jsp!
-    </p>
-    <p>
-      <netui:form action="processData">
-        <p>Name:<netui:textBox dataSource="actionForm.name"/>
-        <p>Age:<netui:textBox dataSource="actionForm.age"/>
-       <p><netui:button type="submit">Submit</netui:button>
-      </netui:form>
-    </p>	
-  </netui:body>
-</netui:html>
-				]]></source>
-			</section>
-			<section>
-				<title>To Edit the Controller File to Handle the Submitted Data</title>
-				<p>Open the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</code>
-				</p>
-				<p>Edit Controller.jpf so it appears as follows.</p>
-				<source><![CDATA[
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.FormData;
- 
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    public Forward begin()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="page2.jsp")
-        }
-    )
-    public Forward toPage2()
-    {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards = { 
-            @Jpf.Forward(name = "success", path = "showData.jsp")
-        }
-    )
-    public Forward processData(ProcessDataForm form)
-    {
-	    System.out.println("Name: " + form.name);
-	    System.out.println("Age: " + form.age);
-        return new Forward("success");
-    }
-
-    public static class ProcessDataForm extends FormData
-    {
-        private int age;
-        private String name;
-
-        public void setName(String name)
-        {
-            this.name = name;
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
-
-        public void setAge(int age)
-        {
-            this.age = age;
-        }
-
-        public int getAge()
-        {
-            return this.age;
-        }
-    }
-}
-				]]></source>
-			</section>
-			<section>
-				<title>Compile the Page Flow</title>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-				</p>
-			</section>
-			<section>
-				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
-				</p>
-				<p>At the command prompt, enter: <code>startup.bat</code>
-				</p>
-				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-			</section>
-			<section>
-				<title>To Test the Page Flow Web Application</title>
-				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
-				</p>
-				<p>You will be directed to the index.jsp page.</p>
-				<p>Click the link.</p>
-				<p>You will be directed to page2.jsp.</p>
-			</section>
-			<section>
-				<title>Shutdown Tomcat Server</title>
-				<p>At the command prompt, enter: <code>shutdown.bat</code>
-				</p>
-			</section>
-		</section>
-		<section id="step_5">
-			<title>Step 5: Processing and Displaying Data</title>
-			<section>
-				<title>To Process the Submitted Data</title>
-				<p>Edit the processData method in the Controller.jpf file so it appears as follows. Code to add appears in red.</p>
-				<source><![CDATA[
-@Jpf.Action(
-	forwards = { 
-		@Jpf.Forward( name = "success", path = "showData.jsp" )
-	}
-)
-public Forward processData( ProcessDataForm form )
-{
-	System.out.println("Name: " + form.name);
-	System.out.println("Age: " + form.age);
-	getRequest().setAttribute("data", form);
-	return new Forward("success");
-}
-				]]></source>
-			</section>
-			<section>
-				<title>To Create a JSP Page to Display Submitted Data</title>
-				<p>Create a file named displayData.jsp in the directory [TOMCAT_HOME]/directory/pageflow_tutorial. Edit showData.jsp so it appears as follows.</p>
-				<source><![CDATA[
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>showData.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-      <p>Name:<netui:span value="${requestScope.data.name}"/>
-      <p>Age:<netui:span value="${requestScope.data.age}"/>
-  </netui:body>
-</netui:html>
-				]]></source>
-			</section>
-			<section>
-				<title>Compile the Page Flow</title>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
-				</p>
-			</section>
-			<section>
-				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
-				</p>
-				<p>At the command prompt, enter: <code>startup.bat</code>
-				</p>
-				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-			</section>
-			<section>
-				<title>To Test the Page Flow Web Application</title>
-				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
-				</p>
-				<p>You will be directed to the index.jsp page.</p>
-				<p>Click the link.</p>
-				<p>You will be directed to page2.jsp.</p>
-			</section>
-			<section>
-				<title>Shutdown Tomcat Server</title>
-				<p>At the command prompt, enter: <code>shutdown.bat</code>
-				</p>
-			</section>
-		</section>
-		<section id="summary">
-			<title>Summary: Page Flow Tutorial</title>
-			<p>This tutorial introduced you to the basics of building web applications with Beehive Page Flows.</p>
-			<p>Concepts and Tasks Introduced in This Tutorial</p>
-			<p>[tbd: more detailed summary]</p>
-		</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/>
+    <header>
+        <title>Page Flow Users Guide</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>What's So Great About Page Flows?</title>
+            <p>Page Flows make building Java web applications easy and intuitive.  When programming with Page Flows, the developer writes Java files and JSP pages--that's it.  There is very little occasion to work with configuration files, or other components.  Page Flow programming is not only simple, it is also excells at separating the presentation logic from the data processing logic.  This results in uncluttered JSP code which is easy to understand and edit.  Moreover, many of the most difficult programming tasks, such as security and validation, are handled with a simple declarative programming model using Java annotations.</p> 
+        </section>
+        <section>
+            <title>How Do Page Flows Work?</title>
+            <p>A Page Flow consists of a single directory containing a Java class, called the "Controller", and any number of JSP pages. 
+            The role of the JSP pages is to present a visual interface for users of the web application.  The role of the Controller file is to coordinate all of the things that can happen when a user visits a web site.  These duties include: handling user requests, fashioning responses to user requests, preserving session state, and coordinating back-end resources (such as databases and web services).</p>
+            <p>The JSP files use special tags (the "&lt;netui>" tags) and databinding expressions which bind the user interface to objects and actions in the Controller file.
+            </p>
+            <p>tbd: need diagram here</p> 
+            <p>The action methods in the controller file implement code that can result in site navigation, passing data, or invoking back-end business logic via controls. 
+            Significantly, the business logic in the controller class is separate from the presentation code defined in the JSP files.
+            The overall purpose of a page flow is to provide you with an easy-to-use framework for building dynamic, sophisticated web applications. 
+            While page flows give you access to advanced features of J2EE, you do not have to be a J2EE expert to quickly develop and deploy Java-based applications built on page flows.</p>    
+            <p>The programming model: annotations, data binding expressions, &lt;netui> tags, etc.</p>
+        </section>
+        <section id="nav">
+            <title>Navigation</title>
+        </section>
+        <section id="submit">
+            <title>Submitting Data: Form Beans, and Data Binding</title>
+        </section>
+        <section id="processing_data">
+            <title>Processing Data</title>
+        </section>
+        <section id="displaying_data">
+            <title>Displaying Data</title>
+        </section>
+        <section id="controls">
+            <title>Accessing Back-End Resources with Controls</title>
+        </section>
+        <section id="validation">
+            <title>Validation</title>
+        </section>
+        <section id="security">
+            <title>Security</title>
+        </section>
+    </body>
+    <footer>
+        <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
 	&copy; 2004, Apache Software Foundation
 	</legal>
-	</footer>
+    </footer>
 </document>

Modified: incubator/beehive/trunk/site/src/documentation/content/xdocs/site.xml
==============================================================================
--- incubator/beehive/trunk/site/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/site.xml	Fri Oct 22 15:32:11 2004
@@ -7,7 +7,9 @@
         <faq label="FAQ" href="faq.html"/>
     </about>
     <documentation label="Documentation">
-        <building label="Building Beehive" href="building.html"/>
+        <!--<beehive label="Beehive">
+            <guide label="Putting the Pieces Together" href="beehive/guide.html"/>
+        </beehive>-->
         <pageflow label="Page Flows">
             <tutorial_pageflow label="Page Flow Tutorial" href="pageflow/tutorial_pageflow.html"/>
             <!--<pageflow_programming label="Page Flow Programming" href="pageflow/guide.html"/>-->
@@ -19,12 +21,16 @@
         <wsm label="Web Services">
             <!--<tutorial_wsm label="Web Services Tutorial" href="wsm/tutorial_wsm.html"/>-->
             <jsr181 label="Web Services (JSR 181)" href="webservices.html"/>
-            <jsr181 label="AddressBook Sample" href="wsm/sample_AddressBook.html"/>
         </wsm>
-        <!--<samples label="Samples">
-            <jpetstore label="JPetStore Samples" href="jpetstore.html"/>
-        </samples>-->
+        <samples label="Samples">
+            <!--<jpetstore label="Beehive Samples: JPetStore" href="jpetstore.html"/>-->
+            <jsr181 label="WSM Sample: AddressBook" href="wsm/sample_AddressBook.html"/>
+        </samples>
         <ref label="Reference Docs" href="reference.html"/>
+        <!--<gloss label="Glossary" href="glossary.html"/>-->
+        <source label="Beehive Source">
+            <building label="Building Beehive" href="building.html"/>            
+        </source>
     </documentation>
     <community label="Community">
         <mailinglists label="Mailing Lists" href="mailinglists.html"/>

Modified: incubator/beehive/trunk/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
==============================================================================
--- incubator/beehive/trunk/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml	(original)
+++ incubator/beehive/trunk/site/src/documentation/content/xdocs/wsm/tutorial_wsm.xml	Fri Oct 22 15:32:11 2004
@@ -12,10 +12,8 @@
 				<p>In this tutorial, you will learn:</p>
 				<ul>
 					<li>How to create a basic Beehive web service application.</li>
-					<li>How to use metadata annotations.</li>
-					<li></li>
-					<li></li>
-					<li></li>
+					<li>How to use (JSR 175 and 181) metadata annotations.</li>
+					<li>How to deploy and test a web service to Tomcat</li>
 				</ul>
 			</section>
 			<section>
@@ -28,50 +26,42 @@
 			<title>Step 1: Begin the Web Service Tutorial</title>
 			<section>
 				<title>Download and Install JDK5</title>
-				<p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download the latest version.</p>
+				<p>If you do not have JDK5 installed on your machine, visit <fork href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</fork> and download and install the latest version.  (Note: it is important that you install version beta51 or later.)</p>
 				<p>Throughout this tutorial, it is assumed that you have JDK 5 installed at <code>C:\jdk1.5.0</code>.</p>
 				<p></p>
 			</section>
 			<section>
-				<title>Download and Install SVN (Subversion Source Control)</title>
-				<p>Visit <fork href="http://subversion.tigris.org">http://subversion.tigris.org</fork> and install the SVN source control system.</p>
-				<p></p>
+				<title>Install ANT</title>
+				<p>If you do not have Ant 1.6.2 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</fork></p>
+				<p>After download is complete, unzip the file <code>apache-ant-1.6.2-bin.zip</code> into your C: drive.</p>
+				<p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/apache-ant-1.6.2</code>.</p>
 			</section>
 			<section>
-				<title>Download and Install Beehive</title>
-				<p>
-				Create a directory called <code>beehive-src</code> on your C: drive.  Confirm that the the following directory structure exists: <code>C:/beehive-src</code>.  This directory will store the Beehive source and all of your Beehive projects.	</p>
-				<p>Open a command shell.</p>
-				<p>At the command prompt, enter: <code>cd beehive-src</code>
-				</p>
-				<p>At the command prompt, enter: <code>svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</code>
-				</p>
-				<p>Wait a few minutes while the Beehive source is downloaded to your local machine.</p>
+				<title>Download and Install Tomcat 5</title>
+				<p>If you do not have Tomcat 5 installed on your machine, visit <fork href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</fork> and download the ZIP file.</p>
+                            <p>Unzip jakarta-tomcat-5.0.25.zip into the C: drive.</p>
+				<p>After the unzip is complete, confirm that the following directory exists: <code>C:/jakarta-tomcat-5.0.25</code>.</p>
+				<p></p>
 			</section>
 			<section>
-				<title>Install ANT</title>
-				<p>Create a directory named <code>installed</code>at <code>C:/beehive-src/trunk/installed</code>.</p>
-				<p>Unzip the file <code>C:/beehive-src/trunk/external/ant/apache-ant-1.6.2-bin.zip</code> into <code>C:/beehive-src/Beehive/installed</code>.</p>
-				<p>After the file has unzipped, confirm that the following directory structure exists: <code>C:/beehive-src/trunk/installed/apache-ant-1.6.2</code>.</p>
+				<title>Download and Install a Beehive Binary Distribution</title>
+				<p>Visit [tbd: distribution download link] and download the latest binary distribution of Beehive.</p>
+				<p>
+				Create a directory called <code>beehive-0.4</code> on your C: drive.  Confirm that the the following directory structure exists: <code>C:/beehive-0.4</code>.  This directory will store the Beehive distribution JARs and all of your Beehive projects.	
+                            </p>
 			</section>
 			<section>
-				<title>Run the <code>bootstrap</code> Target and Compile the Beehive Source</title>
+				<title>Set up the Development Environment</title>
 				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
 				</p>
-				<p>At the command prompt, enter: <code>set BEEHIVE_HOME=C:\beehive-src\trunk</code>
+				<p>&nbsp;&nbsp;&nbsp;&nbsp;Note: if you have JDK5 installed in a different directory, set JAVA_HOME to that location.</p>
+				<p>At the command prompt, enter: <code>set CATALINA_HOME=C:/jakarta-tomcat-5.0.25</code>
 				</p>
-				<p>At the command prompt, enter:  <code>cd C:\beehive-src\trunk</code>
+				<p>At the command prompt, enter: <code>set ANT_HOME=C:\apache-ant-1.6.2</code>
 				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant bootstrap</code>
-				</p>
-				<p>Wait a few minutes while the <code>bootstrap</code> target completes.
-				</p>
-				<p>At the command prompt, enter: <code>ant deploy</code>.
-				</p>
-				<p>Wait a few minutes while the <code>deploy</code> target completes.
+				<p>At the command prompt, enter:  <code>set PATH=%PATH%;C:\apache-ant-1.6.2\bin</code>
 				</p>
+				<p>Leave the command shell open to use throughout the tutorial</p>
 				<p>You are now ready to create a Beehive web service.
 				</p>
 			</section>
@@ -80,99 +70,69 @@
 			<title>Step 2: Create a New Web Service</title>
 			<section>
 				<title>Introduction</title>
-				<p></p>
+				<p>[tbd]</p>
 				<p>	</p>
 				<p>	</p>
 			</section>
 			<section>
 				<title>Set Up Drop In Deployment</title>
-				<p>Copy the folder C:/beehive-src/trunk/wsm/test/webapps/AnnotatedAxis into the directory C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps.</p>
-				<p>Confirm that the following directory structure exists: C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\AnnotatedAxis</p>
-				<p>At the command prompt, enter: <code>C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin\startup.bat</code></p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\wsm\samples\dropInDeployment\AddressBook\server</code></p>
-				<p>In a text editor (or your IDE of choice), open the file Controller.jpf.</p>
-				<p>Edit Controller.jpf so it appears as follows.</p>
-				<source><![CDATA[
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-	 
-@Jpf.Controller
-public class Controller extends PageFlowController
+				<p>Copy the folder <code>[tbd]/AnnotatedAxis</code> into the directory <code>C:/jakarta-tomcat-5.0.25/webapps</code>.</p>
+				<p>Confirm that the following directory structure exists: <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code></p>
+				<p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/startup.bat</code></p>
+				<p>Visit <fork href="http://localhost:8080/AnnotatedAxis/index.html">http://localhost:8080/AnnotatedAxis/index.html</fork> to confirm AnnotatedAxis is installed on Tomcat.  If you do not see an information page on AnnotatedAxis, then something is wrong.  Ensure that AnnotatedAxis directory is in C:/jakarta-tomcat-5.0.25/webapps, restart Tomcat, and try again.</p>
+				
+				<p>At the command prompt, enter: <code>C:/jakarta-tomcat-5.0.25/bin/shutdown.bat</code></p>
+			</section>
+			<section>
+				<title>To Create a JWS File</title>
+				<p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis</code>, create a folder named <code>myWebservice</code>.</p>
+				<p>In the directory <code>C:/jakarta-tomcat-5.0.25/webapps/AnnotatedAxis/myWebservice</code>, create a file named <code>HelloWorld.jws</code>.</p>
+				<p>Edit HelloWorld.jws so it looks like the following:</p>
+				<source><![CDATA[ 			
+package myWebservice;
+
+import java.rmi.RemoteException;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService( targetNamespace="http://www.beehive.com/myWebService/HelloWorld")
+public class HelloWorld 
 {
-    @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin()
+    /**
+     * @throws java.rmi.RemoteException
+     */
+    @WebMethod
+    public String hello() throws RemoteException 
     {
-        return new Forward("success");
+        return String "Hello, World!";
     }
 }
-				]]></source>
-			</section>
-			<section>
-				<title>To Create a JSP File</title>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>index.jsp</code>.</p>
-				<p>Edit index.jsp so it looks like the following.</p>
-				<source><![CDATA[ 			
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-  <head>
-    <title>index.jsp</title>
-    <netui:base/>
-  </head>
-  <netui:body>
-    <p>
-      index.jsp
-    </p>
-  </netui:body>
-</netui:html>
 			]]></source>
 			</section>
 			<section>
-				<title>To Create the WEB-INF directory</title>
-				<p>	Open a command shell.</p>
-				<p>At the command prompt, enter:  <code>cd C:\beehive-src\trunk</code>
-				</p>
-				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
-				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\netui\ant</code>
-				</p>
-				<p>At the command prompt, enter: <code>ant -f webappTemplate.xml -Dwebapp.dist.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				<title>Compile the Web Service</title>
+				<p>At the command prompt, enter: <code>ant -f C:\beehive-0.4\ant\buildWebappCore.xml build.webapp -Dwebapp.dir=C:\jakarta-tomcat-5.0.25\webapps\AnnotatedAxis</code>
 				</p>
+				<p>[tbd: currently gives a Can't find xmlbean class error.  Use ant -f C:\dev-apache\beehive\trunk\test\ant\buildWebapp.xml build.webapp -Dwebapp.dir=C:\jakarta-tomcat-5.0.25\webapps\AnnotatedAxis as a temp. workaround.]</p>
 			</section>
 			<section>
-				<title>Compile the Page Flow</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
+				<title>Test the Web Service</title>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
 				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
 				</p>
 			</section>
-			<section>
-				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
-				</p>
-				<p>At the command prompt, enter: <code>startup.bat</code>
-				</p>
-				<p>Leave this command shell open, so that you can stop and restart Tomcat when necessary.</p>
-			</section>
-			<section>
-				<title>To Test the Page Flow Web Application</title>
-				<p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/pageflow_tutorial</code>
-				</p>
-				<p>You will be directed to the index.jsp page.</p>
-			</section>
 		</section>
+		<!--
 		<section id="step_3">
 			<title>Step 3: Navigation</title>
 			<section>
 				<title>Create a Destination JSP Page</title>
-				<p>In the directory <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
+				<p>In the directory <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial</code>, create a file named <code>page2.jsp</code>.</p>
 				<p>Edit page2.jsp so it looks like the following.</p>
 				<source><![CDATA[					
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>
@@ -194,7 +154,7 @@
 			</section>
 			<section>
 				<title>Create a Link to the Destination Page</title>
-				<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
+				<p>Open the file C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/index.jsp.</p>
 				<p>Edit index.jsp so it appears as follows.</p>
 				<source><![CDATA[
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>
@@ -219,7 +179,7 @@
 			</section>
 			<section>
 				<title>Add an Action Method to Handle the Link</title>
-				<p>Open the file C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
+				<p>Open the file C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf.</p>
 				<p>Edit Controller.jpf so it appears as follows.</p>
 				<source><![CDATA[
 import org.apache.beehive.netui.pageflow.Forward;
@@ -256,18 +216,18 @@
 				<p>Open a command shell.</p>
 				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
 				</p>
 				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
 				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
 				</p>
 			</section>
 			<section>
 				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
 				</p>
 				<p>At the command prompt, enter: <code>startup.bat</code>
 				</p>
@@ -291,7 +251,7 @@
 			<title>Step 4: Submitting Data</title>
 			<section>
 				<title>To Create a Submission Form</title>
-				<p>Edit the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
+				<p>Edit the file <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/page2.jsp</code> so it appears as follows.</p>
 				<source><![CDATA[
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
@@ -319,7 +279,7 @@
 			</section>
 			<section>
 				<title>To Edit the Controller File to Handle the Submitted Data</title>
-				<p>Open the file <code>C:/beehive-src/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</code>
+				<p>Open the file <code>C:/beehive-0.4/trunk/installed/jakarta-tomcat-5.0.25/webapps/pageflow_tutorial/Controller.jpf</code>
 				</p>
 				<p>Edit Controller.jpf so it appears as follows.</p>
 				<source><![CDATA[
@@ -396,18 +356,18 @@
 				<p>Open a command shell.</p>
 				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
 				</p>
 				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
 				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
 				</p>
 			</section>
 			<section>
 				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
 				</p>
 				<p>At the command prompt, enter: <code>startup.bat</code>
 				</p>
@@ -472,18 +432,18 @@
 				<p>Open a command shell.</p>
 				<p>At the command prompt, enter: <code>set JAVA_HOME=C:\jdk1.5.0</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk</code>
 				</p>
 				<p>At the command prompt, enter: <code>beehiveEnv.cmd</code>
 				</p>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\test\ant</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\test\ant</code>
 				</p>
-				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
+				<p>At the command prompt, enter: <code>ant -f buildWebapp.xml build.webapp -Dwebapp.dir=C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\webapps\pageflow_tutorial</code>
 				</p>
 			</section>
 			<section>
 				<title>To Start the Tomcat Server</title>
-				<p>At the command prompt, enter: <code>cd C:\beehive-src\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
+				<p>At the command prompt, enter: <code>cd C:\beehive-0.4\trunk\installed\jakarta-tomcat-5.0.25\bin</code>
 				</p>
 				<p>At the command prompt, enter: <code>startup.bat</code>
 				</p>
@@ -509,6 +469,7 @@
 			<p>Concepts and Tasks Introduced in This Tutorial</p>
 			<p>[tbd: more detailed summary]</p>
 		</section>
+		-->
 	</body>
 	<footer>
 		<legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>