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/17 20:16:32 UTC

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

Author: steveh
Date: Wed Nov 17 11:16:31 2004
New Revision: 76163

Modified:
   incubator/beehive/site/build/site/controls/tutorial_controls.html
   incubator/beehive/site/build/site/pageflow/tutorial_pageflow.html
   incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml
   incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
Log:
Fix for control tutorial bug (location of index.jsp page was incorrect).

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	Wed Nov 17 11:16:31 2004
@@ -312,6 +312,12 @@
 <li>
 <a href="#To+Set+up+the+Development+Environment">To Set up the Development Environment</a>
 </li>
+<li>
+<a href="#Add+a+Manager+Role+to+Tomcat">Add a Manager Role to Tomcat</a>
+</li>
+<li>
+<a href="#To+Start+the+Tomcat+Server">To Start the Tomcat Server</a>
+</li>
 </ul>
 </li>
 <li>
@@ -321,7 +327,7 @@
 <a href="#Introduction">Introduction</a>
 </li>
 <li>
-<a href="#To+Create+a+Control+Application+Folder">To Create a Control Application Folder</a>
+<a href="#Make+a+Project+Folder">Make a Project Folder</a>
 </li>
 <li>
 <a href="#To+Add+Beehive+Runtime+JARs+to+Your+Application.">To Add Beehive Runtime JARs to Your Application.</a>
@@ -336,17 +342,11 @@
 <a href="#To+Create+a+JSP+Page+to+Test+the+Control">To Create a JSP Page to Test the Control</a>
 </li>
 <li>
-<a href="#To+Compile+the+Control">To Compile the Control</a>
-</li>
-<li>
-<a href="#To+Start+the+Tomcat+Server">To Start the Tomcat Server</a>
+<a href="#To+Compile+and+Deploy+the+Control">To Compile and Deploy the Control</a>
 </li>
 <li>
 <a href="#To+Test+the+Control">To Test the Control</a>
 </li>
-<li>
-<a href="#To+Shutdown+the+Tomcat+Server">To Shutdown the Tomcat Server</a>
-</li>
 </ul>
 </li>
 <li>
@@ -394,35 +394,73 @@
 </p>
 <p>After completing the instructions, leave the command shell open to use throughout this tutorial.</p>
 </div>
+<a name="N10052"></a><a name="Add+a+Manager+Role+to+Tomcat"></a>
+<h4>Add a Manager Role to Tomcat</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <span class="codefrag">runTomcat.xml</span>.  This file is provided as a convenience for managing the Tomcat server.</p>
+<p>Edit the file <span class="codefrag">CATALINA_HOME/conf/tomcat-users.xml</span> so it appears as follows.  Code to add appears in bold type.</p>
+<pre class="code">&lt;?xml version='1.0' encoding='utf-8'?&gt;
+&lt;tomcat-users&gt;
+  &lt;role rolename="tomcat"/&gt;
+  &lt;role rolename="role1"/&gt;
+  <strong>&lt;role rolename="manager"/&gt;</strong>
+  &lt;user username="tomcat" password="tomcat" roles="tomcat"/&gt;
+  &lt;user username="role1" password="tomcat" roles="role1"/&gt;
+  &lt;user username="both" password="tomcat" roles="tomcat,role1"/&gt;
+  <strong>&lt;user username="manager" password="manager" roles="manager"/&gt;</strong>
+&lt;/tomcat-users&gt;</pre>
+</div>
+<a name="N10070"></a><a name="To+Start+the+Tomcat+Server"></a>
+<h4>To Start the Tomcat Server</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>At the command prompt, enter:</p>
+<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
+</div>
 </div>
         
-<a name="N10053"></a><a name="step_2"></a>
+<a name="N10080"></a><a name="step_2"></a>
 <h3>Step 2: Create Control Implementation and Interface Files</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10059"></a><a name="Introduction"></a>
+<a name="N10086"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>A Beehive Control consists of two files: an interface file (with the JAVA file extension) and an implementation file (with the JCS file extension).  The interface file is the public face of your control.  It lists all of the methods which can be invoked by users.  The implementation file contains the implementation code for the methods listed in the interface file.</p>
 </div>
-<a name="N10063"></a><a name="To+Create+a+Control+Application+Folder"></a>
-<h4>To Create a Control Application Folder</h4>
+<a name="N10090"></a><a name="Make+a+Project+Folder"></a>
+<h4>Make a Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/</span>, create a directory called <span class="codefrag">control_tutorial</span>.</p>
+<p>On your C: drive, create a directory called <span class="codefrag">beehive_projects</span>.</p>
+<p>In the <span class="codefrag">beehive_projects</span> directory, create a directory called control_tutorial.</p>
+<p>Before proceeding, confirm that the following directory structure exists:</p>
+<pre class="code">C:
+  beehive_projects
+    control_tutorial</pre>
 </div>
-<a name="N10073"></a><a name="To+Add+Beehive+Runtime+JARs+to+Your+Application."></a>
+<a name="N100AB"></a><a name="To+Add+Beehive+Runtime+JARs+to+Your+Application."></a>
 <h4>To Add Beehive Runtime JARs to Your Application.</h4>
 <div style="margin-left: 0 ; border: 2px">
 <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. <!--[tbd: for a complete list see...]--></p>
 <p>Using the command shell opened in the previous step, at the command prompt, enter: </p>
-<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml deploy.beehive.webapp.runtime -Dwebapp.dir=%CATALINA_HOME%\webapps\control_tutorial</pre>
+<pre class="code">  ant 
+    -f %BEEHIVE_HOME%\ant\buildWebapp.xml
+    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
+    deploy.beehive.webapp.runtime </pre>
 </div>
-<a name="N10086"></a><a name="To+Create+the+Control%27s+Implementation+File"></a>
+<a name="N100BE"></a><a name="To+Create+the+Control%27s+Implementation+File"></a>
 <h4>To Create the Control's Implementation File</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>In this step you will create the implementation file for your Beehive Control.  This is a JAVA file, that contains the bulk of your Control's working code.</p>
-<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/control_tutorial/WEB-INF</span>, create a directory called <span class="codefrag">src</span>.</p>
-<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/control_tutorial/WEB-INF/src</span>, create a directory called <span class="codefrag">hellocontrol</span>.</p>
-<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</span>, create a file called <span class="codefrag">HelloImpl.jcs</span>.</p>
+<p>In this step you will create the implementation file for your Beehive Control.  This is a Java class (although it has the JCS file extension) that contains the bulk of your Control's working code.</p>
+<p>In the directory <span class="codefrag">C:/beehive_projects/control_tutorial/WEB-INF</span>, create a directory called <span class="codefrag">src</span>.</p>
+<p>In the directory <span class="codefrag">C:/beehive_projects/webapps/control_tutorial/WEB-INF/src</span>, create a directory called <span class="codefrag">hellocontrol</span>.</p>
+<p>In the directory <span class="codefrag">C:/beehive_projects/webapps/control_tutorial/WEB-INF/src/hellocontrol</span>, create a file called <span class="codefrag">HelloImpl.jcs</span>.</p>
+<p>Before proceeding, confirm that the following directory structure exists:</p>
+<pre class="code">C:
+  beehive_projects
+    control_tutorial
+      WEB-INF
+        src
+          hellocontrol
+             HelloImpl.jcs</pre>
 <p>In a text editor (or your IDE of choice), open the file HelloImpl.jcs.</p>
 <p>Edit HelloImpl.jcs so it appears as follows.</p>
 <pre class="code">package hellocontrol; 
@@ -439,12 +477,12 @@
 }</pre>
 <p>Save and close <span class="codefrag">HelloImpl.jcs</span>.</p>
 </div>
-<a name="N100BC"></a><a name="To+Create+the+Control%27s+Interface+File"></a>
+<a name="N100FC"></a><a name="To+Create+the+Control%27s+Interface+File"></a>
 <h4>To Create the Control's Interface File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>The interface file is a JAVA file, that defines the public face of your control. <!--[tbd]-->
                 </p>
-<p>In the directory <span class="codefrag">CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</span>, create a file named <span class="codefrag">Hello.java</span>.</p>
+<p>In the directory <span class="codefrag">C:/beehive_projects/control_tutorial/WEB-INF/src/hellocontrol</span>, create a file named <span class="codefrag">Hello.java</span>.</p>
 <p>Edit Hello.java so it looks like the following.</p>
 <pre class="code">package hellocontrol; 
 
@@ -456,63 +494,63 @@
     public String hello();
 }</pre>
 </div>
-<a name="N100D9"></a><a name="To+Create+a+JSP+Page+to+Test+the+Control"></a>
+<a name="N10119"></a><a name="To+Create+a+JSP+Page+to+Test+the+Control"></a>
 <h4>To Create a JSP Page to Test the Control</h4>
 <div style="margin-left: 0 ; border: 2px">
 <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 <span class="codefrag">CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</span>, edit the file named <span class="codefrag">hello.jsp</span>.
+<p>In the directory <span class="codefrag">C:/beehive_projects/control_tutorial</span>, create a file named <span class="codefrag">hello.jsp</span>.
 				</p>
 <p>Edit hello.jsp so it appears as follows.</p>
 <pre class="code">&lt;%@ page language="java" contentType="text/html;charset=UTF-8"%&gt;
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%&gt;
 &lt;netui:html&gt;
   &lt;head&gt;
-    &lt;title&gt;Web Application Page&lt;/title&gt;
-    &lt;netui:base/&gt;
+    &lt;title&gt;Control Tutorial Test Page&lt;/title&gt;
   &lt;/head&gt;
   &lt;netui:body&gt;
+    &lt;h3&gt;Control Tutorial Test Page&lt;/h3&gt;
     &lt;p&gt;
-      &lt;jsp:useBean class="hellocontrol.HelloBean" id="helloBean" scope="session"/&gt;
-	&lt;%= helloBean.hello() %&gt;
+        &lt;jsp:useBean class="hellocontrol.HelloBean" id="helloBean" scope="session"/&gt;
+        Response from the hello() method on the Hello Control: &lt;strong&gt; &lt;%= helloBean.hello() %&gt; &lt;/strong&gt;
     &lt;/p&gt;
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N100F4"></a><a name="To+Compile+the+Control"></a>
-<h4>To Compile the Control</h4>
+<a name="N10134"></a><a name="To+Compile+and+Deploy+the+Control"></a>
+<h4>To Compile and Deploy the Control</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile the control.</p>
 <p>At the command prompt, enter:</p>
-<pre class="code">ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\control_tutorial</pre>
-</div>
-<a name="N10106"></a><a name="To+Start+the+Tomcat+Server"></a>
-<h4>To Start the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter:</p>
-<pre class="code">%CATALINA_HOME%\bin\startup.bat</pre>
+<pre class="code">  ant 
+    -f %BEEHIVE_HOME%\ant\buildWebapp.xml
+    -Dwebapp.dir=C:\beehive_projects\control_tutorial
+    -Dcontext.path=control_tutorial 
+    build.webapp
+    deploy</pre>
+<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>
+<pre class="code">  ant 
+    -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
+    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
+    -Dcontext.path=control_tutorial 
+    undeploy
+    build.webapp 
+    deploy</pre>
 </div>
-<a name="N10115"></a><a name="To+Test+the+Control"></a>
+<a name="N1014E"></a><a name="To+Test+the+Control"></a>
 <h4>To Test the Control</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>Open a web browser and enter the following in the address bar: <span class="codefrag">http://localhost:8080/control_tutorial/hello.jsp</span>
+<p>Open a web browser and enter the following in the address bar: <a target="_blank" href="http://localhost:8080/control_tutorial/hello.jsp">http://localhost:8080/control_tutorial/hello.jsp</a>
                 
 </p>
 <p>You will be directed to the index.jsp page.</p>
 <p>Note the message on the page: "Hello, World!"</p>
 <p>This message is provided by the Hello control.</p>
 </div>
-<a name="N1012B"></a><a name="To+Shutdown+the+Tomcat+Server"></a>
-<h4>To Shutdown the Tomcat Server</h4>
-<div style="margin-left: 0 ; border: 2px">
-<p>At the command prompt, enter:
-                </p>
-<pre class="code">%CATALINA_HOME%\bin\shutdown.bat</pre>
-</div>
 </div>
             
-<a name="N1013B"></a><a name="Step+3%3A+Add+a+Parameterized+Method+to+the+Control"></a>
+<a name="N10166"></a><a name="Step+3%3A+Add+a+Parameterized+Method+to+the+Control"></a>
 <h3>Step 3: Add a Parameterized Method to the Control</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>[TODO: This step is coming soon.]</p>

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	Wed Nov 17 11:16:31 2004
@@ -365,7 +365,7 @@
 <a href="#To+Compile+and+Redeploy+the+Page+Flow">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N101E9">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N101EF">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -382,10 +382,10 @@
 <a href="#To+Edit+the+Controller+File+to+Handle+the+Submitted+Data">To Edit the Controller File to Handle the Submitted Data</a>
 </li>
 <li>
-<a href="#To+Compile+and+Redeploy+the+Page+Flow-N10273">To Compile and Redeploy the Page Flow</a>
+<a href="#To+Compile+and+Redeploy+the+Page+Flow-N10279">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N10281">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N10287">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -399,10 +399,10 @@
 <a href="#To+Process+the+Submitted+Data">To Process the Submitted Data</a>
 </li>
 <li>
-<a href="#To+Compile+and+Redeploy+the+Page+Flow-N102CE">To Compile and Redeploy the Page Flow</a>
+<a href="#To+Compile+and+Redeploy+the+Page+Flow-N102D4">To Compile and Redeploy the Page Flow</a>
 </li>
 <li>
-<a href="#To+Test+the+Page+Flow+Web+Application-N102DC">To Test the Page Flow Web Application</a>
+<a href="#To+Test+the+Page+Flow+Web+Application-N102E2">To Test the Page Flow Web Application</a>
 </li>
 </ul>
 </li>
@@ -450,19 +450,19 @@
 <h4>Add a Manager Role to Tomcat</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Adding the manager role to Tomcat server allows you to run deploy related targets in the Ant file <span class="codefrag">runTomcat.xml</span>.  This file is provided as a convenience for managing the Tomcat server.</p>
-<p>Edit the file <span class="codefrag">CATALINA_HOME/conf/tomcat-users.xml</span> so it appears as follows:</p>
+<p>Edit the file <span class="codefrag">CATALINA_HOME/conf/tomcat-users.xml</span> so it appears as follows.  Code to add appears in bold type.</p>
 <pre class="code">&lt;?xml version='1.0' encoding='utf-8'?&gt;
 &lt;tomcat-users&gt;
   &lt;role rolename="tomcat"/&gt;
   &lt;role rolename="role1"/&gt;
-  &lt;role rolename="manager"/&gt;
+  <strong>&lt;role rolename="manager"/&gt;</strong>
   &lt;user username="tomcat" password="tomcat" roles="tomcat"/&gt;
   &lt;user username="role1" password="tomcat" roles="role1"/&gt;
   &lt;user username="both" password="tomcat" roles="tomcat,role1"/&gt;
-  &lt;user username="manager" password="manager" roles="manager"/&gt;
+  <strong>&lt;user username="manager" password="manager" roles="manager"/&gt;</strong>
 &lt;/tomcat-users&gt;</pre>
 </div>
-<a name="N10067"></a><a name="To+Start+the+Tomcat+Server"></a>
+<a name="N1006D"></a><a name="To+Start+the+Tomcat+Server"></a>
 <h4>To Start the Tomcat Server</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -470,10 +470,10 @@
 </div>
 </div>
         
-<a name="N10077"></a><a name="step_2"></a>
+<a name="N1007D"></a><a name="step_2"></a>
 <h3>Step 2: Create a New Page Flow Application</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N1007D"></a><a name="Introduction"></a>
+<a name="N10083"></a><a name="Introduction"></a>
 <h4>Introduction</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -486,7 +486,7 @@
 				The Controller file you create in this step contains one simple Action method. This simple navigational Action method forwards users to the index.jsp page. In the next step, you will create a more complex Action method.
 				</p>
 </div>
-<a name="N10091"></a><a name="Make+a+Project+Folder"></a>
+<a name="N10097"></a><a name="Make+a+Project+Folder"></a>
 <h4>Make a Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>On your C: drive, create a directory named <span class="codefrag">beehive_projects</span>.</p>
@@ -497,7 +497,7 @@
   beehive_projects
     pageflow_tutorial</pre>
 </div>
-<a name="N100AE"></a><a name="To+Copy+Page+Flow+Resources+into+the+Project+Folder"></a>
+<a name="N100B4"></a><a name="To+Copy+Page+Flow+Resources+into+the+Project+Folder"></a>
 <h4>To Copy Page Flow Resources into the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will copy (most of) the Page Flow application template into your project folder.  The application template gives the basic directory structure for a Page Flow web app, and it includes some common resources, for example: image files, supporting JavaScript files, and web app configuration files.</p>
@@ -527,7 +527,7 @@
       netui-blank  -  WRONG!</pre>
 <p></p>
 </div>
-<a name="N100FC"></a><a name="To+Copy+Runtime+JARs+to+the+Project+Folder"></a>
+<a name="N10102"></a><a name="To+Copy+Runtime+JARs+to+the+Project+Folder"></a>
 <h4>To Copy Runtime JARs to the Project Folder</h4>
 <div style="margin-left: 0 ; border: 2px">
 <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&gt; tag library, etc. These resources are loaded into your project's <span class="codefrag">WEB-INF/lib</span> folder using the Ant command below.</p>
@@ -544,7 +544,7 @@
         lib
           [many JAR files]</pre>
 </div>
-<a name="N10119"></a><a name="To+Create+a+Controller+File"></a>
+<a name="N1011F"></a><a name="To+Create+a+Controller+File"></a>
 <h4>To Create a Controller File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will create the Controller file, the central file on any Page Flow.</p>
@@ -570,7 +570,7 @@
 }</pre>
 <p>Save and close the file Controller.jpf.</p>
 </div>
-<a name="N1013F"></a><a name="To+Create+a+JSP+File"></a>
+<a name="N10145"></a><a name="To+Create+a+JSP+File"></a>
 <h4>To Create a JSP File</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the directory <span class="codefrag">C:/beehive_projects/pageflow_tutorial</span>, create a file named <span class="codefrag">index.jsp</span>.</p>
@@ -589,7 +589,7 @@
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N1015A"></a><a name="To+Compile+and+Deploy+the+Page+Flow"></a>
+<a name="N10160"></a><a name="To+Compile+and+Deploy+the+Page+Flow"></a>
 <h4>To Compile and Deploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>You are now ready to compile the Page Flow and deploy it to Tomcat.</p>
@@ -608,7 +608,7 @@
   undeploy</pre>
 <p>When the undeploy is complete, then compile and deploy again.</p>
 </div>
-<a name="N1017A"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
+<a name="N10180"></a><a name="To+Test+the+Page+Flow+Web+Application"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following address:</p>
@@ -619,10 +619,10 @@
 </div>
 </div>
         
-<a name="N10190"></a><a name="step_3"></a>
+<a name="N10196"></a><a name="step_3"></a>
 <h3>Step 3: Navigation</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10196"></a><a name="To+Create+a+Destination+JSP+Page"></a>
+<a name="N1019C"></a><a name="To+Create+a+Destination+JSP+Page"></a>
 <h4>To Create a Destination JSP Page</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the directory <span class="codefrag">C:/beehive_projects/pageflow_tutorial</span>, create a file named <span class="codefrag">page2.jsp</span>.</p>
@@ -642,7 +642,7 @@
 &lt;/netui:html&gt;</pre>
 <p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
-<a name="N101B4"></a><a name="To+Create+a+Link+to+the+Destination+Page"></a>
+<a name="N101BA"></a><a name="To+Create+a+Link+to+the+Destination+Page"></a>
 <h4>To Create a Link to the Destination Page</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Open the file <span class="codefrag">C:/beehive_projects/pageflow_tutorial/index.jsp</span>.</p>
@@ -666,7 +666,7 @@
 &lt;/netui:html&gt;
 				</pre>
 </div>
-<a name="N101CF"></a><a name="To+Add+an+Action+Method+to+Handle+the+Link"></a>
+<a name="N101D5"></a><a name="To+Add+an+Action+Method+to+Handle+the+Link"></a>
 <h4>To Add an Action Method to Handle the Link</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Open the file <span class="codefrag">C:/beehive_projects/pageflow_tutorial/Controller.jpf</span>.</p>
@@ -699,7 +699,7 @@
     }</strong>
 }</pre>
 </div>
-<a name="N101EA"></a><a name="To+Compile+and+Redeploy+the+Page+Flow"></a>
+<a name="N101F0"></a><a name="To+Compile+and+Redeploy+the+Page+Flow"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -711,7 +711,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N101F9"></a><a name="To+Test+the+Page+Flow+Web+Application-N101E9"></a>
+<a name="N101FF"></a><a name="To+Test+the+Page+Flow+Web+Application-N101EF"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 
@@ -725,10 +725,10 @@
 </div>
 </div>
         
-<a name="N10212"></a><a name="step_4"></a>
+<a name="N10218"></a><a name="step_4"></a>
 <h3>Step 4: Submitting Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10218"></a><a name="To+Create+a+Submission+Form"></a>
+<a name="N1021E"></a><a name="To+Create+a+Submission+Form"></a>
 <h4>To Create a Submission Form</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Edit the file <span class="codefrag">C:/beehive_projects/pageflow_tutorial/page2.jsp</span> so it appears as follows.</p>
@@ -754,7 +754,7 @@
 &lt;/netui:html&gt;</pre>
 <p>Save and close <span class="codefrag">page2.jsp</span>.</p>
 </div>
-<a name="N10233"></a><a name="To+Create+a+Server+Side+Representation+of+the+Submission+Form"></a>
+<a name="N10239"></a><a name="To+Create+a+Server+Side+Representation+of+the+Submission+Form"></a>
 <h4>To Create a Server Side Representation of the Submission Form</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In this step you will create a Java class that represents the submission form created in the previous task.  When the form data is submitted, the Java class will be instantiated, and the form data will be loaded into the members of the Java class.</p>
@@ -790,7 +790,7 @@
 }</pre>
 <p>Save and close <span class="codefrag">ProfileForm.java</span>.</p>
 </div>
-<a name="N10260"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
+<a name="N10266"></a><a name="To+Edit+the+Controller+File+to+Handle+the+Submitted+Data"></a>
 <h4>To Edit the Controller File to Handle the Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Open the file <span class="codefrag">C:/beehive_projects/pageflow_tutorial/Controller.jpf</span>
@@ -839,7 +839,7 @@
 }</pre>
 <p>Save and close <span class="codefrag">Controller.jpf</span>.</p>
 </div>
-<a name="N10286"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N10273"></a>
+<a name="N1028C"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N10279"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -851,7 +851,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N10295"></a><a name="To+Test+the+Page+Flow+Web+Application-N10281"></a>
+<a name="N1029B"></a><a name="To+Test+the+Page+Flow+Web+Application-N10287"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 
@@ -867,10 +867,10 @@
 </div>
 </div>
         
-<a name="N102B4"></a><a name="step_5"></a>
+<a name="N102BA"></a><a name="step_5"></a>
 <h3>Step 5: Processing and Displaying Data</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N102BA"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
+<a name="N102C0"></a><a name="To+Create+a+JSP+Page+to+Display+Submitted+Data"></a>
 <h4>To Create a JSP Page to Display Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>In the directory <span class="codefrag">C:/pageflow_tutorial</span> Create a file named <span class="codefrag">displayData.jsp</span>. Edit <span class="codefrag">displayData.jsp</span> so it appears as follows.</p>
@@ -887,7 +887,7 @@
   &lt;/netui:body&gt;
 &lt;/netui:html&gt;</pre>
 </div>
-<a name="N102D2"></a><a name="To+Process+the+Submitted+Data"></a>
+<a name="N102D8"></a><a name="To+Process+the+Submitted+Data"></a>
 <h4>To Process the Submitted Data</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Edit the processData method in the Controller.jpf file so it appears as follows. Code to add appears in bold.</p>
@@ -904,7 +904,7 @@
         return new Forward("success");
     }</pre>
 </div>
-<a name="N102E4"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N102CE"></a>
+<a name="N102EA"></a><a name="To+Compile+and+Redeploy+the+Page+Flow-N102D4"></a>
 <h4>To Compile and Redeploy the Page Flow</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>At the command prompt, enter:</p>
@@ -916,7 +916,7 @@
   build.webapp
   deploy</pre>
 </div>
-<a name="N102F3"></a><a name="To+Test+the+Page+Flow+Web+Application-N102DC"></a>
+<a name="N102F9"></a><a name="To+Test+the+Page+Flow+Web+Application-N102E2"></a>
 <h4>To Test the Page Flow Web Application</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Visit the following link: 

Modified: incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/controls/tutorial_controls.xml	Wed Nov 17 11:16:31 2004
@@ -31,6 +31,27 @@
                 <p>Follow the setup directions at <fork href="../setup.html">Beehive Installation and Setup</fork></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>
+            </section>
+            <section>
+                <title>To Start the Tomcat Server</title>
+                <p>At the command prompt, enter:</p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
+            </section>            
         </section>
         <section id="step_2">
             <title>Step 2: Create Control Implementation and Interface Files</title>
@@ -39,21 +60,37 @@
                 <p>A Beehive Control consists of two files: an interface file (with the JAVA file extension) and an implementation file (with the JCS file extension).  The interface file is the public face of your control.  It lists all of the methods which can be invoked by users.  The implementation file contains the implementation code for the methods listed in the interface file.</p>
             </section>
             <section>
-                <title>To Create a Control Application Folder</title>
-                <p>In the directory <code>CATALINA_HOME/webapps/</code>, create a directory called <code>control_tutorial</code>.</p>
+                <title>Make a Project Folder</title>
+                <p>On your C: drive, create a directory called <code>beehive_projects</code>.</p>
+                <p>In the <code>beehive_projects</code> directory, create a directory called control_tutorial.</p>
+                <p>Before proceeding, confirm that the following directory structure exists:</p>
+            <source>C:
+  beehive_projects
+    control_tutorial</source>
             </section>
             <section>
                 <title>To Add Beehive Runtime JARs to Your Application.</title>
                 <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. <!--[tbd: for a complete list see...]--></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 deploy.beehive.webapp.runtime -Dwebapp.dir=%CATALINA_HOME%\webapps\control_tutorial</source>
+                <source>  ant 
+    -f %BEEHIVE_HOME%\ant\buildWebapp.xml
+    -Dwebapp.dir=C:\beehive_projects\control_tutorial 
+    deploy.beehive.webapp.runtime </source>
             </section>            
             <section>
                 <title>To Create the Control's Implementation File</title>
-                <p>In this step you will create the implementation file for your Beehive Control.  This is a JAVA file, that contains the bulk of your Control's working code.</p>
-                <p>In the directory <code>CATALINA_HOME/webapps/control_tutorial/WEB-INF</code>, create a directory called <code>src</code>.</p>
-                <p>In the directory <code>CATALINA_HOME/webapps/control_tutorial/WEB-INF/src</code>, create a directory called <code>hellocontrol</code>.</p>
-                <p>In the directory <code>CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</code>, create a file called <code>HelloImpl.jcs</code>.</p>
+                <p>In this step you will create the implementation file for your Beehive Control.  This is a Java class (although it has the JCS file extension) that contains the bulk of your Control's working code.</p>
+                <p>In the directory <code>C:/beehive_projects/control_tutorial/WEB-INF</code>, create a directory called <code>src</code>.</p>
+                <p>In the directory <code>C:/beehive_projects/webapps/control_tutorial/WEB-INF/src</code>, create a directory called <code>hellocontrol</code>.</p>
+                <p>In the directory <code>C:/beehive_projects/webapps/control_tutorial/WEB-INF/src/hellocontrol</code>, create a file called <code>HelloImpl.jcs</code>.</p>
+                <p>Before proceeding, confirm that the following directory structure exists:</p>
+            <source>C:
+  beehive_projects
+    control_tutorial
+      WEB-INF
+        src
+          hellocontrol
+             HelloImpl.jcs</source>
                 <p>In a text editor (or your IDE of choice), open the file HelloImpl.jcs.</p>
                 <p>Edit HelloImpl.jcs so it appears as follows.</p>
                 <source><![CDATA[package hellocontrol; 
@@ -74,7 +111,7 @@
                 <title>To Create the Control's Interface File</title>
                 <p>The interface file is a JAVA file, that defines the public face of your control. <!--[tbd]-->
                 </p>
-                <p>In the directory <code>CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</code>, create a file named <code>Hello.java</code>.</p>
+                <p>In the directory <code>C:/beehive_projects/control_tutorial/WEB-INF/src/hellocontrol</code>, create a file named <code>Hello.java</code>.</p>
                 <p>Edit Hello.java so it looks like the following.</p>
                 <source><![CDATA[package hellocontrol; 
 
@@ -91,48 +128,50 @@
                 <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>CATALINA_HOME/webapps/control_tutorial/WEB-INF/src/hellocontrol</code>, edit the file named <code>hello.jsp</code>.
+                <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.</p>
                 <source><![CDATA[<%@ page language="java" contentType="text/html;charset=UTF-8"%>
 <%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
 <netui:html>
   <head>
-    <title>Web Application Page</title>
-    <netui:base/>
+    <title>Control Tutorial Test Page</title>
   </head>
   <netui:body>
+    <h3>Control Tutorial Test Page</h3>
     <p>
-      <jsp:useBean class="hellocontrol.HelloBean" id="helloBean" scope="session"/>
-	<%= helloBean.hello() %>
+        <jsp:useBean class="hellocontrol.HelloBean" id="helloBean" scope="session"/>
+        Response from the hello() method on the Hello Control: <strong> <%= helloBean.hello() %> </strong>
     </p>
   </netui:body>
 </netui:html>]]></source>
             </section>
             <section>
-                <title>To Compile the Control</title>
+                <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 build.webapp -Dwebapp.dir=%CATALINA_HOME%\webapps\control_tutorial</source>
-            </section>
-            <section>
-                <title>To Start the Tomcat Server</title>
-                <p>At the command prompt, enter:</p>
-                <source>%CATALINA_HOME%\bin\startup.bat</source>
+                <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>
             </section>
             <section>
                 <title>To Test the Control</title>
-                <p>Open a web browser and enter the following in the address bar: <code>http://localhost:8080/control_tutorial/hello.jsp</code>
+                <p>Open a web browser and enter the following in the address bar: <fork href="http://localhost:8080/control_tutorial/hello.jsp">http://localhost:8080/control_tutorial/hello.jsp</fork>
                 </p>
                 <p>You will be directed to the index.jsp page.</p>
                 <p>Note the message on the page: "Hello, World!"</p>
                 <p>This message is provided by the Hello control.</p>
-            </section>
-            <section>
-                <title>To Shutdown the Tomcat Server</title>
-                <p>At the command prompt, enter:
-                </p>
-                 <source>%CATALINA_HOME%\bin\shutdown.bat</source>
             </section>
         </section>
             <section>

Modified: incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
==============================================================================
--- incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	(original)
+++ incubator/beehive/site/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml	Wed Nov 17 11:16:31 2004
@@ -33,17 +33,17 @@
             <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:</p>
-                <source><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<tomcat-users>
-  <role rolename="tomcat"/>
-  <role rolename="role1"/>
-  <role rolename="manager"/>
-  <user username="tomcat" password="tomcat" roles="tomcat"/>
-  <user username="role1" password="tomcat" roles="role1"/>
-  <user username="both" password="tomcat" roles="tomcat,role1"/>
-  <user username="manager" password="manager" roles="manager"/>
-</tomcat-users>]]></source>
+                <p>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>
             </section>
             <section>
                 <title>To Start the Tomcat Server</title>