You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2004/11/08 19:43:30 UTC

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

Author: steveh
Date: Mon Nov  8 10:43:28 2004
New Revision: 56960

Added:
   incubator/beehive/site/build/site/controls/sample_controls-blank.html   (contents, props changed)
   incubator/beehive/site/build/site/controls/sample_controls-db.html   (contents, props changed)
   incubator/beehive/site/build/site/wsm/sample_wsm-blank.html   (contents, props changed)
   incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml   (contents, props changed)
   incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml   (contents, props changed)
   incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml   (contents, props changed)
Modified:
   incubator/beehive/site/build/site/Controls.html
   incubator/beehive/site/build/site/contributors.html
   incubator/beehive/site/build/site/controls/tutorial_controls.html
   incubator/beehive/site/build/site/downloads.html
   incubator/beehive/site/build/site/faq.html
   incubator/beehive/site/build/site/index.html
   incubator/beehive/site/build/site/jpetstore.html
   incubator/beehive/site/build/site/license.html
   incubator/beehive/site/build/site/mailinglists.html
   incubator/beehive/site/build/site/pageflow/guide.html
   incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html
   incubator/beehive/site/build/site/reference.html
   incubator/beehive/site/build/site/webservices.html
   incubator/beehive/site/build/site/wsm/sample_AddressBook.html
   incubator/beehive/site/build/site/wsm/sample_Dashboard.html
   incubator/beehive/site/build/site/wsm/tutorial_wsm.html
   incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml
   incubator/beehive/site/src/documentation/content/xdocs/site.xml
   incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
Log:
Latest content for live site.


Modified: incubator/beehive/site/build/site/Controls.html
==============================================================================
--- incubator/beehive/site/build/site/Controls.html	(original)
+++ incubator/beehive/site/build/site/Controls.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/contributors.html
==============================================================================
--- incubator/beehive/site/build/site/contributors.html	(original)
+++ incubator/beehive/site/build/site/contributors.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>
@@ -337,7 +349,7 @@
 </tr>
 	
 <tr>
-<td colspan="1" rowspan="1">?</td><td colspan="1" rowspan="1">Mike Merz</td><td colspan="1" rowspan="1">BEA (need CLA)</td>
+<td colspan="1" rowspan="1">mmerz</td><td colspan="1" rowspan="1">Mike Merz</td><td colspan="1" rowspan="1">BEA</td>
 </tr>
       	
 <tr>

Added: incubator/beehive/site/build/site/controls/sample_controls-blank.html
==============================================================================
--- (empty file)
+++ incubator/beehive/site/build/site/controls/sample_controls-blank.html	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,309 @@
+<!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>"Blank" Control Sample</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">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="../wsm/tutorial_wsm.html">Web Services Tutorial</a>
+</li>
+            
+<li>
+<a href="../webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="../jpetstore.html">Petstore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_Dashboard.html">Petstore Dashboard</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<span class="sel"><font color="#ffcc00">Control Project</font></span>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+    
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Community</font>
+<ul>
+        
+<li>
+<a href="../mailinglists.html">Mailing Lists</a>
+</li>
+        
+<li>
+<a href="../contributors.html">Contributors</a>
+</li>
+    
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>"Blank" Control Sample</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#intro">Distributable Control Projects</a>
+</li>
+<li></li>
+</ul>
+        
+<a name="N1000C"></a><a name="intro"></a>
+<h3>Distributable Control Projects</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>"Mentioning the "control project" model for using controls (perhaps as a 2nd controls tutorial?) -- ie, using the controls-blank template to create a controls JAR that is then importable in multiple webapps (WEB-INF/lib), and using this to help isolate business logic in controls from presentation logic in the webapp proper."            </p>
+</div>
+        
+<a name="N10016"></a>
+<h3></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>

Added: incubator/beehive/site/build/site/controls/sample_controls-db.html
==============================================================================
--- (empty file)
+++ incubator/beehive/site/build/site/controls/sample_controls-db.html	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,348 @@
+<!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>Database Control Sample</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">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="../wsm/tutorial_wsm.html">Web Services Tutorial</a>
+</li>
+            
+<li>
+<a href="../webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="../jpetstore.html">Petstore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_Dashboard.html">Petstore Dashboard</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<span class="sel"><font color="#ffcc00">Database Control</font></span>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+    
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Community</font>
+<ul>
+        
+<li>
+<a href="../mailinglists.html">Mailing Lists</a>
+</li>
+        
+<li>
+<a href="../contributors.html">Contributors</a>
+</li>
+    
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Database Control Sample</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#Control+Programming%3A+Simplifying+Access+to+Resources">Control Programming: Simplifying Access to Resources</a>
+<ul class="minitoc">
+<li>
+<a href="#Structure+of+the+Database+Control">Structure of the Database Control</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#Distributing+the+Database+Control">Distributing the Database Control</a>
+</li>
+</ul>
+    
+<a name="N1000C"></a><a name="Control+Programming%3A+Simplifying+Access+to+Resources"></a>
+<h3>Control Programming: Simplifying Access to Resources</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>Control Programming...simplifying access to a resource, in this case a database.</p>
+<a name="N10015"></a><a name="Structure+of+the+Database+Control"></a>
+<h4>Structure of the Database Control</h4>
+<div style="margin-left: 0 ; border: 2px"></div>
+<p>The Database Control is a <em>base control</em>: it is designed to be extented by a <em>control extension</em>.  Base controls package the boilerplate code, the common routines that any code must execute in order to access a resource.  Control extensions contain the interesting, variable aspects of accessing the resource.  If this model were applied to the case of JMS access, the base control would contain the boilerplate tasks consisting of obtaining sessions, referencing queues, etc.  The control extension configures the base control for access to a particular JMS resource.  The control extension would anwser the questions: What the JNDI name of the JMS resources?  What message should be sent?  
+</p>
+<p>
+In the case of a database resource, The boilerplate parts of the code are tasks such as making a JDBC connection with the database and handling the resultsets, tasks specified in the base control.  An extension of the base database control configures the base control by setting the JNDI name the target database, the SQL statements used to communicate with the database, the maximum size of resultsets that the control will accept, etc.    
+</p>
+<p>
+Not all base controls need to extended to be used: they can be designed to be used directly by the client, without an control extension intermediary.  But in the case of the database Database Control is designed in order to be extended by another class, which answers all of the parameter questions: the interesting parts of accessing the particular resource, whatever it is.  An example of a control extention off of the base Database Control is EmployeeDBControl.jcx (located at BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample).  The fragment below shows how the control extension configures the base control for a JDBC connection to a particular Derby database.
+        </p>
+<p>
+<strong>EmployeeDBControl.jcx</strong>
+</p>
+<pre class="code">@ControlExtension
+@ConnectionDataSource(jndiName="jdbc:derby:build/databaseControlTestDB;create=true")
+public interface EmployeeDBControl extends DatabaseControl
+{
+    ...
+}
+</pre>
+<ul>
+        
+<li>Metadata annotations: reduces configuring the control for resource access to a matter of setting properties throught annotations.  To a client, the control appears as a JavaBean that is instantiated and operated upon for resource access.  Base controls configure the container using annotations.  Control extensions configure the base.</li>
+        
+<li>events (<a href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</a>)</li>
+        
+<li>resource management (<a href="http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management">http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management</a>).... [todo]</li>
+    
+</ul>
+</div>
+    
+<a name="N10047"></a><a name="Distributing+the+Database+Control"></a>
+<h3>Distributing the Database Control</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>[todo]</p>
+</div>
+    
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;The Apache Software Foundation. All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Modified: incubator/beehive/site/build/site/controls/tutorial_controls.html
==============================================================================
--- incubator/beehive/site/build/site/controls/tutorial_controls.html	(original)
+++ incubator/beehive/site/build/site/controls/tutorial_controls.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook</a>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/downloads.html
==============================================================================
--- incubator/beehive/site/build/site/downloads.html	(original)
+++ incubator/beehive/site/build/site/downloads.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/faq.html
==============================================================================
--- incubator/beehive/site/build/site/faq.html	(original)
+++ incubator/beehive/site/build/site/faq.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/index.html
==============================================================================
--- incubator/beehive/site/build/site/index.html	(original)
+++ incubator/beehive/site/build/site/index.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>
@@ -264,20 +276,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/site/build/site/jpetstore.html
==============================================================================
--- incubator/beehive/site/build/site/jpetstore.html	(original)
+++ incubator/beehive/site/build/site/jpetstore.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>
@@ -279,13 +291,13 @@
 <a name="N1000C"></a><a name="Introduction"></a>
 <h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>The Petstore sample is composed of Page Flows and Controls.  The Page Flows form the application's user interface, while the Controls coordinate the 
-            applciation's back-end resources.</p>
-<p>The Page Flows are arranged in a modular fashion. There are separate Page Flows for different user activities, for example the 'shop' Page Flow (located at: <span class="codefrag">petstoreWeb/shop/</span>) lets users browse the catalog of pets, the 'checkout' Page Flow (petstoreWeb/checkout) lets users purchase selected items from a shopping cart, etc.</p>
+<p>The Petstore sample demonstrates how to integrate all three Beehive technologies (Page Flows, Controls and Web Services) in one application.</p>
+<p>The Page Flows provide customers with web access to the Petstore.  There are separate Page Flows for different customer activities: the 'shop' Page Flow (located at: <span class="codefrag">petstoreWeb/shop/</span>) lets users browse the catalog of pets, the 'checkout' Page Flow (petstoreWeb/checkout) lets users purchase selected items from a shopping cart, etc.</p>
+<p>The Web Service provides employee access to the Petstore.  Through the web service (located at <span class="codefrag">petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws</span>) employees can update the current inventory and prices displayed to customers through the web site.  A Swing client for the web service is provided in the sample <a href="http://incubator.apache.org/beehive/wsm/sample_Dashboard.html">Petstore Dashboard</a>.  </p>
 <p>Most of the Page Flows have associated Control files (located at: <span class="codefrag">petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/</span>).  The Controls handle the backend data traffic and encupsulate the operations of the web application, such as retrieving data from a database and handling user orders.</p>
 </div>
         
-<a name="N10022"></a><a name="Petstore+Directory+Structure"></a>
+<a name="N1002C"></a><a name="Petstore+Directory+Structure"></a>
 <h3>Petstore Directory Structure</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The table below describes the functions of the most important files in the Petstore web application.</p>
@@ -359,6 +371,12 @@
         
 <tr>
             
+<td colspan="1" rowspan="1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lib/PetstoreInventoryManager.jws</td><td colspan="1" rowspan="1">Web service for employee access to the store</td>
+        
+</tr>
+        
+<tr>
+            
 <td colspan="1" rowspan="1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src/.../controls</td><td colspan="1" rowspan="1">Beehive Controls encapsulating different functionalities, including handling user account data, catalogue data, and order processing.</td>
         
 </tr>
@@ -378,10 +396,10 @@
 </table>
 </div>
         
-<a name="N100D6"></a><a name="Running+the+PetStore+Sample+on+Tomcat+5"></a>
+<a name="N100EC"></a><a name="Running+the+PetStore+Sample+on+Tomcat+5"></a>
 <h3>Running the PetStore Sample on Tomcat 5</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100DC"></a><a name="Requirements"></a>
+<a name="N100F2"></a><a name="Requirements"></a>
 <h4>Requirements</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Beehive requires the following software to build and deploy
@@ -397,7 +415,7 @@
                 
 </ul>
 </div>
-<a name="N100F2"></a><a name="Setup"></a>
+<a name="N10108"></a><a name="Setup"></a>
 <h4>Setup</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the descriptions below, <span class="codefrag">BEEHIVE_HOME</span> refers to the root of the
@@ -442,7 +460,7 @@
 
 </p>
 </div>
-<a name="N10132"></a><a name="Building%0A"></a>
+<a name="N10148"></a><a name="Building%0A"></a>
 <h4>Building
 </h4>
 <div style="margin-left: 0 ; border: 2px">
@@ -457,14 +475,12 @@
 </pre>
 <p>This will copy the Beehive webapp runtime into 
 </p>
-<pre class="code">  BEEHIVE_HOME/samples/petstoreWeb/WEB-INF/lib
-
-</pre>
+<pre class="code">  BEEHIVE_HOME/samples/petstoreWeb/WEB-INF/lib</pre>
 <p>and run the Beehive webapp build process on the petstoreWeb application.
 
 </p>
 </div>
-<a name="N10155"></a><a name="Deploying+and+Running%0A"></a>
+<a name="N1016B"></a><a name="Deploying+and+Running%0A"></a>
 <h4>Deploying and Running
 </h4>
 <div style="margin-left: 0 ; border: 2px">
@@ -489,9 +505,7 @@
    -Dcontext.path=petstoreWeb</pre>
 <p>To hit the running application, use the URL:
 </p>
-<pre class="code">  http://localhost:8080/petstoreWeb/Controller.jpf
-
-</pre>
+<pre class="code">  http://localhost:8080/petstoreWeb/Controller.jpf</pre>
 </div>
 </div>
     

Modified: incubator/beehive/site/build/site/license.html
==============================================================================
--- incubator/beehive/site/build/site/license.html	(original)
+++ incubator/beehive/site/build/site/license.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/mailinglists.html
==============================================================================
--- incubator/beehive/site/build/site/mailinglists.html	(original)
+++ incubator/beehive/site/build/site/mailinglists.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/pageflow/guide.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/guide.html	(original)
+++ incubator/beehive/site/build/site/pageflow/guide.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook</a>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html
==============================================================================
--- incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html	(original)
+++ incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook</a>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/reference.html
==============================================================================
--- incubator/beehive/site/build/site/reference.html	(original)
+++ incubator/beehive/site/build/site/reference.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/webservices.html
==============================================================================
--- incubator/beehive/site/build/site/webservices.html	(original)
+++ incubator/beehive/site/build/site/webservices.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="wsm/sample_AddressBook.html">AddressBook</a>
+<a href="wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Modified: incubator/beehive/site/build/site/wsm/sample_AddressBook.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_AddressBook.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_AddressBook.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<span class="sel"><font color="#ffcc00">AddressBook</font></span>
+<span class="sel"><font color="#ffcc00">AddressBook/Employee</font></span>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>
@@ -276,14 +288,15 @@
 <a name="N1000C"></a><a name="The+AddressBookWS+and+EmployeeWS+Samples"></a>
 <h3>The AddressBookWS and EmployeeWS Samples</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>The AddressBookWS sample is an annotation-aware web service based on the Apache Axis sample of the same name. AddressBookWS is organized as an application with POJO (Plain Old Java Objects) models, service interface, service implementation, and unit tests for the service. The directory structure and ant build file can be used as a template for building new standalone web services.</p>
-<p>EmployeeWS [todo]</p>
+<p>The <strong>AddressBookWS</strong> sample is an annotation-aware web service based on the Apache Axis sample of the same name. AddressBookWS is organized as an application with POJO (Plain Old Java Objects) models, service interface, service implementation, and unit tests for the service.  Apache Axis provides automatic client-generation and junit test cases for the sample.   The directory structure and ant build file can be used as a template for building new standalone web services.</p>
+<p>
+<strong>EmployeeWS</strong> provides a web service interface for an Employee database.  Using SOAP messages, the web service queries the backend database: selecting, updating and inserting employee data.  A Beehive database control connects the web service and the database.  The web service class is located at <span class="codefrag">EmployeeWS/WEB-INF/src/web/Service.jws</span>.  The database control is located at <span class="codefrag">EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</span>.  Apache Derby supplies the database implementation.  (Installing Derby requires a simple JAR file download, described below.)  Apache Axis provides the automatic client-generation for the web service.  Custom unit tests are provided to exercise the webservice methods.  The unit tests creates the database table, inserts a new record, queries the database, and finally drops the table.  Use the junit tests as a template for building automatic tests for your own controls.</p>
 </div>
         
-<a name="N10019"></a><a name="Running+the+Samples"></a>
+<a name="N10024"></a><a name="Running+the+Samples"></a>
 <h3>Running the Samples</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1001F"></a><a name="Requirements+for+Running+the+Sample"></a>
+<a name="N1002A"></a><a name="Requirements+for+Running+the+Sample"></a>
 <h4>Requirements for Running the Sample</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To run the Samples, you need:</p>
@@ -303,7 +316,7 @@
                 
 </ul>
 </div>
-<a name="N1003E"></a><a name="Setting+up+the+Environment"></a>
+<a name="N10049"></a><a name="Setting+up+the+Environment"></a>
 <h4>Setting up the Environment</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Download a Beehive distribution archive, and explode it on your local machine.  In the instructions below, the top level directory of the exploded Beehive archive is called '<span class="codefrag">&lt;dist-dir&gt;</span>'.  For example if you explode the archive into  </p>
@@ -331,7 +344,7 @@
 <p>  Copy <span class="codefrag">junit.jar</span> to <span class="codefrag">ANT_HOME/lib</span>.</p>
 <p> Download derby_46005.jar from <a href="http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP">http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP</a>.</p>
 <p>  Copy <span class="codefrag">derby_46005.jar</span> to <span class="codefrag">BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/lib</span>.</p>
-<a name="N10094"></a><a name="Setting+up+the+Server"></a>
+<a name="N1009F"></a><a name="Setting+up+the+Server"></a>
 <h4>Setting up the Server</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -341,8 +354,20 @@
 <pre class="code">    ant -f ant\buildWebapp.xml start</pre>
 <p>This will start the Tomcat server located at <span class="codefrag">CATALINA_HOME</span>.</p>
 <p>To build and deploy the web services, run the following Ant commands:</p>
-<pre class="code">    ant -Dwebapp.dir=%BEEHIVE_HOME%\samples\AddressBookWS -Dcontext.path=AddressBookWS -f ant\buildWebapp.xml deploy.wsm.webapp.runtime build.webapp deploy</pre>
-<pre class="code">    ant -Dwebapp.dir=%BEEHIVE_HOME%\samples\EmployeeWS -Dcontext.path=EmployeeWS -f ant\buildWebapp.xml deploy.wsm.webapp.runtime build.webapp deploy</pre>
+<pre class="code">  ant 
+    -Dwebapp.dir=%BEEHIVE_HOME%\samples\AddressBookWS 
+    -Dcontext.path=AddressBookWS 
+    -f ant\buildWebapp.xml 
+    deploy.wsm.webapp.runtime 
+    build.webapp 
+    deploy</pre>
+<pre class="code">  ant 
+    -Dwebapp.dir=%BEEHIVE_HOME%\samples\EmployeeWS 
+    -Dcontext.path=EmployeeWS 
+    -f ant\buildWebapp.xml 
+    deploy.wsm.webapp.runtime 
+    build.webapp 
+    deploy</pre>
 <p>Verify that the web services are running by pointing your browser to:</p>
 <p>
                     
@@ -364,7 +389,7 @@
 <a href="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl">    http://localhost:8080/EmployeeWS/web/Service.jws?wsdl</a>
 </p>
 </div>
-<a name="N100E8"></a><a name="Setting+up+the+Clients"></a>
+<a name="N100F3"></a><a name="Setting+up+the+Clients"></a>
 <h4>Setting up the Clients</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>To generate the clients run the following build files.</p>

Modified: incubator/beehive/site/build/site/wsm/sample_Dashboard.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/sample_Dashboard.html	(original)
+++ incubator/beehive/site/build/site/wsm/sample_Dashboard.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook</a>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Added: incubator/beehive/site/build/site/wsm/sample_wsm-blank.html
==============================================================================
--- (empty file)
+++ incubator/beehive/site/build/site/wsm/sample_wsm-blank.html	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,309 @@
+<!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>"Blank" Control Sample</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">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="../wsm/tutorial_wsm.html">Web Services Tutorial</a>
+</li>
+            
+<li>
+<a href="../webservices.html">Web Services (JSR 181)</a>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<font color="#CFDCED">Samples</font>
+<ul>
+            
+<li>
+<a href="../jpetstore.html">Petstore</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_Dashboard.html">Petstore Dashboard</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<span class="sel"><font color="#ffcc00">Web Service Project</font></span>
+</li>
+        
+</ul>
+</li>
+        
+<li>
+<a href="../reference.html">Reference Docs</a>
+</li>
+        
+        
+    
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Community</font>
+<ul>
+        
+<li>
+<a href="../mailinglists.html">Mailing Lists</a>
+</li>
+        
+<li>
+<a href="../contributors.html">Contributors</a>
+</li>
+    
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>"Blank" Control Sample</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#intro">Distributable Control Projects</a>
+</li>
+<li></li>
+</ul>
+        
+<a name="N1000C"></a><a name="intro"></a>
+<h3>Distributable Control Projects</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>"Mentioning the "control project" model for using controls (perhaps as a 2nd controls tutorial?) -- ie, using the controls-blank template to create a controls JAR that is then importable in multiple webapps (WEB-INF/lib), and using this to help isolate business logic in controls from presentation logic in the webapp proper."            </p>
+</div>
+        
+<a name="N10016"></a>
+<h3></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/site/build/site/wsm/tutorial_wsm.html
==============================================================================
--- incubator/beehive/site/build/site/wsm/tutorial_wsm.html	(original)
+++ incubator/beehive/site/build/site/wsm/tutorial_wsm.html	Mon Nov  8 10:43:28 2004
@@ -180,7 +180,19 @@
 </li>
             
 <li>
-<a href="../wsm/sample_AddressBook.html">AddressBook</a>
+<a href="../wsm/sample_AddressBook.html">AddressBook/Employee</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-db.html">Database Control</a>
+</li>
+            
+<li>
+<a href="../controls/sample_controls-blank.html">Control Project</a>
+</li>
+            
+<li>
+<a href="../wsm/sample_wsm-blank.html">Web Service Project</a>
 </li>
         
 </ul>

Added: incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-blank.xml	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,21 @@
+<?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>"Blank" Control Sample</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>Distributable Control Projects</title>
+<p>"Mentioning the "control project" model for using controls (perhaps as a 2nd controls tutorial?) -- ie, using the controls-blank template to create a controls JAR that is then importable in multiple webapps (WEB-INF/lib), and using this to help isolate business logic in controls from presentation logic in the webapp proper."            </p>
+        </section>
+        <section>
+            <title></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/site/src/documentation/content/xdocs/controls/sample_controls-db.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/site/src/documentation/content/xdocs/controls/sample_controls-db.xml	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,45 @@
+<?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>Database Control Sample</title>
+    </header>
+    <body>
+    <section>
+        <title>Control Programming: Simplifying Access to Resources</title>
+        <p>Control Programming...simplifying access to a resource, in this case a database.</p>
+        <section>
+            <title>Structure of the Database Control</title>
+        </section>    
+        <p>The Database Control is a <em>base control</em>: it is designed to be extented by a <em>control extension</em>.  Base controls package the boilerplate code, the common routines that any code must execute in order to access a resource.  Control extensions contain the interesting, variable aspects of accessing the resource.  If this model were applied to the case of JMS access, the base control would contain the boilerplate tasks consisting of obtaining sessions, referencing queues, etc.  The control extension configures the base control for access to a particular JMS resource.  The control extension would anwser the questions: What the JNDI name of the JMS resources?  What message should be sent?  
+</p><p>
+In the case of a database resource, The boilerplate parts of the code are tasks such as making a JDBC connection with the database and handling the resultsets, tasks specified in the base control.  An extension of the base database control configures the base control by setting the JNDI name the target database, the SQL statements used to communicate with the database, the maximum size of resultsets that the control will accept, etc.    
+</p><p>
+Not all base controls need to extended to be used: they can be designed to be used directly by the client, without an control extension intermediary.  But in the case of the database Database Control is designed in order to be extended by another class, which answers all of the parameter questions: the interesting parts of accessing the particular resource, whatever it is.  An example of a control extention off of the base Database Control is EmployeeDBControl.jcx (located at BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample).  The fragment below shows how the control extension configures the base control for a JDBC connection to a particular Derby database.
+        </p>
+<p><strong>EmployeeDBControl.jcx</strong></p>
+<source>@ControlExtension
+@ConnectionDataSource(jndiName="jdbc:derby:build/databaseControlTestDB;create=true")
+public interface EmployeeDBControl extends DatabaseControl
+{
+    ...
+}
+</source>
+
+    <ul>
+        <li>Metadata annotations: reduces configuring the control for resource access to a matter of setting properties throught annotations.  To a client, the control appears as a JavaBean that is instantiated and operated upon for resource access.  Base controls configure the container using annotations.  Control extensions configure the base.</li>
+        <li>events (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Operations">http://incubator.apache.org/beehive/ControlsOverview.html#Operations</link>)</li>
+        <li>resource management (<link href="http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management">http://incubator.apache.org/beehive/ControlsOverview.html#Resource%20Management</link>).... [todo]</li>
+    </ul>
+    </section>
+    <section>
+        <title>Distributing the Database Control</title>
+        <p>[todo]</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/site/src/documentation/content/xdocs/jpetstore.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/jpetstore.xml	Mon Nov  8 10:43:28 2004
@@ -7,9 +7,9 @@
     <body>
         <section>
             <title>Introduction</title>
-            <p>The Petstore sample is composed of Page Flows and Controls.  The Page Flows form the application's user interface, while the Controls coordinate the 
-            applciation's back-end resources.</p>
-            <p>The Page Flows are arranged in a modular fashion. There are separate Page Flows for different user activities, for example the 'shop' Page Flow (located at: <code>petstoreWeb/shop/</code>) lets users browse the catalog of pets, the 'checkout' Page Flow (petstoreWeb/checkout) lets users purchase selected items from a shopping cart, etc.</p>
+            <p>The Petstore sample demonstrates how to integrate all three Beehive technologies (Page Flows, Controls and Web Services) in one application.</p>
+            <p>The Page Flows provide customers with web access to the Petstore.  There are separate Page Flows for different customer activities: the 'shop' Page Flow (located at: <code>petstoreWeb/shop/</code>) lets users browse the catalog of pets, the 'checkout' Page Flow (petstoreWeb/checkout) lets users purchase selected items from a shopping cart, etc.</p>
+        <p>The Web Service provides employee access to the Petstore.  Through the web service (located at <code>petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws</code>) employees can update the current inventory and prices displayed to customers through the web site.  A Swing client for the web service is provided in the sample <link href="http://incubator.apache.org/beehive/wsm/sample_Dashboard.html">Petstore Dashboard</link>.  </p>
         <p>Most of the Page Flows have associated Control files (located at: <code>petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/</code>).  The Controls handle the backend data traffic and encupsulate the operations of the web application, such as retrieving data from a database and handling user orders.</p>
         </section>
         <section>
@@ -50,6 +50,9 @@
             <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lib</td><td>JAR resources</td>
         </tr>
         <tr>
+            <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lib/PetstoreInventoryManager.jws</td><td>Web service for employee access to the store</td>
+        </tr>
+        <tr>
             <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src/.../controls</td><td>Beehive Controls encapsulating different functionalities, including handling user account data, catalogue data, and order processing.</td>
         </tr>
         <tr>
@@ -117,9 +120,7 @@
 </source>
                 <p>This will copy the Beehive webapp runtime into 
 </p>
-                <source>  BEEHIVE_HOME/samples/petstoreWeb/WEB-INF/lib
-
-</source>
+                <source>  BEEHIVE_HOME/samples/petstoreWeb/WEB-INF/lib</source>
                 <p>and run the Beehive webapp build process on the petstoreWeb application.
 
 </p>
@@ -147,9 +148,7 @@
    -Dcontext.path=petstoreWeb</source>
                 <p>To hit the running application, use the URL:
 </p>
-                <source>  http://localhost:8080/petstoreWeb/Controller.jpf
-
-</source>
+                <source>  http://localhost:8080/petstoreWeb/Controller.jpf</source>
             </section>
         </section>
     </body>

Modified: incubator/beehive/site/src/documentation/content/xdocs/site.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/site.xml	Mon Nov  8 10:43:28 2004
@@ -24,8 +24,11 @@
         </wsm>
         <samples label="Samples">
             <jpetstore label="Petstore" href="jpetstore.html"/>
-            <jsr181 label="Petstore Dashboard" href="wsm/sample_Dashboard.html"/>
-            <jsr181 label="AddressBook" href="wsm/sample_AddressBook.html"/>
+            <dash label="Petstore Dashboard" href="wsm/sample_Dashboard.html"/>
+            <address label="AddressBook/Employee" href="wsm/sample_AddressBook.html"/>
+            <db label="Database Control" href="controls/sample_controls-db.html"/>
+            <control-blank label="Control Project" href="controls/sample_controls-blank.html"/>
+            <wsm-blank label="Web Service Project" href="wsm/sample_wsm-blank.html"/>
         </samples>
         <ref label="Reference Docs" href="reference.html"/>
         <!--<gloss label="Glossary" href="glossary.html"/>-->

Modified: incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_AddressBook.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_AddressBook.xml	Mon Nov  8 10:43:28 2004
@@ -7,8 +7,8 @@
     <body>
         <section>
             <title>The AddressBookWS and EmployeeWS Samples</title>
-            <p>The AddressBookWS sample is an annotation-aware web service based on the Apache Axis sample of the same name. AddressBookWS is organized as an application with POJO (Plain Old Java Objects) models, service interface, service implementation, and unit tests for the service. The directory structure and ant build file can be used as a template for building new standalone web services.</p>
-            <p>EmployeeWS [todo]</p>
+            <p>The <strong>AddressBookWS</strong> sample is an annotation-aware web service based on the Apache Axis sample of the same name. AddressBookWS is organized as an application with POJO (Plain Old Java Objects) models, service interface, service implementation, and unit tests for the service.  Apache Axis provides automatic client-generation and junit test cases for the sample.   The directory structure and ant build file can be used as a template for building new standalone web services.</p>
+            <p><strong>EmployeeWS</strong> provides a web service interface for an Employee database.  Using SOAP messages, the web service queries the backend database: selecting, updating and inserting employee data.  A Beehive database control connects the web service and the database.  The web service class is located at <code>EmployeeWS/WEB-INF/src/web/Service.jws</code>.  The database control is located at <code>EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</code>.  Apache Derby supplies the database implementation.  (Installing Derby requires a simple JAR file download, described below.)  Apache Axis provides the automatic client-generation for the web service.  Custom unit tests are provided to exercise the webservice methods.  The unit tests creates the database table, inserts a new record, queries the database, and finally drops the table.  Use the junit tests as a template for building automatic tests for your own controls.</p>
         </section>
         <section>
             <title>Running the Samples</title>
@@ -57,8 +57,20 @@
                 <source>    ant -f ant\buildWebapp.xml start</source>
                 <p>This will start the Tomcat server located at <code>CATALINA_HOME</code>.</p>
                 <p>To build and deploy the web services, run the following Ant commands:</p>
-                <source>    ant -Dwebapp.dir=%BEEHIVE_HOME%\samples\AddressBookWS -Dcontext.path=AddressBookWS -f ant\buildWebapp.xml deploy.wsm.webapp.runtime build.webapp deploy</source>
-                <source>    ant -Dwebapp.dir=%BEEHIVE_HOME%\samples\EmployeeWS -Dcontext.path=EmployeeWS -f ant\buildWebapp.xml deploy.wsm.webapp.runtime build.webapp deploy</source>
+    <source>  ant 
+    -Dwebapp.dir=%BEEHIVE_HOME%\samples\AddressBookWS 
+    -Dcontext.path=AddressBookWS 
+    -f ant\buildWebapp.xml 
+    deploy.wsm.webapp.runtime 
+    build.webapp 
+    deploy</source>
+    <source>  ant 
+    -Dwebapp.dir=%BEEHIVE_HOME%\samples\EmployeeWS 
+    -Dcontext.path=EmployeeWS 
+    -f ant\buildWebapp.xml 
+    deploy.wsm.webapp.runtime 
+    build.webapp 
+    deploy</source>
                 <p>Verify that the web services are running by pointing your browser to:</p>
                 <p>
                     <fork href="http://localhost:8080/AddressBookWS/">http://localhost:8080/AddressBookWS/</fork>

Added: incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/site/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml	Mon Nov  8 10:43:28 2004
@@ -0,0 +1,21 @@
+<?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>"Blank" Control Sample</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>Distributable Control Projects</title>
+<p>"Mentioning the "control project" model for using controls (perhaps as a 2nd controls tutorial?) -- ie, using the controls-blank template to create a controls JAR that is then importable in multiple webapps (WEB-INF/lib), and using this to help isolate business logic in controls from presentation logic in the webapp proper."            </p>
+        </section>
+        <section>
+            <title></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>