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 2005/01/21 23:35:27 UTC

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

Author: steveh
Date: Fri Jan 21 14:35:26 2005
New Revision: 125976

URL: http://svn.apache.org/viewcvs?view=rev&rev=125976
Log:
Taking BEEHIVE_HOME out of the setup page and the controls tutorial.

DRT: docs
Modified:
   incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
   incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
   incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml?view=diff&rev=125976&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml&r1=125975&p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml&r2=125976
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml	(original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml	Fri Jan 21 14:35:26 2005
@@ -28,29 +28,27 @@
             <title>Step 1: Begin the Page Flow Tutorial</title>
             <section>
                 <title>To Set up the Development Environment</title>
-                <p>Follow the setup directions at <a class="fork" href="../setup.html">Beehive Installation and Setup</a></p>
-                <p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
-            </section>
-
-            <section>
-                <title>Add a Manager Role to Tomcat</title>
-                <p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <code>runTomcat.xml</code>.  This file is provided as a convenience for managing the Tomcat server.</p>
-                <p>Edit the file <code>CATALINA_HOME/conf/tomcat-users.xml</code> so it appears as follows.  Code to add appears in bold type.</p>
-                <source>&lt;?xml version='1.0' encoding='utf-8'?>
-&lt;tomcat-users>
-  &lt;role rolename="tomcat"/>
-  &lt;role rolename="role1"/>
-  <strong>&lt;role rolename="manager"/></strong>
-  &lt;user username="tomcat" password="tomcat" roles="tomcat"/>
-  &lt;user username="role1" password="tomcat" roles="role1"/>
-  &lt;user username="both" password="tomcat" roles="tomcat,role1"/>
-  <strong>&lt;user username="manager" password="manager" roles="manager"/></strong>
-&lt;/tomcat-users></source>
+                <p>Complete all of the necessary and optional steps in the following topic: 
+					<a class="fork" href="../setup.html">Beehive Installation and Setup</a></p>
+				
+                <p>After completing the instructions, leave the command shell open to use 
+					throughout this tutorial.</p>
+				<p>Before proceding, confirm that you have the following variables set in your shell:</p>
+					<ul>
+						<li><code>ANT_HOME</code></li>
+						<li><code>JAVA_HOME</code></li>
+						<li><code>TOMCAT_HOME</code></li>
+					</ul>
+					<p>Also ensure that the following elements are on your <code>PATH</code>:</p>
+					<ul>
+						<li><code>ANT_HOME/bin</code></li>
+						<li><code>JAVA_HOME/bin</code></li>
+					</ul>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>
                 <p>At the command prompt, enter:</p>
-                <source>%CATALINA_HOME%\bin\startup.bat</source>
+                <source>%TOMCAT_HOME%\bin\startup.bat</source>
             </section>            
         </section>
         <section id="step_2">
@@ -69,9 +67,12 @@
 					makes it much easier to test your control as you go.  The web application will form
 					the testing ground for your control.</p>	
                 <p>On your C: drive, create a directory called <code>beehive_projects</code>.</p>
-                <p>Copy the folder <code>BEEHIVE_HOME/samples/netui-blank</code> into <code>C:/beehive_projects</code>.</p>
-				<p>Rename the folder C:/beehive_projects/<strong>netui-blank</strong> to the name 
-					C:/beehive_projects/<strong>control_tutorial</strong></p>
+                <p>Copy the folder <code>&lt;BeehiveRoot>/samples/netui-blank</code> into 
+					<code>C:/beehive_projects</code>. (<code>&lt;BeehiveRoot></code> refers to the 
+					top level folder of your Beehive installation.)</p>
+				<p>Rename the folder 
+					<code>C:/beehive_projects/</code><strong><code>netui-blank</code></strong> to the name 
+					<code>C:/beehive_projects/</code><strong><code>control_tutorial</code></strong></p>
 				<p>Before proceeding, confirm that the following directory structure exists:</p>
             <source>C:
   beehive_projects
@@ -83,12 +84,12 @@
 	<p>In this step you will assemble the runtime resources for your Control. 
 		Most of these files are included in the WEB-INF directory. 
 		It includes JAR files with the JSP tag handler classes, the Controls runtime JAR, etc.</p>
-	<p>Using the command shell opened in the previous step, at the command prompt, enter:	</p>
-	<source>  ant 
-    -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
-    deploy.beehive.webapp.runtime 
-	</source>
+	<p>At the command prompt, enter the following ant command.  In place of <code>&lt;BeehiveRoot>
+		substitute the path to the top-level directory of your Beehive installation</code>.</p>
+	<source>ant 
+  -f &lt;BeehiveRoot>\ant\webappRuntimeCore.xml
+  -Dwebapp.dir=C:\beehive_projects\control_tutorial 
+  deploy.beehive.webapp.runtime</source>
 </section>          
             <section>
                 <title>To Create the Control's Implementation File</title>
@@ -117,7 +118,7 @@
         return "Hello, World!";
     }
 }]]></source>
-            <p>Save and close <code>HelloImpl.jcs</code>.</p>
+            <p>Save <code>HelloImpl.jcs</code>.</p>
             </section>
             <section>
                 <title>To Create the Control's Interface File</title>
@@ -134,15 +135,17 @@
 { 
     public String hello();
 }]]></source>
+            <p>Save <code>Hello.java</code>.</p>
             </section>           
             <section>
-                <title>To Create a JSP Page to Test the Control</title>
-                <p>To test your Beehive Control, you need to call the control from some other resource, such as a JAVA application, JSP page, or Page Flow web application.  In this step you will call the 
+                <title>To Edit the <code>index.jsp</code> Page</title>
+                <p>To test your Beehive Control, you need to call the control from some other 
+					resource, such as a JAVA application, JSP page, or Page Flow web application.
+					  In this step you will call the 
 				control from a JSP page.
 				</p>
-                <p>In the directory <code>C:/beehive_projects/control_tutorial</code>, create a file named <code>hello.jsp</code>.
-				</p>
-                <p>Edit hello.jsp so it appears as follows.  Code to edit appears in bold.</p>
+                <p>Edit the file <code>C:/beehive_projects/control_tutorial/index.jsp</code> 
+					so it appears as follows.  Code to edit appears in bold.</p>
 <source>
 &lt;%@ page language="java" contentType="text/html;charset=UTF-8"%>
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
@@ -162,25 +165,27 @@
   &lt;/netui:body>
 &lt;/netui:html>
 </source>
+            <p>Save <code>index.jsp</code>.</p>
             </section>
             <section>
                 <title>To Compile and Deploy the Control</title>
                 <p>You are now ready to compile the control.</p>
-                <p>At the command prompt, enter:</p>
-                <source>  ant 
-    -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-    -Dwebapp.dir=C:\beehive_projects\control_tutorial
-    -Dcontext.path=control_tutorial 
-    build.webapp
-    deploy</source>  
-    <p>If the application is already deployed on Tomcat (which may happen if this is your second time executing the tutorial), use the command below:</p>
-                <source>  ant 
-    -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
-    -Dcontext.path=control_tutorial 
-    undeploy
-    build.webapp 
-    deploy</source>
+                <p>At the command prompt, enter the following Ant command.  In place of <code>&lt;BeehiveRoot>
+		substitute the path to the top-level directory of your Beehive installation</code>.</p>
+                <source>ant 
+  -f &lt;BeehiveRoot>\ant\buildWebapp.xml 
+  -Dwebapp.dir=C:\beehive_projects\control_tutorial 
+  build</source>
+	<p>To deploy the web application (with the control imbedded in it), click the following link.</p>  
+    <source>
+	  <a 
+		class="fork" 
+		href="http://localhost:8080/manager/deploy?path=/control_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/control_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
+	</source>
+	<p>If you are prompted for a username/password, enter: manager/manager</p>
+	<p>(For an explanation of this method of deploying an application to Tomcat, 
+		see the Tomcat 5 documentation: 
+		<a class="fork" href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path">Deploy A New Application from a Local Path</a>)</p>
             </section>
             <section>
                 <title>To Test the Control</title>
@@ -252,15 +257,14 @@
 </section>
 <section>
     <title>To Compile and Redeploy the Control</title>
-<p>Compile and redeploy the control with the following Ant command:</p>
-
-                <source>  ant 
-    -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
-    -Dcontext.path=control_tutorial 
-    undeploy
-    build.webapp 
-    deploy</source>
+<p>Compile the control with the following Ant command:</p>
+ <source>ant -f &lt;BeehiveRoot>\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\control_tutorial build</source>
+ <p>To redeploy the application, click the following link:</p>
+ 	<source>
+	  <a 
+		class="fork" 
+		href="http://localhost:8080/manager/deploy?path=/control_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/control_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
+	</source>
 </section>
 
             <section>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?view=diff&rev=125976&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml&r1=125975&p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml&r2=125976
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	(original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	Fri Jan 21 14:35:26 2005
@@ -108,7 +108,7 @@
                 <p>In this step you will assemble the runtime resources for your Page Flow application.  The runtime JARs include the Page Flow runtime, the &lt;netui> tag library, etc. These resources are loaded into your project's <code>WEB-INF/lib</code> folder using the Ant command below.</p>
                 <p>At the command prompt, enter the following Ant command:</p>
                 <source>  ant 
-    -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
+    -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
     -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
     deploy.beehive.webapp.runtime</source>
                 <p>Before proceeding, confirm that the following directory structure exists:</p>
@@ -171,7 +171,7 @@
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml  
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
   -Dcontext.path=pageflow_tutorial
-  build.webapp
+  build
   deploy</source>
 <p>Note: if you get an error stating that the <code>/pageflow_tutorial</code>
 	 context path already exists, then use the following Ant command to 
@@ -181,8 +181,8 @@
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml  
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
   -Dcontext.path=pageflow_tutorial
+  build
   undeploy
-  build.webapp
   deploy</source>
             </section>
             <section>
@@ -275,8 +275,8 @@
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml  
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
   -Dcontext.path=pageflow_tutorial
+  build
   undeploy
-  build.webapp
   deploy</source>
             </section>
             <section>
@@ -407,8 +407,8 @@
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml  
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
   -Dcontext.path=pageflow_tutorial
+  build
   undeploy
-  build.webapp
   deploy</source>
             </section>
            <section>
@@ -464,8 +464,8 @@
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml  
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
   -Dcontext.path=pageflow_tutorial
+  build
   undeploy
-  build.webapp
   deploy</source>
             </section>
             <section>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml?view=diff&rev=125976&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml&r1=125975&p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml&r2=125976
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml	(original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml	Fri Jan 21 14:35:26 2005
@@ -1,59 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+	"http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
-    <header>
-        <title>Beehive Installation and Setup</title>
-    </header>
-    <body>
-        <p>This topic explains how to install a Beehive binary distribution on your machine.  Once you have completed these installation instructions, you can begin developing Beehive applications.</p>
-        <section>
-            <title>To Download and Install a Beehive Binary Distribution</title>
-            <p>Visit (<a class="fork" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a>) and download the latest binary distribution of Beehive. Note that the current release of Beehive is an alpha: it is <em>not</em> for building production-level applcations.</p>
-            <p>Unzip the Beehive distribution file on your machine.</p>
-        </section>
-        <section>
-            <title>To Download and Install J2SE5</title>
-            <p>If you do not have J2SE5 installed, visit <a class="fork" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a>. 
-                </p>
-            <p>Download and install the latest version of J2SE5.</p>
-        </section>
-        <section>
-            <title>To Install ANT 1.6.2</title>
-            <p>If you do not have Ant 1.6.2 installed, visit <a class="fork" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/ant/apache-ant-1.6.2-bin.zip</a>.  
-                </p>
-            <p>Download the ZIP file and unzip it on your machine.</p>
-        </section>
-        <section>
-            <title>To Download and Install Tomcat 5</title>
-            <p>If you do not have Tomcat 5 installed, visit <a class="fork" href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip">http://svn.apache.org/repos/asf/incubator/beehive/trunk/external/tomcat/jakarta-tomcat-5.0.25.zip</a>
-            </p>
-            <p>Download the ZIP file and unzip it on your machine.</p>
-        </section>
-        <section>
-            <title>To Set up the Development Environment</title>
-            <p>Open the top level directory of the Beehive distribution (for example, <code>C:/apache-beehive-incubating-1.0-alpha-snapshot</code>).  Open the file <code>beehiveUser.cmd</code> in a text editor and edit it to fit your local environment.  The following environmental variables must be set to the appropriate paths on your machine:  <code>BEEHIVE_HOME</code>, <code>JAVA_HOME</code>, <code>ANT_HOME</code>, and <code>CATALINA_HOME</code>.  The following example shows how to edit <code>beehiveUser.cmd</code> for a typical environment.</p>
-            <source>REM the root of Beehive distribution
-set BEEHIVE_HOME=C:\apache-beehive-incubating-1.0-alpha-snapshot
-
-REM location of a JDK
-set JAVA_HOME=C:\jdk1.5.0
-
-REM location of Ant
-set ANT_HOME=C:\apache-ant-1.6.2
-
-REM location of Tomcat
-set CATALINA_HOME=C:\jakarta-tomcat-5.0.25</source>
-            <p>When you finished editing <code>beehiveUser.cmd</code>, save and close the file.</p>
-            <p>Open a command shell.</p>
-            <p>cd to the directory where <code>beehiveUser.cmd</code> resides (= the top level directory of the Beehive distribution).</p>
-            <p>At the command prompt, enter: <code>beehiveUser.cmd</code>
-            </p>
-        </section>
-        <section>
-            <title>Add a Manager Role to Tomcat (Optional)</title>
-            <p>Adding the manager role to Tomcat server allows you to run deployment-related targets in the Ant file <code>BEEEHIVE_HOME/ant/runTomcat.xml</code>.  This file is provided as a convenience for managing the Tomcat server.</p>
-            <p>Edit the file <code>CATALINA_HOME/conf/tomcat-users.xml</code> so it appears as follows.  Elements to add are shown in bold type.</p>
-            <source>&lt;?xml version='1.0' encoding='utf-8'?>
+	<header>
+		<title>Beehive Installation and Setup</title>
+	</header>
+	<body>
+		<p>This topic explains how to install a Beehive distribution on your 
+			machine. The instructions below are divided into (1) basic stetup steps 
+			and tutorial-specific steps.</p>
+			<p>
+			 Once you have completed the basic setup steps, 
+			you can begin developing Beehive applications. You only need to 
+			complete the tutorial-specific steps if you intend to run the Beehive 
+			tutorials and samples.</p>
+		<section id="basic">
+			<title>Basic Installation</title>
+			<p>(1) The following software is required for developing Beehive applications:</p>
+			<ul>
+				<li>Beehive Binary Distribution (download: <a class="fork" href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a>)</li>
+				<li>J2SE5 (download: <a class="fork" href="http://java.sun.com/j2se/1.5.0/download.jsp">http://java.sun.com/j2se/1.5.0/download.jsp</a>)</li>
+				<li>Ant 1.6.2 (download: <a	class="fork" href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>)</li>
+			</ul>
+            <p>(2) Make sure that the following environmental variables are set in your shell.</p>
+			    <ul>
+					<li><code>JAVA_HOME</code></li>
+					<li><code>ANT_HOME</code></li>
+			    </ul>
+			<p>&nbsp;&nbsp;&nbsp;&nbsp;(Note: there is no <code>BEEHIVE_HOME</code> environmental variable to set.)</p>
+			<p>(3) Finally, ensure that <code>JAVA_HOME/bin</code> and <code>ANT_HOME/bin</code> are on your <code>PATH</code>.</p>
+			<p>That's it! That's all you need to begin developing Beehive 
+					applications. The remaining steps are only necessary if you 
+					intend to run the Beehive tutorials and samples.</p>				
+		</section>
+		<section id="optional">
+			<title>Optional Installation Steps</title>
+            <p>The following steps are only necessary if you intend to run the Beehive tutorials 
+				(<a href="controls/tutorial_controls.html">Control Tutorial</a>, 
+					<a href="pageflow/tutorial_pageflow.html">Page Flow Tutorial</a>,
+					and <a href="wsm/tutorial_wsm.html">Web Service Tutorial</a>).</p>
+			<p>(1) Install the latest Tomcat 5.0.xx distribution file.  
+				Download: <a class="fork" 
+					href="http://jakarta.apache.org/site/binindex.cgi#tomcat">http://jakarta.apache.org/site/binindex.cgi#tomcat</a>
+				</p>
+				<p>(2) Ensure that the <code>TOMCAT_HOME</code> environmental variable is set in your shell.</p>
+				<p>(3) Edit the file 
+					<code>TOMCAT_HOME/conf/tomcat-users.xml</code> so it 
+					appears as follows. Elements to add are shown in bold 
+					type.</p>
+				<source>&lt;?xml version='1.0' encoding='utf-8'?>
 &lt;tomcat-users>
   &lt;role rolename="tomcat"/>
   &lt;role rolename="role1"/>
@@ -63,57 +58,84 @@
   &lt;user username="both" password="tomcat" roles="tomcat,role1"/>
   <strong>&lt;user username="manager" password="manager" roles="manager"/></strong>
 &lt;/tomcat-users></source>
-        </section>
-        <section>
-            <title>Start Tomcat (Optional)</title>
-                <p>Before running the samples and tutorials ensure that Tomcat is turned on.  Run the following Ant command to startup Tomcat:</p>
-                 <source>%CATALINA_HOME%\bin\startup.bat</source>  
-                 <p>Or use the Ant command provided in the distribution: </p>
-                 <source>ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml start</source> 
-                 <p>If you use the provided Ant command, you will have to press <code>Ctrl+C</code> to continue issuing commands in that command shell.</p>
-        </section>
-        <section>
-            <title>What Now?</title>
-        <p>You are now ready to begin developing Beehive applications.  The following tutorials introduce the basic development cycle:</p>
-        <ul>
-            <li><a href="controls/tutorial_controls.html">Beehive Controls Tutorial</a></li>
-            <li><a href="pageflow/tutorial_pageflow.html">Beehive Page Flow Tutorial</a></li>
-            <li><a href="wsm/tutorial_wsm.html">Beehive Web Service Tutorial</a></li>
-        </ul>
-        <p>You can also begin running the following samples:</p>
-        <ul>
-            <li><a href="jpetstore.html">Beehive Sample: Petstore</a></li>
-            <li><a href="wsm/sample_Dashboard.html">Beehive Web Service Sample: Petstore Dashboard</a></li>
-            <li><a href="wsm/sample_AddressBook.html">Beehive AddressBookWS and EmployeeWS Samples</a></li>
-            <li><a href="controls/sample_controls-db.html">Database Control Sample</a></li>
-        </ul>
-        <p>The following application templates will help you get a project started:</p>
-        <ul>
-            <li><a href="pageflow/sample_netui-blank.html">Page Flow Project Template</a></li>
-            <li><a href="controls/sample_controls-blank.html">Control Project Template</a></li>
-            <li><a href="wsm/sample_wsm-blank.html">Web Service Project Template</a></li>
-        </ul>
-        </section>
-        
-        <section>
-            <title>Troubleshooting</title>
-            <p><strong>I Can't Decompress the <code>.tar.gz</code> File</strong></p>
-            <p>Note: The <code>.tar.gz</code> distribution files are created using Ant's <code>&lt;tar></code> task 
-            (<a class="fork" href="http://ant.apache.org/manual/CoreTasks/tar.html">http://ant.apache.org/manual/CoreTasks/tar.html</a>).  
-            This generates 
-            <code>.tar</code> files that can only be decompressed using a compatible <code>tar</code> utility.</p>  
-            <p>Known compatible utilities include:
-            </p>
-            <ul>
-                <li>GNU tar 1.14 (<a class="fork" href="http://www.gnu.org/software/tar/manual/html_mono/tar.html">http://www.gnu.org/software/tar/manual/html_mono/tar.html</a>)</li>
-                <li>WinZip 8.0</li>
-                <li>Ant's <code>&lt;untar></code> task (<a class="fork" href="http://ant.apache.org/manual/CoreTasks/unzip.html">http://ant.apache.org/manual/CoreTasks/unzip.html</a>)</li>
-            </ul>
-        </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>
+		</section>
+		<section>
+			<title>What Now?</title>
+			<p>You are now ready to begin developing Beehive applications. The 
+				following tutorials introduce the basic development cycle:</p>
+			<ul>
+				<li>
+					<a href="controls/tutorial_controls.html">Beehive Controls 
+						Tutorial</a>
+				</li>
+				<li>
+					<a href="pageflow/tutorial_pageflow.html">Beehive Page Flow 
+						Tutorial</a>
+				</li>
+				<li>
+					<a href="wsm/tutorial_wsm.html">Beehive Web Service 
+						Tutorial</a>
+				</li>
+			</ul>
+			<p>You can also begin running the following samples:</p>
+			<ul>
+				<li>
+					<a href="jpetstore.html">Beehive Sample: Petstore</a>
+				</li>
+				<li>
+					<a href="wsm/sample_Dashboard.html">Beehive Web Service 
+						Sample: Petstore Dashboard</a>
+				</li>
+				<li>
+					<a href="wsm/sample_AddressBook.html">Beehive AddressBookWS 
+						and EmployeeWS Samples</a>
+				</li>
+				<li>
+					<a href="controls/sample_controls-db.html">Database Control 
+						Sample</a>
+				</li>
+			</ul>
+			<p>The following application templates will help you get a project 
+				started:</p>
+			<ul>
+				<li>
+					<a href="pageflow/sample_netui-blank.html">Page Flow 
+						Project Template</a>
+				</li>
+				<li>
+					<a href="controls/sample_controls-blank.html">Control 
+						Project Template</a>
+				</li>
+				<li>
+					<a href="wsm/sample_wsm-blank.html">Web Service Project 
+						Template</a>
+				</li>
+			</ul>
+		</section>
+		<section>
+			<title>Troubleshooting</title>
+			<p>
+				<strong>I Can't Decompress the <code>.tar.gz</code> 
+					File</strong>
+			</p>
+			<p>Note: The <code>.tar.gz</code> distribution files are created 
+				using Ant's <code>&lt;tar></code> task (<a class="fork" 
+				href="http://ant.apache.org/manual/CoreTasks/tar.html">http://ant.apache.org/manual/CoreTasks/tar.html</a>). 
+				This generates <code>.tar</code> files that can only be 
+				decompressed using a compatible <code>tar</code> utility.</p>
+			<p>Known compatible utilities include: </p>
+			<ul>
+				<li>GNU tar 1.14 (<a class="fork" 
+					href="http://www.gnu.org/software/tar/manual/html_mono/tar.html">http://www.gnu.org/software/tar/manual/html_mono/tar.html</a>)</li>
+				<li>WinZip 8.0</li>
+				<li>Ant's <code>&lt;untar></code> task (<a class="fork" 
+					href="http://ant.apache.org/manual/CoreTasks/unzip.html">http://ant.apache.org/manual/CoreTasks/unzip.html</a>)</li>
+			</ul>
+		</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>
\ No newline at end of file