You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/07/21 21:59:20 UTC

svn commit: r220174 - in /incubator/beehive/trunk/docs: ./ forrest/ forrest/src/documentation/content/xdocs/ forrest/src/documentation/content/xdocs/beehive/ forrest/src/documentation/content/xdocs/controls/ forrest/src/documentation/content/xdocs/deve...

Author: ekoneil
Date: Thu Jul 21 12:59:16 2005
New Revision: 220174

URL: http://svn.apache.org/viewcvs?rev=220174&view=rev
Log:
Move the Beehive release documentation into a release/ sub-directory of the docs/forrest/src/documentation/content/xdocs/ directory.

The site-specific documentation now lives in xdocs/ and the release specific documentation lives in release/

Should make it easier to move the site-specific docs elsewhere so that they can be versioned independently of the release documentation.

BB: self
DRT: Beehive / build.dist pass


Added:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/beehive/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/beehive/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/controls/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/development/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/development/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/glossary.xml
      - copied unchanged from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/index.xml
      - copied, changed from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml
      - copied unchanged from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/release_notes.xml
      - copied unchanged from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/samples/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml
      - copied unchanged from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/system-controls/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/tutorial/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tutorial/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/webservices.xml
      - copied unchanged from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/webservices.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/wsm/
      - copied from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/
Removed:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/beehive/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/development/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/samples/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tutorial/
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/webservices.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/
    incubator/beehive/trunk/docs/forrest/status.xml
Modified:
    incubator/beehive/trunk/docs/build.xml
    incubator/beehive/trunk/docs/forrest/build.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/faq.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml

Modified: incubator/beehive/trunk/docs/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/build.xml?rev=220174&r1=220173&r2=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/build.xml (original)
+++ incubator/beehive/trunk/docs/build.xml Thu Jul 21 12:59:16 2005
@@ -6,6 +6,8 @@
 <project name="Beehive Docs Build" default="usage" basedir=".">
 
     <import file="../beehive-imports.xml"/>
+
+    <target name="build" depends="site"/>
     
     <target name="site">
         <ant dir="forrest" target="site"/>

Modified: incubator/beehive/trunk/docs/forrest/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/build.xml?rev=220174&r1=220173&r2=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/build.xml (original)
+++ incubator/beehive/trunk/docs/forrest/build.xml Thu Jul 21 12:59:16 2005
@@ -12,7 +12,12 @@
  
      <property environment="os"/>
      <property name="forrest.home" location="${os.FORREST_HOME}"/>
+
      <import file="${os.FORREST_HOME}/forrest.build.xml"/>
+
+    <target name="build">
+        <antcall target="site"/>
+    </target>
 
     <target name="clean">
         <delete dir="build"/>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/faq.xml?rev=220174&r1=220173&r2=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/faq.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/faq.xml Thu Jul 21 12:59:16 2005
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-
 <document>
-
 <header>
     <title>Apache Beehive FAQ</title>
 </header>
-
 <body>
-
 <section>
     <title>Frequently_Asked_Questions</title>
     <p><strong>General</strong></p>
@@ -19,12 +15,11 @@
         <li><a href="#commons_att">Does Beehive Support Commons Attributes? </a></li>
       </ol>
 </section>
-
 <section>
     <title>General</title>
       <dl>
         <dt>What is Beehive?</dt>
-        <dd><anchor id="what-is" /> Beehive is a programming model built on J2EE that is meant to simplify 
+        <dd><anchor id="what-is"/>Beehive is a programming model built on J2EE that is meant to simplify 
           building Web Applications. See the <a href="index.html">overview</a> for more info.</dd>
       </dl>
       <dl>
@@ -40,23 +35,17 @@
         <dd><anchor id="controls" /> Controls are the new component model in Beehive. They are based on 
           regular JavaBeans, with an enhanced authoring model, an extensibility 
           model, and a configuration model using JSR 175 annotations. To find 
-          out more about controls look at
-	  <a href="controls/controlsOverview.html">Controls Overview</a>.</dd>
+          out more about controls look at <a href="release/controls/controlsOverview.html">Controls Overview</a>.</dd>
       </dl>
       <dl>
         <dt>Does Beehive Support Commons Attributes?</dt>
-        <dd><anchor id="commons_att" />Since Beehive uses JDK5, which already 
-			supports JSR 175 annotations, support for commons-attributes is not a 
-			goal for Beehive.</dd>
+        <dd><anchor id="commons_att" />Since Beehive uses JDK5, which already supports JSR 175 annotations, support for commons-attributes is not a goal for Beehive.</dd>
       </dl>
  </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/docs/forrest/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml?rev=220174&r1=220173&r2=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml Thu Jul 21 12:59:16 2005
@@ -9,12 +9,20 @@
 		<section>
 			<title>What is Beehive?</title>
 			<anchor id="what"/>
-<p> Welcome to Beehive! Our goal is to make J2EE programming easier by building a simple object model on J2EE and Struts. Using the new JSR-175 and JSR-181 metadata annotations, Beehive reduces the coding necessary for J2EE. The initial Beehive project has three pieces.</p>
+<p> Welcome to Beehive! Our goal is to make J2EE programming easier by building a simple object model on J2EE and Struts. 
+Using the new JSR-175 and JSR-181 metadata annotations, Beehive reduces the coding necessary for J2EE. 
+The initial Beehive project has three pieces.</p>
 <ul>
-<li>NetUI Page Flow &#8211; An annotation-driven web application framework built on Struts that centralizes navigation logic/metadata/state in <em>reusable, encapsulated</em> "page flow" controller classes.  It provides an integrated set of JSP tags, as well as first-class integration with JavaServer Faces and with raw Struts.</li>
-<li> Controls &#8211; Lightweight component framework that helps programmers build components that incorporate metadata into their programming model. This project comes with a few pre-made controls as well, for example, see the <a href="controls/sample_controls-db.html">Database Control Sample</a>.</li>
-<li>Web Services &#8211; An implementation of <a href="http://www.jcp.org/en/jsr/detail?id=181">JSR-181</a>, an annotation-driven programming model for web services.</li></ul>
-<p><strong>Notice</strong>: Apache Beehive is an effort undergoing incubation at the Apache Software Foundation. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>		</section>
+    <li>NetUI Page Flow &#8211; An annotation-driven web application framework built on Struts that centralizes navigation logic/metadata/state in 
+<em>reusable, encapsulated</em> "page flow" controller classes.  It provides an integrated set of JSP tags, as well as first-class integration 
+with JavaServer Faces and with raw Struts.</li>
+    <li> Controls &#8211; Lightweight component framework that helps programmers build components that incorporate metadata into their 
+programming model. This project comes with a few pre-made controls as well.</li>
+    <li>Web Services &#8211; An implementation of <a href="http://www.jcp.org/en/jsr/detail?id=181">JSR-181</a>, an annotation-driven programming 
+model for web services.</li>
+</ul>
+<p><strong>Notice</strong>: Apache Beehive is an effort undergoing incubation at the Apache Software Foundation. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>		
+</section>
 <section id="news">
     <title>News</title>
     <ul>
@@ -34,7 +42,7 @@
 <section id="docs">
 <title>Documentation</title>
     <p>
-    <a href="docs/index.html">Beehive 1.0 Milestone 1 Documentation</a>
+    <a href="release/index.html">Beehive 1.0 Milestone 1 Documentation</a>
     </p>
     <p>
     <strong>Note:</strong> the documentation provided here is intended to be used with Beehive binary distributions; it is <em>not</em> intended for use with Beehive source from SVN.

Copied: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/index.xml (from r220148, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/index.xml?p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/index.xml&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml&r1=220148&r2=220174&rev=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/index.xml Thu Jul 21 12:59:16 2005
@@ -2,32 +2,31 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Beehive 1.0 Beta Documentation</title>
+        <title>Beehive 1.0 Milestone 1 Documentation</title>
     </header>
     <body>
         <p>Beehive documentation contains documentation for all three Beehive sub-projects:</p> 
-			<ul>
-				<li><a href="site:control_getting_started">Controls</a></li>
-				<li><a href="site:pageflow_getting_started">Page Flows</a></li>
-				<li><a href="site:wsm_getting_started">Web Services</a></li>
-		    </ul>
-		<p>If you are new to Beehive, begin by following the 
-			<a href="../setup.html">Installation and Startup</a> instructions.</p>
-		<p>See the <strong>user guides</strong> for the Beehive sub-projects:</p>
-		        <ul>
+	<ul>
+	<li><a href="site:control_getting_started">Controls</a></li>
+	<li><a href="site:pageflow_getting_started">Page Flows</a></li>
+	<li><a href="site:wsm_getting_started">Web Services</a></li>
+        </ul>
+	<p>If you are new to Beehive, begin by following the <a href="setup.html">Installation and Startup</a> instructions.
+        </p>
+	<p>See the <strong>user guides</strong> for the Beehive sub-projects:</p>
+	<ul>
             <li><a href="site:control_overview">Controls Overview</a></li>
             <li><a href="site:pageflow_overview">Page Flow Overview</a></li>
             <li><a href="site:wsm_overview">Web Service Overview</a></li>
         </ul>
-        <p>The following <strong>tutorials</strong> will familiarize you with the basic development cycles for Beehive
-			applications:</p>
-		        <ul>
+        <p>The following <strong>tutorials</strong> will familiarize you with the basic development cycles for Beehive applications:</p>
+        <ul>
             <li><a href="site:tutorial_control">Beehive Controls Tutorial</a></li>
             <li><a href="site:tutorial_pageflow">Beehive Page Flow Tutorial</a></li>
             <li><a href="site:tutorial_wsm">Beehive Web Service Tutorial</a></li>
         </ul>
         <p>Beehive ships with the following <strong>samples</strong>:</p>
-       <ul>
+        <ul>
             <li><a href="site:jpetstore">Petstore Sample</a></li>
             <li><a href="site:netui-samples">Page Flow Samples</a></li>
             <li><a href="site:netui-jsf">Page Flow: JSF Integration</a></li>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml?rev=220174&r1=220173&r2=220174&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml Thu Jul 21 12:59:16 2005
@@ -4,112 +4,111 @@
         <introduction label="Beehive" href="index.html"/>
         <license label="License" href="license.html"/>
         <downloads label="Downloads" href="downloads.html"/>
-        <release_notes label="Release Notes" href="release_notes.html"/>
         <mailinglists label="Mailing Lists" href="mailinglists.html"/>
         <contributors label="Contributors" href="contributors.html"/>
         <faq label="FAQ" href="faq.html"/>
     </about>
     <docs label="Documentation" tab="welcome">
-        <docs label="Beehive Docs" href="docs/index.html"/>
-        <setup label="Installation and Setup" href="setup.html" />
+        <setup label="Installation and Setup" href="release/setup.html" />
         <tutorials label="Tutorials">
-            <tutorial_pageflow label="Page Flows" href="pageflow/tutorial_pageflow.html"/>
-            <tutorial_control label="Controls" href="controls/tutorial_controls.html"/>
-            <tutorial_wsm label="Web Services" href="wsm/tutorial_wsm.html"/>
-            <!--<tut_dbwebapp label="DB-Driven Web App" href="tutorial/tut_dbdrivenwebapp.html" />-->
+            <tutorial_pageflow label="Page Flows" href="release/pageflow/tutorial_pageflow.html"/>
+            <tutorial_control label="Controls" href="release/controls/tutorial_controls.html"/>
+            <tutorial_wsm label="Web Services" href="release/wsm/tutorial_wsm.html"/>
+            <!--<tut_dbwebapp label="DB-Driven Web App" href="release/tutorial/tut_dbdrivenwebapp.html" />-->
             <tutorial_system-controls label="System Controls">
-                    <control label="EJB Control Tutorial" href="system-controls/ejb/ejbControlTutorial.html"/>
-                    <control label="JDBC Control Tutorial" href="system-controls/jdbc/jdbcControlTutorial.html"/>
-                    <control label="JMS Control Tutorial" href="system-controls/jms/jmsControlTutorial.html"/>
-                    <control label="Webservices Control Tutorial" href="system-controls/webservices/webservicesControlTutorial.html"/>
+                    <control label="EJB Control Tutorial" href="release/system-controls/ejb/ejbControlTutorial.html"/>
+                    <control label="JDBC Control Tutorial" href="release/system-controls/jdbc/jdbcControlTutorial.html"/>
+                    <control label="JMS Control Tutorial" href="release/system-controls/jms/jmsControlTutorial.html"/>
+                    <control label="Webservices Control Tutorial" href="release/system-controls/webservices/webservicesControlTutorial.html"/>
             </tutorial_system-controls>
-
         </tutorials>
         <pageflow label="Page Flows">        
-            <pageflow_getting_started label="Getting Started" href="pageflow/getting_started.html"/>
-            <pageflow_overview label="Overview" href="pageflow/pageflow_overview.html"/>
-            <pageflow_controllers label="Controller Files" href="pageflow/pageflow_controllers.html"/>
-            <pageflow_jsp label="JSP Files" href="pageflow/pageflow_jsp.html"/>
-            <pageflow_building label="Building a Web-App" href="pageflow/pageflow_building.html"/>
-            <pageflow_altering label="Altering a Page Flow" href="pageflow/pageflow_altering.html"/>
-            <pageflow_databinding label="Databinding" href="pageflow/pageflow_databinding.html"/>
-            <pageflow_datagrid label="Data Grids" href="pageflow/pageflow_datagrid.html"/>
-            <pageflow_sharedFlow label="Shared Flow" href="pageflow/sharedFlow.html"/>
-            <pageflow_popups label="Popup Windows" href="pageflow/popupWindows.html"/>
-            <pageflow_valid label="Validation" href="pageflow/validation.html"/>
-            <pageflow_jsf label="Java Server Faces" href="pageflow/jsf.html"/>
-            <pageflow_servlet_adapter label="Servlet Container Adapters" href="pageflow/servlet_container_adapters.html"/>
-            <devmode label="Development Mode" href="development/dev_mode.html"/>
-			<pageflow_faq label="FAQ" href="pageflow/faq.html"/>
-            <!--<pageflow_programming label="Page Flow Programming" href="pageflow/guide.html"/>-->
+            <pageflow_getting_started label="Getting Started" href="release/pageflow/getting_started.html"/>
+            <pageflow_overview label="Overview" href="release/pageflow/pageflow_overview.html"/>
+            <pageflow_controllers label="Controller Files" href="release/pageflow/pageflow_controllers.html"/>
+            <pageflow_jsp label="JSP Files" href="release/pageflow/pageflow_jsp.html"/>
+            <pageflow_building label="Building a Web-App" href="release/pageflow/pageflow_building.html"/>
+            <pageflow_altering label="Altering a Page Flow" href="release/pageflow/pageflow_altering.html"/>
+            <pageflow_databinding label="Databinding" href="release/pageflow/pageflow_databinding.html"/>
+            <pageflow_datagrid label="Data Grids" href="release/pageflow/pageflow_datagrid.html"/>
+            <pageflow_sharedFlow label="Shared Flow" href="release/pageflow/sharedFlow.html"/>
+            <pageflow_popups label="Popup Windows" href="release/pageflow/popupWindows.html"/>
+            <pageflow_valid label="Validation" href="release/pageflow/validation.html"/>
+            <pageflow_jsf label="Java Server Faces" href="release/pageflow/jsf.html"/>
+            <pageflow_servlet_adapter label="Servlet Container Adapters" href="release/pageflow/servlet_container_adapters.html"/>
+            <devmode label="Development Mode" href="release/development/dev_mode.html"/>
+	    <pageflow_faq label="FAQ" href="release/pageflow/faq.html"/>
+            <!--<pageflow_programming label="Page Flow Programming" href="release/pageflow/guide.html"/>-->
         </pageflow>
         <controls label="Controls">
-			<control_getting_started label="Getting Started" href="controls/getting_started.html"/>
-            <control_overview label="Controls Overview" href="controls/controlsOverview.html"/>
-            <control_prog label="Control Programming" href="controls/controlsProgramming.html"/>
-            <control_contain label="Controls Containment" href="controls/controlsContainment.html"/>
+   	    <control_getting_started label="Getting Started" href="release/controls/getting_started.html"/>
+            <control_overview label="Controls Overview" href="release/controls/controlsOverview.html"/>
+            <control_prog label="Control Programming" href="release/controls/controlsProgramming.html"/>
+            <control_contain label="Controls Containment" href="release/controls/controlsContainment.html"/>
         </controls>
         <controls label="System Controls">
-            <ejb_control label="Ejb Control" href="system-controls/ejb/ejbDoc.html"/>
-            <jdbc_control label="Jdbc Control" href="system-controls/jdbc/jdbcControlDevGuide.html"/>
-            <jms_control label="Jms Control" href="system-controls/jms/jmsDoc.html"/>
-            <webservices_control label="Web Services Control" href="system-controls/webservices/webservicesDoc.html"/>
+            <ejb_control label="Ejb Control" href="release/system-controls/ejb/ejbDoc.html"/>
+            <jdbc_control label="Jdbc Control" href="release/system-controls/jdbc/jdbcControlDevGuide.html"/>
+            <jms_control label="Jms Control" href="release/system-controls/jms/jmsDoc.html"/>
+            <webservices_control label="Web Services Control" href="release/system-controls/webservices/webservicesDoc.html"/>
         </controls>
         <wsm label="Web Services">
-			<wsm_getting_started label="Getting Started" href="wsm/getting_started.html"/>
-            <wsm_overview label="Web Services Overview" href="wsm/wsm_overview.html"/>
-            <jws_files label="Java Web Services" href="wsm/wsm_JWSFiles.html"/>
-            <supported_datatypes label="Supported Data Types" href="wsm/datatypes.html"/>
-            <jsr181 label="Web Services (JSR 181)" href="webservices.html"/>
+            <wsm_getting_started label="Getting Started" href="release/wsm/getting_started.html"/>
+            <wsm_overview label="Web Services Overview" href="release/wsm/wsm_overview.html"/>
+            <jws_files label="Java Web Services" href="release/wsm/wsm_JWSFiles.html"/>
+            <supported_datatypes label="Supported Data Types" href="release/wsm/datatypes.html"/>
+            <jsr181 label="Web Services (JSR 181)" href="release/webservices.html"/>
         </wsm>
-		<!--<howdoi label="How Do I...?">
-			<useControl label="How Do I: Invoke a Control?" href="how/howInvokeControl.html"/>
-		</howdoi>-->
+        <!--
+            <howdoi label="How Do I...?">
+                <useControl label="How Do I: Invoke a Control?" href="release/how/howInvokeControl.html"/>
+            </howdoi>
+          -->
         <samples label="Samples">
-            <sam_index label="Samples" href="samples/index.html"/>
-            <jpetstore label="Petstore" href="jpetstore.html"/>
-            <netui-samples label="Page Flow Samples" href="pageflow/netui-samples.html"/>
-            <netui-jsf label="Page Flow: JSF Integration" href="pageflow/sample_jpf_jsf_integration.html"/>
-            <address-enhanced label="Web Service: AddressBook Enhanced" href="wsm/sample_AddressBookEnhanced.html"/>
-            <address-wsdl label=" Web Service: AddressBook from WSDL" href="wsm/sample_AddressBookFromWSDL.html"/>
-            <!--<wsm-samples label="Web Service: Annotation Samples" href="wsm/sample_wsmAnnoSamples.html"/>-->
-            <netui-blank label="Project: Page Flow" href="pageflow/sample_netui-blank.html"/>
-            <control-blank label="Project: Control" href="controls/sample_controls-blank.html"/>
-            <wsm-blank label="Project: Web Service" href="wsm/sample_wsm-blank.html"/>
-			<ws-control-blank label="Project: Web Service Control" href="system-controls/webservices/sample-ws-control-blank.html" />
+            <sam_index label="Samples" href="release/samples/index.html"/>
+            <jpetstore label="Petstore" href="release/jpetstore.html"/>
+            <netui-samples label="Page Flow Samples" href="release/pageflow/netui-samples.html"/>
+            <netui-jsf label="Page Flow: JSF Integration" href="release/pageflow/sample_jpf_jsf_integration.html"/>
+            <address-enhanced label="Web Service: AddressBook Enhanced" href="release/wsm/sample_AddressBookEnhanced.html"/>
+            <address-wsdl label=" Web Service: AddressBook from WSDL" href="release/wsm/sample_AddressBookFromWSDL.html"/>
+            <!--<wsm-samples label="Web Service: Annotation Samples" href="release/wsm/sample_wsmAnnoSamples.html"/>-->
+            <netui-blank label="Project: Page Flow" href="release/pageflow/sample_netui-blank.html"/>
+            <control-blank label="Project: Control" href="release/controls/sample_controls-blank.html"/>
+            <wsm-blank label="Project: Web Service" href="release/wsm/sample_wsm-blank.html"/>
+	    <ws-control-blank label="Project: Web Service Control" href="release/system-controls/webservices/sample-ws-control-blank.html" />
         </samples>
         <ref label="Reference Docs">
             <controls label="Controls">
-                <control_anno label="Controls Annotations" href="controls/annotations/control_annotations.html"/>
-                <control_javadoc label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
+                <control_anno label="Controls Annotations" href="release/controls/annotations/control_annotations.html"/>
+                <control_javadoc label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
             </controls>
             <system-controls label="System Controls">
-                    <sys_control_javadoc label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
-                    <ejb_control_anno label="Ejb Control Annotations" href="system-controls/ejb/ejb-annotations.html"/>
-                    <db_control_anno label="Jdbc Control Annotations" href="system-controls/jdbc/jdbc-annotations.html"/>
-                    <jms_control_anno label="Jms Control Annotations" href="system-controls/jms/jms-annotations.html"/>
-                    <ws_control_anno label="Webservices Control Annotations" href="system-controls/webservices/webservices-annotations.html"/>
+                    <sys_control_javadoc label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
+                    <ejb_control_anno label="Ejb Control Annotations" href="release/system-controls/ejb/ejb-annotations.html"/>
+                    <db_control_anno label="Jdbc Control Annotations" href="release/system-controls/jdbc/jdbc-annotations.html"/>
+                    <jms_control_anno label="Jms Control Annotations" href="release/system-controls/jms/jms-annotations.html"/>
+                    <ws_control_anno label="Webservices Control Annotations" href="release/system-controls/webservices/webservices-annotations.html"/>
             </system-controls>
             <netui label="Page Flows">
-                <netui_taglib label="&lt;netui> Tags" href="apidocs/taglib/index.html"/>
-                <netui_annotations label="Page Flow Annotations" href="pageflow/jpf-annotations/pageflow_annotations.html"/>
-                <netui_config label="beehive-netui-config.xml" href="pageflow/config/beehive-netui-config.html"/>
-                <netui_api label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
+                <netui_taglib label="&lt;netui> Tags" href="release/apidocs/taglib/index.html"/>
+                <netui_annotations label="Page Flow Annotations" href="release/pageflow/jpf-annotations/pageflow_annotations.html"/>
+                <netui_config label="beehive-netui-config.xml" href="release/pageflow/config/beehive-netui-config.html"/>
+                <netui_api label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
             </netui>
             <ws label="Web Services">
-                <control label="Web Services Annotations" href="wsm/annotations/wsm_annotations.html"/>
-                <ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
+                <control label="Web Services Annotations" href="release/wsm/annotations/wsm_annotations.html"/>
+                <ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
             </ws>
         </ref>
-		<javadoc label="Javadoc">
-            <javadoc_control label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
-            <javadoc_sys_control label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
-            <javadoc_netui label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
-            <javadoc_ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
-		</javadoc>
-        <!--<dev label="Development">
-        </dev>-->
-        <gloss label="Glossary" href="glossary.html"/>
+	<javadoc label="Javadoc">
+            <javadoc_control label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
+            <javadoc_sys_control label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
+            <javadoc_netui label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
+            <javadoc_ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
+	</javadoc>
+        <release_notes label="Release Notes" href="release/release_notes.html"/>
+        <gloss label="Glossary" href="release/glossary.html"/>
+        <!--<dev label="Development"></dev>-->
     </docs>
     <links label="Links" tab="welcome">
         <wiki label="Beehive Wiki" href="http://wiki.apache.org/beehive"/>
@@ -118,8 +117,3 @@
         <pollinate label="Pollinate" href="http://www.eclipse.org/pollinate/"/>
     </links>
 </site>    
-    <!--
-    <external-refs>
-        <xml.apache.org href="http://xml.apache.org/"/>
-    </external-refs>
-    -->