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/08/23 07:14:36 UTC

svn commit: r239347 [1/2] - in /beehive/trunk/docs/forrest/release/src/documentation/content/xdocs: ./ controls/ pageflow/ samples/ system-controls/ejb/ system-controls/jdbc/ system-controls/jms/

Author: ekoneil
Date: Mon Aug 22 22:14:31 2005
New Revision: 239347

URL: http://svn.apache.org/viewcvs?rev=239347&view=rev
Log:
More documentation cleanup / work.

- continued work on tutorial_controls to fixup code samples and improve the setup instructions
- work on the system control documentation to remove duplicated annotation references and add <code> sections around stuff that's code (!)
- etc...

BB: self
DRT: build.release pass


Modified:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejb-annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbc-annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jms-annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml Mon Aug 22 22:14:31 2005
@@ -23,111 +23,130 @@
                 </ul>
             </section>
         </section>
-    <section id="step1">
-        <title>Step 1: Begin the Control Tutorial</title>
-            <section id="setup">
-                <title>To Set up the Development Environment</title>
+        <section id="setup">
+            <title>Step 1: Setup a Beehive-enabled Web Application</title>
+            <section id="setup_shell">
+                <title>Set Shell Variables</title>
                 <p>Complete all of the necessary and optional steps in the following topic: <a class="fork" href="site:setup">Beehive Installation and Setup</a></p>
             </section>
-            <section id="make_project">
-                <title>Create a Web Project</title>
+            <section id="setup_make_project">
+                <title>Create a Beehive-enabled Web Project</title>
                 <p>
-                In order to follow the steps in this tutorial, it's necessary to create a Beehive-enabled web application.  This web application is derived from Beehive's
-                <a href="site:netui-blank">netui-blank</a> NetUI web project which contains a skeleton Ant build file and an example Page Flow Controller.  To create the
+                In order to follow the steps in this tutorial, it's necessary to create a Beehive-enabled web application.  Beehive-enabled web applications
+                are described <a href="index.html">here</a>.  A skeleton Beehive-enabled web project is provided in the samples/ directory as 
+                <a href="site:netui-blank">netui-blank</a>.  This contains a basic Ant build file and an example Page Flow Controller.  To create the
                 tutorial's project, we'll copy and then rename the <a href="site:netui-blank">netui-blank</a> project using these steps:
                 </p>
                 <ol>
                 <li>On your C: drive, create a directory named <code>beehive_projects</code>.</li>
-                <li>Copy the folder <code>&lt;BeehiveRoot>/samples/netui-blank</code> into 
-                    <code>C:/beehive_projects</code>. (<code>&lt;BeehiveRoot</code> is the top level folder of your
-                    Beehive distribution.  A typical value might be <code>C:/apache/apache-beehive-1.0</code>.)</li>
-		<li>Rename the folder <code>C:\beehive_projects\</code><strong><code>netui-blank</code></strong> to <code>C:\beehive_projects\</code><strong><code>control_tutorial</code></strong></li>
-		<li>Before proceeding, confirm that the following directory structure exists:</li>
+                <li>Copy the folder <code>&lt;BeehiveDistribution>/samples/netui-blank</code> into 
+                    <code>C:/beehive_projects</code> where <code>&lt;BeehiveDistribution></code> is the directory that contains your 
+                    unzipped copy of a Beehive distribution.  A typical value might be <code>C:/apache/apache-beehive-1.0</code>.)</li>
+                <li>Rename the folder <code>C:\beehive_projects\</code><strong><code>netui-blank</code></strong> to 
+                    <code>C:\beehive_projects\</code><strong><code>controls_tutorial</code></strong></li>
+                <li>Before continuing, confirm that the following directory structure exists:</li>
                 </ol>
                 <source>
 c:\
     beehive_projects\
-        control_tutorial\
+        controls_tutorial\
           Controller.java
           index.jsp
           resources\
           WEB-INF\
                 </source>
-<p>
-Note, this directory structure is just an example; you are free to put the <code>pageflow_tutorial</code> directory anywhere on disk.  Just be sure to adjust
-the rest of the directory names in the tutorial below.
-</p>
+                <p>
+                Note, this directory structure is just an example; you are free to put the <code>controls_tutorial</code> 
+                directory anywhere on disk.  In the remainder of this tutorial, the directory <code>beehive_projects/controls_tutorial</code> 
+                will simply be referred to as <code>controls_tutorial</code>.
+                </p>
             </section>
-            <section id="configure_properties">
+            <section id="setup_configure_properties">
                 <title>Configure Build Properties</title>
-    <p>
-       The <code>WEB-INF/src/build.properties</code> file contains several project-related properties that must be set in order to build the web application.  Specifically, the 
-       paths to your Beehive distribution and to the JSP / Servlet API JARs for your application container must be set.  The following steps will set these properties
-       for the <code>pageflow_tutorial</code> webapp.
-    </p>
-    <ol>
-    <li>Open the file <code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src/build.properties</code> in a text editor.</li>
-    <li>Edit the <code>beehive.home</code> property so it points to the top-level folder of your Beehive distribution.</li>  
-    <li>Edit the <code>context.path</code> so it has the value <code>pageflow_tutorial</code>.</li>
-    </ol>
-    <note>The <code>context.path</code> property determines both (1) the name of the application WAR file and (2) the application URL.  
-          <br/><br/>
-          If <code>context.path=myWebApp</code>, then the following WAR file will be produced:
-          <br/><br/>
-          &nbsp;&nbsp;&nbsp;&nbsp;<strong><code>myWebApp</code></strong><code>.war</code>
-          <br/><br/>
-          and the following URL will invoke the web application:
-          <br/><br/>
-          &nbsp;&nbsp;&nbsp;&nbsp;<code>http://someserver/</code><strong><code>myWebApp</code></strong>
-     </note>
-     <p>For example, if your Beehive distribution is located in <code>C:/apache/apache-beehive-1.0</code>, then your <code>build.properties</code> file would appear as follows.</p>
-<source>
+                <p>
+                The <code>WEB-INF/src/build.properties</code> file contains several project-related properties that must 
+                be set in order to build the web application.  Specifically, the paths to your Beehive distribution and 
+                to the JSP / Servlet API JARs for your application container must be set.  The following steps will set these properties
+                for the <code>controls_tutorial</code> webapp.
+                </p>
+                <ol>
+                <li>Open the file <code>controls_tutorial/WEB-INF/src/build.properties</code> in a text editor.</li>
+                <li>Edit the <code>beehive.home</code> property so it points to the top-level folder of your Beehive distribution.</li>  
+                <li>Edit the <code>context.path</code> to use the value <code>controls_tutorial</code>.</li>
+                </ol>
+                <note>
+                The <code>context.path</code> property determines both (1) the name of the application WAR file and (2) the application URL.  
+                <br/><br/>
+                If <code>context.path=fooWebApp</code>, then the following WAR file will be produced:
+                <br/><br/>
+                &nbsp;&nbsp;&nbsp;&nbsp;<strong><code>fooWebApp</code></strong><code>.war</code>
+                <br/><br/>
+                and the following URL will invoke the web application:
+                <br/><br/>
+                &nbsp;&nbsp;&nbsp;&nbsp;<code>http://someapplicationserver/</code><strong><code>fooWebApp</code></strong>
+                </note>
+                <p>For example, if your Beehive distribution is located in <code>C:/apache/apache-beehive-1.0</code>, 
+                then your <code>build.properties</code> file would appear as follows.</p>
+                <source>
 beehive.home=<strong>C:/apache/apache-beehive-1.0</strong>
 servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
 jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
 
-context.path=<strong>control_tutorial</strong></source>
-<note>Properties files should use the '/' character to separate drive, directory, and file names.</note>
-<p>
-If you are using an application container other than Tomcat, be sure to set the <code>servlet-api.jar</code> and <code>jsp-api.jar</code> properties 
-to reference the JAR your server provides which contains the JSP and Servlet API classes.
-</p>
+context.path=<strong>controls_tutorial</strong>
+                </source>
+                <note>Properties files should use the '/' character to separate drive, directory, and file names.</note>
+                <p>
+                If you are using an application container other than Tomcat, be sure to set the <code>servlet-api.jar</code> and <code>jsp-api.jar</code> properties 
+                to reference the JAR your server provides which contains the JSP and Servlet API classes.
+                </p>
             </section>
-            <section id="add_control_files">
+            <section id="setup_add_control_files">
                 <title>Add Sample Control Interface and Implementation Source Files</title>
-<p>This tutorial uses a sample Hello World control that is contained in <strong><code>&lt;BeehiveRoot>/samples/controls-blank/src/pkg</code></strong>.  Copy the <code>pkg</code>
-sub-directory from this path into the directory <strong><code>C:/beehive_projects/control_tutorial/WEB-INF/src</code></strong>.</p>
-<p>Now, confirm that the following directory structure exists:</p>
-<source>C:\
-    beehive_projects\
-        control_tutorial\
-            WEB-INF\
-                src\
-                    pkg\
+                <p>
+                This tutorial uses a sample Hello World control that is contained in 
+                <strong><code>&lt;BeehiveRoot>/samples/controls-blank/src/pkg</code></strong>.  Copy the <code>pkg</code> 
+                sub-directory from this path into the directory <strong><code>control_tutorial/WEB-INF/src</code></strong>.
+                </p>
+                <p>Now, confirm that the following directories and files exist:</p>
+                <source>
+        control_tutorial/
+            WEB-INF/
+                src/
+                    pkg/
                         Hello.java
                         HelloImpl.java
-</source>
-</section>
-            <section id="start_server">
+                </source>
+            </section>
+            <section id="setup_start_server">
                 <title>Start the Server</title>
                 <p>If you are using Tomcat, enter the following at the command prompt:</p>
-                <source>%CATALINA_HOME%\bin\startup.bat</source>
+                <source>$CATALINA_HOME/bin/startup.bat</source>
                 <p>If you aren't using Tomcat, start your application container as per its directions.</p>
             </section>
-	</section>
-        <section id="step_2">
+            <section id="setup_urls">
+                <title>Using URLs in the Examples</title>
+                <p>
+                In the Beehive tutorials, you will often encounter URLs like <code>http://localhost:8080/controls_tutorial/begin.do</code>.
+                When you see these URLs, they are meant to be accessed via your web browser to demonstrate functionality built in the 
+                tutorial.  These URLs are setup to run on Tomcat, so if you are unable to run these URLs, be sure that they are appropriate 
+                for your application server.  Specifically, check the port numbers to make sure that your server is running on the 
+                referenced port.
+                </p>
+            </section>
+        </section>
+        <section id="create">
             <title>Step 2: Compile the Control Implementation and Interface Files</title>
-            <section id="intro_2">
+            <section id="create-introduction">
                 <title>Introduction</title>
                 <p>A Beehive Control consists of two files: an interface file and an implementation file.  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 id="examine"><title>To Examine the Control Files</title>
-			<p>Open the file <code>C:/beehive_projects/control_tutorial/WEB-INF/src/pkg/HelloImpl.java</code>.</p>
-			<p>The implementation file appears as follows. (There is no need to edit the file at 
-				this point in the tutorial.)</p>
+                    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 id="create-examine"><title>Examine the Control Files</title>
+            <p>Open the file <code>C:/beehive_projects/control_tutorial/WEB-INF/src/pkg/HelloImpl.java</code>.</p>
+            <p>The implementation file appears as follows. (There is no need to edit the file at 
+                this point in the tutorial.)</p>
 <source>
 package pkg;
 
@@ -141,30 +160,24 @@
         return "hello!";
     }
 }</source>
-<p>Open the file <code>C:/beehive_projects/control_tutorial/WEB-INF/src/pkg/Hello.java</code>.</p>
-			<p>The interface file appears as follows. (There is no need to edit the file at 
-				this point in the tutorial.)</p>
+            <p>Open the file <code>control_tutorial/WEB-INF/src/pkg/Hello.java</code>.  The interface file should appear appears as follows.</p>
 <source>
 package pkg;
 
-import org.apache.beehive.controls.api.bean.*;
+import org.apache.beehive.controls.api.bean.ControlInterface;
 
 @ControlInterface
 public interface Hello {
     String hello();
 }</source>
-				</section>       
-            <section id="edit_controller.java">
-				<title>Edit the Controller.java File</title>
-            <p>To test the Hello control, you need to call the control from some other 
-					resource, such as a JAVA application, JSP page, a web application, etc.
-					  In the following two steps you will call the 
-				control from the Contoller class in a web application and display the results
-				on a JSP page.
-				</p>
-			<p>Open the file <code>C:/beehive_projects/control_tutorial/Controller.java</code> in a text editor.</p>
-			<p>Edit <code>Controller.java</code> so it appears as follows:</p>
-			<source>
+                </section>       
+            <section id="create-edit-controller">
+                <title>Edit the Controller.java File</title>
+            <p>To test the Hello control, you need to call the control from some other resource, such as a 
+               Java application, JSP page, a web application, etc.  In the following two steps you will call the 
+               control from a <a href="site:tutorial_pageflow">Page Flow Contoller</a> in a web application and display the results on a JSP page.</p>
+            <p>Open the file <code>control_tutorial/Controller.java</code> in a code editor and modify so it appears as:</p>
+            <source>
 import javax.servlet.http.HttpSession;
 
 import org.apache.beehive.netui.pageflow.Forward;
@@ -196,8 +209,8 @@
         @Jpf.Forward(name="success", path="index.jsp")
       }
     )
-    protected Forward begin() throws Exception
-    {
+    protected Forward begin() 
+        throws Exception {
         Forward f = new Forward("success");
         f.addActionOutput("helloMessage", _helloControl.hello());
         return f;
@@ -205,22 +218,16 @@
     
 }
 </source>
-     <p>The two import statements import the @Control annotation and the Hello
-		control, respectively.</p>
-	<p>The <code>@Jpf.SimpleAction</code> named "<code>begin</code>" is 
-		renamed to "<code>old_begin</code>" 
-		because the Beehive runtime automatically
-		looks for and runs any action named "<code>begin</code>" when 
-		a Page Flow is
-		first instantiated.  The renaming makes the runtime run the action
-		method <code>begin()</code>, which allows us to call the Hello control
-		inside of the method body.</p>
-                </section>
-			<section id="edit_index.jsp">
-                <title>To Edit the <code>index.jsp</code>Test Page</title>
-                <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>
+     <p>The two import statements import the @Control annotation and the <code>Hello</code> control, respectively.</p>
+     <p>The <code>@Jpf.SimpleAction</code> named <code>begin</code> is renamed to <code>old_begin</code>
+        because the Beehive runtime automatically looks for and runs any action named <code>begin</code> when 
+        a Page Flow is first instantiated.  The renaming makes the runtime run the action method <code>begin()</code>, 
+        which allows us to call the <code>Hello</code> control inside of the method body.</p>
+        </section>
+        <section id="create_edit_page">
+            <title>Edit the index.jsp Test Page</title>
+            <p>Edit the file <code>C:/beehive_projects/control_tutorial/index.jsp</code> to appear as follows; changes are shown in <strong>bold</strong>:</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"%>
 &lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
@@ -238,77 +245,82 @@
     &lt;/p>
   &lt;/netui:body>
 &lt;/netui:html>
-</source>
+            </source>
             </section>
-            <section id="compile_2">
-                <title>To Compile and Deploy the Page Flow</title>
+            <section id="create_build_deploy">
+                <title>Compile and Deploy the Web Application</title>
                 <p>You are now ready to compile the Page Flow and deploy it to Tomcat.</p>
-                <p>The following Ant command assumes that you are in the <code>c:/beehive_projects/control_tutorial/WEB-INF/src</code> directory.  At the command prompt, enter:</p>
-<source>
+                <p>The following Ant command assumes that you are in the <code>controls_tutorial/WEB-INF/src</code> directory.  At the command prompt, enter:</p>
+                <source>
   ant clean build war
-</source>
-<p>
-This will build the webapp by running the Beehive annotation processors and will produce class files in <code>WEB-INF/classes</code>.
-</p>
-<p>Now, the application is ready to deploy to your server.  On Tomcat, copy the WAR file into Tomcat's <code>$CATALINA_HOME/webapps</code> directory.</p>
-<source>
-    copy C:\beehive_projects\control_tutorial.war %CATALINA_HOME%\webapps /Y
-</source>
-<p>If you are not using Tomcat, follow your server's web application deployment instructions to deploy the webapp.</p>
-</section>
-            <section id="test_2">
-                <title>To Test the Control</title>
-                <p>Open a web browser and enter the following in the address bar:</p>
+                </source>
+                <p>
+                This will build the webapp by running the Beehive annotation processors and will produce class files in <code>WEB-INF/classes</code>.  
+                Now, the application is ready to deploy to your server.  On Tomcat, copy the WAR file into Tomcat's <code>$CATALINA_HOME/webapps</code> 
+                directory.</p>
+                <source>
+    copy controls_tutorial.war %CATALINA_HOME%\webapps /Y
+                </source>
+                <p>If you are asked to overwrite the old WAR file, enter 'yes'.  Note, when doing redeployment, you may have to wait a few seconds 
+                   for Tomcat to redeploy the WAR file.  Once deployment or redeployment has completed, the webapp can be accessed through a browser.</p>
+                <p>If you are not using Tomcat, follow your server's web application deployment instructions to deploy the webapp.</p>
+            </section>
+            <section id="create_run">
+                <title>Test the Control</title>
+                <p>Visit the following address in a web browser:</p>
                 <p class="quote"><a class="fork" href="http://localhost:8080/control_tutorial/begin.do">http://localhost:8080/control_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
-                <p>Note the message on the page: "hello!"</p>
-                <p>This message is provided by the Hello control.</p>
+                <p>This will render the <code>index.jsp</code> page.</p>
+                <p>Note the message on the page: "hello!" which is provided by <code>Hello</code> control.</p>
             </section>
         </section>
-            <section id="add_param_method">
-                <title>Step 3: Add a Parameterized Method to the Control</title>
-                <section id="edit_3">
-                    <title>To edit the Interface and Implementation Files</title>
-                    <p>Edit <code>C:/beehive_projects/control_tutorial/WEB-INF/src/pkg/HelloImpl.java</code> 
-so it appears as follows.  Code to add appears in bold.</p>
-<source>package pkg;
+        <section id="add_method">
+            <title>Step 3: Add a Parameterized Method to the Control</title>
+            <section id="add_method_edit">
+                <title>Edit the Interface and Implementation Files</title>
+                <p>Edit <code>control_tutorial/WEB-INF/src/pkg/HelloImpl.java</code> so it appears as follows.  Code to add appears in bold.</p>
+<source>
+package pkg;
 
-import org.apache.beehive.controls.api.bean.*;
+import org.apache.beehive.controls.api.bean.ControlImplementation;
 
 @ControlImplementation(isTransient=true)
-public class HelloImpl implements Hello
-{
-    public String hello()
-    {
+public class HelloImpl 
+    implements Hello {
+
+    public String hello() {
         return "hello!";
     }
 
-    <strong>public String helloParam( String name )
-    {
+    <strong>public String helloParam(String name) {
         return "Hello, " + name + "!";
-    }</strong>
-}</source>
-<p>Edit <code>C:/beehive_projects/control_tutorial/WEB-INF/src/pkg/Hello.java</code> so it appears as follows.  Code to add appears in bold.</p>
-<source>package pkg;
+    }
+</strong>
+}
+</source>
+<p>Edit <code>control_tutorial/WEB-INF/src/pkg/Hello.java</code> so it appears as follows; modifications are shown in <strong>bold</strong>:</p>
+<source>
+package pkg;
 
-import org.apache.beehive.controls.api.bean.*;
+import org.apache.beehive.controls.api.bean.ControlInterface;
 
 @ControlInterface
-public interface Hello
-{
+public interface Hello {
+
     String hello();
 
-    <strong>String helloParam( String name );</strong>
-}</source>
+    <strong>String helloParam(String name);</strong>
+}
+</source>
                 </section>
-<section id="edit_jpf_3"><title>Edit the Controller.java File</title>
-	<p>Edit the <code>begin()</code> method in 
-		<code>Controller.java</code> so it appears as follows.  Code to add appears in bold.</p>
-	<source>...
-		
+                <section id="edit_jpf_3">
+                    <title>Edit the Controller.java File</title>
+                    <p>Edit the <code>begin()</code> method in <code>Controller.java</code> so it appears as 
+                       follows; modifications are shown in <strong>bold</strong>.</p>
+    <source>
+...
+        
 public class Controller 
-    extends PageFlowController
-{
+    extends PageFlowController {
 
     ...
 
@@ -317,8 +329,8 @@
         @Jpf.Forward( name="success", path="index.jsp" )
       }
     )
-    protected Forward begin() throws Exception
-    {
+    protected Forward begin() 
+        throws Exception {
         Forward f = new Forward("success");
         f.addActionOutput("helloMessage", _helloControl.hello());
         <strong>f.addActionOutput("helloParamMessage", _helloControl.helloParam("World"));</strong>
@@ -327,52 +339,54 @@
 
    ...
 
-}</source>
-	</section>
-<section id="edit_jsp_3">
-    <title>To Edit the Test JSP Page</title>
+}
+</source>
+    </section>
+<section id="add_method_edit_page">
+    <title>Edit a Test JSP Page</title>
     <p>Edit <code>index.jsp</code> so it appears as follows.  Code to add 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"%>
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-&lt;%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-&lt;netui:html>
-  &lt;head>
-    &lt;title>Control Tutorial Test Page&lt;/title>
-    &lt;netui:base/>
-  &lt;/head>
-  &lt;netui:body>
-    &lt;jsp:useBean class="pkg.HelloBean" id="helloBean" scope="session"/>
-    &lt;h3>Control Tutorial Test Page&lt;/h3>
-    &lt;p>
+    <source><![CDATA[
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+  <head>
+    <title>Control Tutorial Test Page</title>
+    <netui:base/>
+  </head>
+  <netui:body>
+    <jsp:useBean class="pkg.HelloBean" id="helloBean" scope="session"/>
+    <h3>Control Tutorial Test Page</h3>
+    <p>
         Response from the hello() method on the Hello Control: 
-        &lt;netui:span style="color:#FF0000" value="${pageInput.helloMessage}"/>
-    &lt;/p>
-    <strong>&lt;p>
-        Response from the helloParam() method on the Hello Control: 
-        &lt;netui:span style="color:#FF0000" value="${pageInput.helloParamMessage}"/>
-    &lt;/p></strong>
-  &lt;/netui:body>
-&lt;/netui:html></source>
+        <netui:span style="color:#FF0000" value="${pageInput.helloMessage}"/>
+    </p>
+    <strong><p>Response from the helloParam() method on the Hello Control: 
+            <netui:span style="color:#FF0000" value="${pageInput.helloParamMessage}"/>
+            </p>
+    </strong>
+  </netui:body>
+</netui:html>
+]]>
+</source>
 </section>
-            <section id="compile_3">
-                <title>To Compile and Redeploy the Control</title>
-                <p>Compile and deploy the web application using the same command line statements used in
-					 <a href="#compile_2">step 2</a>.</p>
-            </section>
-            <section id="test_3">
-                <title>To Test the Control</title>
-                <p>Open a web browser and enter the following in the address bar:</p>
-		<p class="quote"><a class="fork" href="http://localhost:8080/control_tutorial/begin.do">http://localhost:8080/control_tutorial/begin.do</a></p>
-                <p>You will be directed to the index.jsp page.</p>
-                <p>Note the messages on the page: "hello!" and "Hello, World!"</p>
-                <p>These messages are provided by the Hello control.</p>
+            <section id="add_method_build_deploy">
+                <title>Compile and Redeploy the Web Application</title>
+                <p>Compile and deploy the web application using the Ant commands described <a href="#create_build_deploy">here</a>.</p>
             </section>
+            <section id="add_method_run">
+                <title>Test the Control</title>
+                <p>Visit the following address in a web browser:</p>
+                <p class="quote"><a class="fork" href="http://localhost:8080/control_tutorial/begin.do">http://localhost:8080/control_tutorial/begin.do</a></p>
+                <p>This will render the <code>index.jsp</code> page.</p>
+                <p>Note the messages on the page: "hello!" and "Hello, World!" which are provided by the <code>Hello</code> control.</p>
             </section>
+        </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; 2005, Apache Software Foundation
-	</legal>
+    &copy; 2005, Apache Software Foundation
+        </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml Mon Aug 22 22:14:31 2005
@@ -104,7 +104,7 @@
             <section id="setup_start_server">
                 <title>Start the Server</title>
                 <p>If you are using Tomcat, enter the following at the command prompt:</p>
-                <source>%CATALINA_HOME%\bin\startup.bat</source>
+                <source>$CATALINA_HOME/bin/startup.bat</source>
                 <p>If you aren't using Tomcat, start your application container as per its directions.</p>
             </section>
             <section id="setup_urls">
@@ -235,9 +235,9 @@
             <!--<p>[todo: what is this code doing?]</p>-->
             </section>
             <section id="create_build_deploy">
-                <title>Compile and Deploy the Page Flow</title>
+                <title>Compile and Deploy the Web Application</title>
                 <p>You are now ready to compile the Page Flow and deploy it to Tomcat.</p>
-                <p>The following Ant command assumes that you are in the <code>c:/beehive_projects/pageflow_tutorial/WEB-INF/src</code> 
+                <p>The following Ant command assumes that you are in the <code>pageflow_tutorial/WEB-INF/src</code> 
                    directory.  At the command prompt, enter:</p>
                 <source>
   ant clean build war
@@ -247,7 +247,7 @@
                 Now, the application is ready to deploy to your server.  On Tomcat, copy the WAR file into Tomcat's <code>$CATALINA_HOME/webapps</code> 
                 directory.</p>
                 <source>
-    copy C:\beehive_projects\pageflow_tutorial.war %CATALINA_HOME%\webapps /Y
+    copy pageflow_tutorial.war %CATALINA_HOME%\webapps /Y
                 </source>
                 <p>If you are asked to overwrite the old WAR file, enter 'yes'.  Note, when doing redeployment, you may have to wait a few seconds 
                    for Tomcat to redeploy the WAR file.  Once deployment or redeployment has completed, the webapp can be accessed through a browser.</p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml Mon Aug 22 22:14:31 2005
@@ -2,50 +2,49 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Beehive Samples</title>
+        <title>Beehive Samples Overview</title>
     </header>
-	<body>
-		<p>Beehive ships with the following <strong>samples</strong> and 
-			<strong>project templates</strong>.  Follow the links 
-			for instructions on using the samples and templates.</p>
-		<p>
-			<strong>Samples</strong>
-		</p>
-		<ul>
-			<li>
-				<a href="site:jpetstore">Petstore</a>
-			</li>
-			<li>
-				<a href="site:netui-jsf">Page Flow: JSF Integration</a>
-			</li>
-			<li>
-				<a href="site:address-enhanced">Web Service: AddressBook Enhanced</a>
-			</li>
-			<li>
-				<a href="site:address-wsdl">Web Service: AddressBook from WSDL</a>
-			</li>
-		</ul>
-		<p>
-			<strong>Project Templates</strong>
-		</p>
-		<ul>
-			<li>
-				<a href="site:netui-blank">Project: Page Flow</a>
-			</li>
-			<li>
-				<a href="site:control-blank">Project: Control</a>
-			</li>
-			<li>
-				<a href="site:wsm-blank">Project: Web Service</a>
-			</li>
-			<li>
-				<a href="site:ws-control-blank">Project: Web Service Control</a>
-			</li>
-		</ul>
-	</body>
+    <body>
+        <p>Beehive ships with various <strong>samples</strong> and <strong>project templates</strong>.  Follow the links 
+           for instructions on using the samples and templates.</p>
+        <p>
+            <strong>Samples</strong>
+        </p>
+        <ul>
+            <li>
+                <a href="site:jpetstore">Petstore</a>
+            </li>
+            <li>
+                <a href="site:netui-jsf">Page Flow: JSF Integration</a>
+            </li>
+            <li>
+                <a href="site:address-enhanced">Web Service: AddressBook Enhanced</a>
+            </li>
+            <li>
+                <a href="site:address-wsdl">Web Service: AddressBook from WSDL</a>
+            </li>
+        </ul>
+        <p>
+            <strong>Project Templates</strong>
+        </p>
+        <ul>
+            <li>
+                <a href="site:netui-blank">Project: Page Flow</a>
+            </li>
+            <li>
+                <a href="site:control-blank">Project: Control</a>
+            </li>
+            <li>
+                <a href="site:wsm-blank">Project: Web Service</a>
+            </li>
+            <li>
+                <a href="site:ws-control-blank">Project: Web Service Control</a>
+            </li>
+        </ul>
+    </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>
+               &copy; 2004, Apache Software Foundation
+        </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml Mon Aug 22 22:14:31 2005
@@ -1,246 +1,246 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
-	"http://forrest.apache.org/dtd/document-v20.dtd">
+    "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
-	<header>
-		<title>Beehive Sample: Petstore</title>
-	</header>
-	<body>
-		<section id="intro">
-			<title>Introduction</title>
-			<p>The Petstore sample demonstrates how to integrate all three 
-				Beehive technologies (Page Flows, Controls and Web Services) in 
-				one application.</p>
-			<p>The Page Flows provide customers with web access to the 
-				Petstore. There are separate Page Flows for different customer 
-				activities: the 'shop' Page Flow (located at: 
-				<code>petstoreWeb/web/shop/</code>) lets users browse the catalog 
-				of pets, the 'checkout' Page Flow (petstoreWeb/web/checkout) lets 
-				users purchase selected items from a shopping cart, etc.</p>
-			<p>A web service (located at <code>petstoreWeb/ws/PestoreInventoryManager.java</code>) 
-				provides store managers access to the inventory.</p>
-			<p>Most of the Page Flows have associated Control files (located 
-				at: 
-				<code>petstoreWeb/src/org/apache/beehive/samples/petstore/controls/</code>). 
-				The Controls handle the backend data traffic and encapsulate 
-				the operations of the web application, such as retrieving data 
-				from a database and handling user orders.</p>
+    <header>
+        <title>Beehive Sample: Petstore</title>
+    </header>
+    <body>
+        <section id="intro">
+            <title>Introduction</title>
+            <p>The Petstore sample demonstrates how to integrate all three 
+                Beehive technologies (Page Flows, Controls and Web Services) in 
+                one application.</p>
+            <p>The Page Flows provide customers with web access to the 
+                Petstore. There are separate Page Flows for different customer 
+                activities: the 'shop' Page Flow (located at: 
+                <code>petstoreWeb/web/shop/</code>) lets users browse the catalog 
+                of pets, the 'checkout' Page Flow (petstoreWeb/web/checkout) lets 
+                users purchase selected items from a shopping cart, etc.</p>
+            <p>A web service (located at <code>petstoreWeb/ws/PestoreInventoryManager.java</code>) 
+                provides store managers access to the inventory.</p>
+            <p>Most of the Page Flows have associated Control files (located 
+                at: 
+                <code>petstoreWeb/src/org/apache/beehive/samples/petstore/controls/</code>). 
+                The Controls handle the backend data traffic and encapsulate 
+                the operations of the web application, such as retrieving data 
+                from a database and handling user orders.</p>
             <p>Petstore runs against a Derby database implementation.  See the instructions below
-				for downloading Derby.</p>
-		<section id="dir_struct">
-			<title>Petstore Directory Structure</title>
-			<p>The table below describes the functions of the most important 
-				files in the Petstore web application.</p>
-			<table>
-				<tr>
-					<th>Directory</th>
-					<th>Description</th>
-				</tr>
-				<tr>
-					<td>petstoreWeb</td>
-					<td/>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;src</td>
-					<td>This directory contains the back-end data and controls used by the web app.
-						</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;org</td>
-					<td>
-						</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../controller/AccountController.java</td>
-					<td>Class controls some of the internationalization settings for the site.</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../controls</td>
-					<td>Beehive Controls encapsulating different 
-						functionalities, including handling user account data, 
-						catalogue data, and order processing.</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../forms</td>
-					<td>Form Beans: each form bean is a server-side 
-						representation of an HTML form appearing in the user 
-						interface.</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../model</td>
-					<td>Java object classes (java beans) used to represent the basic 
-						types in the app:
-						addresses, orders, products, etc.</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../resources</td>
-					<td>Various .properties files</td>
-				</tr>
-				<tr>
-					<td>
-						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sql</td>
-					<td>A SQL file to initialize the database.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;test-src</td>
-					<td>Java types used by the application's internal tests.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;web</td>
-					<td>Contains the Page Flow web application modules.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;account</td>
-					<td>Page Flow user interface for managing user accounts</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auth</td>
-					<td>Page Flow user interface for managing login</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;checkout</td>
-					<td>Page Flow user interface for managing the shopping 
-						cart</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;search</td>
-					<td>Page Flow user interface for searching the 
-						Petstore</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;shop</td>
-					<td>Page Flow user interface for browsing the catalogue of 
-						pets</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;site</td>
-					<td>Contains the Petstore "skin", including the CSS file, 
-						HTML frameset, and template file</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;webappRoot</td>
-					<td>
-						<!--[todo]-->
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;WEB-INF</td>
-					<td>Contains configuration files for deployment, 
-						validation, security (web.xml), and generated Struts config files.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tags</td>
-					<td>Contains <code>.tag</code> files.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lib</td>
-					<td>JAR resources -- this directory is created and populated when you call the ant target <code>deploy-beehive</code>.</td>
-				</tr>
-				<tr>
-					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ws</td>
-					<td>Contains the web service interface for the web app.</td>
-				</tr>
-			</table>
-		</section>
-		<section><title>Build Targets</title>
- 			<p>The build file (located at <code>petstoreWeb/build.xml</code>) contains the following
-			build targets.</p>
-			<table>
-				<tr><th><strong>Target</strong></th><th><strong>Description</strong></th></tr>
-				<tr><td>deploy-beehive</td><td>Copies the Beehive runtime JARs into the webapp's
-					WEB-INF/lib directory.</td></tr>
-				<tr><td>build</td><td>Compiles the webapp components:
-					XMLBean schemas, controls, page flows, and web services.</td></tr>
-				<tr><td>scrub</td><td>Deletes the build directories and the test-related
-					directories.</td></tr>
-				<tr><td>clean</td><td>Deletes the build directories from the web app.</td></tr>
-				<tr><td>war</td><td>Builds a WAR file from the web app files.</td></tr>
-			</table>
-			</section>
-		</section>
-		<section id="running">
-			<title>Running the PetStore Sample on Tomcat 5</title>
-			<p>The following explains how to run the Petstore sample on Tomcat 5.  The Petstore sample
-				will run on other web containers, but we have chosen Tomcat 5 for convenience.</p>
-			<section id="set_up">
-				<title>To Set up the Environment</title>
+                for downloading Derby.</p>
+        <section id="dir_struct">
+            <title>Petstore Directory Structure</title>
+            <p>The table below describes the functions of the most important 
+                files in the Petstore web application.</p>
+            <table>
+                <tr>
+                    <th>Directory</th>
+                    <th>Description</th>
+                </tr>
+                <tr>
+                    <td>petstoreWeb</td>
+                    <td/>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;src</td>
+                    <td>This directory contains the back-end data and controls used by the web app.
+                        </td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;org</td>
+                    <td>
+                        </td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../controller/AccountController.java</td>
+                    <td>Class controls some of the internationalization settings for the site.</td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../controls</td>
+                    <td>Beehive Controls encapsulating different 
+                        functionalities, including handling user account data, 
+                        catalogue data, and order processing.</td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../forms</td>
+                    <td>Form Beans: each form bean is a server-side 
+                        representation of an HTML form appearing in the user 
+                        interface.</td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../model</td>
+                    <td>Java object classes (java beans) used to represent the basic 
+                        types in the app:
+                        addresses, orders, products, etc.</td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.../resources</td>
+                    <td>Various .properties files</td>
+                </tr>
+                <tr>
+                    <td>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sql</td>
+                    <td>A SQL file to initialize the database.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;test-src</td>
+                    <td>Java types used by the application's internal tests.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;web</td>
+                    <td>Contains the Page Flow web application modules.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;account</td>
+                    <td>Page Flow user interface for managing user accounts</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auth</td>
+                    <td>Page Flow user interface for managing login</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;checkout</td>
+                    <td>Page Flow user interface for managing the shopping 
+                        cart</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;search</td>
+                    <td>Page Flow user interface for searching the 
+                        Petstore</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;shop</td>
+                    <td>Page Flow user interface for browsing the catalogue of 
+                        pets</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;site</td>
+                    <td>Contains the Petstore "skin", including the CSS file, 
+                        HTML frameset, and template file</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;webappRoot</td>
+                    <td>
+                        <!--[todo]-->
+                    </td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;WEB-INF</td>
+                    <td>Contains configuration files for deployment, 
+                        validation, security (web.xml), and generated Struts config files.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tags</td>
+                    <td>Contains <code>.tag</code> files.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lib</td>
+                    <td>JAR resources -- this directory is created and populated when you call the ant target <code>deploy-beehive</code>.</td>
+                </tr>
+                <tr>
+                    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ws</td>
+                    <td>Contains the web service interface for the web app.</td>
+                </tr>
+            </table>
+        </section>
+        <section><title>Build Targets</title>
+             <p>The build file (located at <code>petstoreWeb/build.xml</code>) contains the following
+            build targets.</p>
+            <table>
+                <tr><th><strong>Target</strong></th><th><strong>Description</strong></th></tr>
+                <tr><td>deploy-beehive</td><td>Copies the Beehive runtime JARs into the webapp's
+                    WEB-INF/lib directory.</td></tr>
+                <tr><td>build</td><td>Compiles the webapp components:
+                    XMLBean schemas, controls, page flows, and web services.</td></tr>
+                <tr><td>scrub</td><td>Deletes the build directories and the test-related
+                    directories.</td></tr>
+                <tr><td>clean</td><td>Deletes the build directories from the web app.</td></tr>
+                <tr><td>war</td><td>Builds a WAR file from the web app files.</td></tr>
+            </table>
+            </section>
+        </section>
+        <section id="running">
+            <title>Running the PetStore Sample on Tomcat 5</title>
+            <p>The following explains how to run the Petstore sample on Tomcat 5.  The Petstore sample
+                will run on other web containers, but we have chosen Tomcat 5 for convenience.</p>
+            <section id="set_up">
+                <title>To Set up the Environment</title>
                 <p>Before proceeding, 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>Open a command shell and confirm that you have set following variables:</p>
-					<ul>
-						<li><code>ANT_HOME</code></li>
-						<li><code>JAVA_HOME</code></li>
-						<li><code>CATALINA_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>Download Derby Implementation</title>
-				<p>The Petstore app runs against an imbedded Derby database.  You must
-					download a Derby implementation before building and running the Petstore.</p>
-				<p>Download a Derby distribution at: <a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a></p>
-				
-			</section>
-			<section><title>(Optional) Dowload HTTPUnit Implementation</title>
-				<p>If you want to run the HTTPUnit tests associated with Petstore,
-					you must download a HTTPUnit implementation from: 
-					<a href="http://httpunit.sourceforge.net/">http://httpunit.sourceforge.net/</a></p></section>
-			<section id="copy_app">
-				<title>To Copy the Petstore Application to a Project 
-					Folder (Optional Step)</title>
-				<p>To keep your Beehive distribution directory 
-					pristine, you should copy the folder 
-					<code>&lt;BeehiveRoot>/samples/petstoreWeb</code> to another location before 
-					proceeding.</p>
+                    following topic: 
+                    <a class="fork" href="../setup.html">Beehive Installation and Setup</a></p>
+                <p>Open a command shell and confirm that you have set following variables:</p>
+                    <ul>
+                        <li><code>ANT_HOME</code></li>
+                        <li><code>JAVA_HOME</code></li>
+                        <li><code>CATALINA_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>Download Derby Implementation</title>
+                <p>The Petstore app runs against an imbedded Derby database.  You must
+                    download a Derby implementation before building and running the Petstore.</p>
+                <p>Download a Derby distribution at: <a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a></p>
+                
+            </section>
+            <section><title>(Optional) Dowload HTTPUnit Implementation</title>
+                <p>If you want to run the HTTPUnit tests associated with Petstore,
+                    you must download a HTTPUnit implementation from: 
+                    <a href="http://httpunit.sourceforge.net/">http://httpunit.sourceforge.net/</a></p></section>
+            <section id="copy_app">
+                <title>To Copy the Petstore Application to a Project 
+                    Folder (Optional Step)</title>
+                <p>To keep your Beehive distribution directory 
+                    pristine, you should copy the folder 
+                    <code>&lt;BeehiveRoot>/samples/petstoreWeb</code> to another location before 
+                    proceeding.</p>
 
-				<note>&lt;BeehiveRoot> refers to the top-level directory of your Beehive installation.
-					A typical value for &lt;BeehiveRoot> would be <code>C:/apache/apache-beehive-1.0</code>. </note>				 
-				<p>The following instructions assume that you have 
-					copied the folder <code>petstoreWeb</code> into the 
-					directory <code>C:/beehive_projects</code>, 
-					resulting in the following directory structure.</p>
-				<source>C:
+                <note>&lt;BeehiveRoot> refers to the top-level directory of your Beehive installation.
+                    A typical value for &lt;BeehiveRoot> would be <code>C:/apache/apache-beehive-1.0</code>. </note>                 
+                <p>The following instructions assume that you have 
+                    copied the folder <code>petstoreWeb</code> into the 
+                    directory <code>C:/beehive_projects</code>, 
+                    resulting in the following directory structure.</p>
+                <source>C:
   beehive_projects
     petstoreWeb</source>
-	<note>Strictly speaking, you do not need to copy the <code>petstoreWeb</code>
-		directory to another location.  If you wish to leave the <code>petstoreWeb</code> directory
-		in place, in the instructions below you must
-		replace occurrences of the path element <code>C:\beehive_projects</code>
-		with this path element: <code>&lt;BeehiveRoot>\samples</code>.
-		<br/><br/>
-		For example, to build the sample, run the following Ant command:
-		<br/><br/>
-		&nbsp;&nbsp;&nbsp;<code>ant -f &lt;BeehiveRoot>\samples\petstoreWeb\build.xml clean build war</code>
-		<br/><br/>
-		To delete the sample's build directory, run the <code>clean</code> target:
-		<br/><br/>
-		&nbsp;&nbsp;&nbsp;<code>ant -f &lt;BeehiveRoot>\samples\petstoreWeb\build.xml clean</code></note>
-			</section>
-			<section id="edit_properties_file"><title>Edit the <code>build.properties</code> File</title>
-				<p>Edit the <code>build.properties</code> file--the file
-					that sets the build-related properties for your web application.</p>
-				<p>Open the file <code>C:/beehive_projects/petstoreWeb/build.properties</code>
-					in a text editor.</p>
-				<p>At a minimum, you will need to edit the following two properties:</p>
-				<ul><li>beehive.home</li><li>derby.jar</li></ul>
-				<p>If you want to run the httpunit tests, you must set the following additional
-					property</p>
-				<ul><li>httpunit.dir</li></ul>
-					<p>The following example shows typical values for these three properties.
-					Note that the property <code>derby.jar</code> points to a JAR file, not
-					to a directory.</p>
+    <note>Strictly speaking, you do not need to copy the <code>petstoreWeb</code>
+        directory to another location.  If you wish to leave the <code>petstoreWeb</code> directory
+        in place, in the instructions below you must
+        replace occurrences of the path element <code>C:\beehive_projects</code>
+        with this path element: <code>&lt;BeehiveRoot>\samples</code>.
+        <br/><br/>
+        For example, to build the sample, run the following Ant command:
+        <br/><br/>
+        &nbsp;&nbsp;&nbsp;<code>ant -f &lt;BeehiveRoot>\samples\petstoreWeb\build.xml clean build war</code>
+        <br/><br/>
+        To delete the sample's build directory, run the <code>clean</code> target:
+        <br/><br/>
+        &nbsp;&nbsp;&nbsp;<code>ant -f &lt;BeehiveRoot>\samples\petstoreWeb\build.xml clean</code></note>
+            </section>
+            <section id="edit_properties_file"><title>Edit the <code>build.properties</code> File</title>
+                <p>Edit the <code>build.properties</code> file--the file
+                    that sets the build-related properties for your web application.</p>
+                <p>Open the file <code>C:/beehive_projects/petstoreWeb/build.properties</code>
+                    in a text editor.</p>
+                <p>At a minimum, you will need to edit the following two properties:</p>
+                <ul><li>beehive.home</li><li>derby.jar</li></ul>
+                <p>If you want to run the httpunit tests, you must set the following additional
+                    property</p>
+                <ul><li>httpunit.dir</li></ul>
+                    <p>The following example shows typical values for these three properties.
+                    Note that the property <code>derby.jar</code> points to a JAR file, not
+                    to a directory.</p>
 <source>beehive.home=<strong>C:/apache/apache-beehive-1.0</strong>
 
 context.path=petstoreWeb
@@ -253,45 +253,45 @@
 # Set this path in order to run HTTPUnit tests against the webapp
 httpunit.dir=<strong>C:/httpunit-1.6</strong></source>
 <note>Windows users must use forwardslashes (/) not backslashes (\) in the 
-	<code>build.properties</code> file.</note>
+    <code>build.properties</code> file.</note>
 
-					</section>
-			<section id="compile">
-				<title>To Compile the Petstore Application</title>
-				<p>To compile the Petstore app, enter the following Ant command:</p>
+                    </section>
+            <section id="compile">
+                <title>To Compile the Petstore Application</title>
+                <p>To compile the Petstore app, enter the following Ant command:</p>
 <source>ant -f C:\beehive_projects\petstoreWeb\build.xml clean build war
 </source>
 <p>A WAR file named <code>petstoreWeb.war</code> will be created at <code>C:/beehive_projects/petstoreWeb/petstoreWeb.war</code>.</p>
-			</section>
-			<section id="start_tomcat">
-				<title>To Start Tomcat</title>
-				<p>To start Tomcat, run the following command:</p>
-				<source>%CATALINA_HOME%\bin\startup.bat</source>
-			</section>
-			<section id="deploy">
-				<title>To Deploy to Tomcat</title>
-	<p>To deploy the web application, copy the WAR file to Tomcat's webapps directory.</p>
-	<source>copy C:\beehive_projects\petstoreWeb.war %CATALINA_HOME%\webapps /Y</source>
-	
-			</section>
-			<section id="running_url">
-				<title>Running Petstore</title>
-				<p>Visit the following URL:</p>
-				<p><a class="fork" href="http://localhost:8080/petstoreWeb">http://localhost:8080/petstoreWeb</a></p>
-			</section>
-		</section>
-			<section id="testing">
-				<title>Running the Petstore Tests</title>
-				<p>The Petstore app ships with associated junit tests.
-					Before running the tests, ensure that the web app is up and running, i.e,
-					accessible at http://localhost:8080/petstoreWeb.</p>
-				<p>To run the tests, enter the following Ant command:</p>
-				<source>ant -f C:\beehive_projects\petstoreWeb\build.xml test.run</source>
-			</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>
+            </section>
+            <section id="start_tomcat">
+                <title>To Start Tomcat</title>
+                <p>To start Tomcat, run the following command:</p>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
+            </section>
+            <section id="deploy">
+                <title>To Deploy to Tomcat</title>
+    <p>To deploy the web application, copy the WAR file to Tomcat's webapps directory.</p>
+    <source>copy C:\beehive_projects\petstoreWeb.war %CATALINA_HOME%\webapps /Y</source>
+    
+            </section>
+            <section id="running_url">
+                <title>Running Petstore</title>
+                <p>Visit the following URL:</p>
+                <p><a class="fork" href="http://localhost:8080/petstoreWeb">http://localhost:8080/petstoreWeb</a></p>
+            </section>
+        </section>
+            <section id="testing">
+                <title>Running the Petstore Tests</title>
+                <p>The Petstore app ships with associated junit tests.
+                    Before running the tests, ensure that the web app is up and running, i.e,
+                    accessible at http://localhost:8080/petstoreWeb.</p>
+                <p>To run the tests, enter the following Ant command:</p>
+                <source>ant -f C:\beehive_projects\petstoreWeb\build.xml test.run</source>
+            </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: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml Mon Aug 22 22:14:31 2005
@@ -52,12 +52,12 @@
             <supported_datatypes label="Supported Data Types" href="wsm/datatypes.html"/>
         </wsm>
         <samples label="Samples">
-            <sam_index label="Samples" href="samples/index.html"/>
+            <sam_index label="Overview" href="samples/index.html"/>
             <jpetstore label="Petstore" href="samples/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"/>
+            <address-wsdl label="Web Service: AddressBook from WSDL" href="wsm/sample_AddressBookFromWSDL.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"/>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejb-annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejb-annotations.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejb-annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejb-annotations.xml Mon Aug 22 22:14:31 2005
@@ -4,16 +4,13 @@
   <header>
     <title>Ejb Control Annotations</title>
   </header>
-	<body>
-		<section>
-			<title>Ejb Control Annotations</title>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/ejb/EJBControl.EJBHome.html">@EJBControl.EJBHome</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/ejb/EJBControl.JNDIContextEnv/EJBControl.JNDIContextEnv.html">@EJBControl.JNDIContextEnv</a></p>
-		</section>
-			</body>
-			<footer>
+    <body>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/ejb/EJBControl.EJBHome.html">@EJBControl.EJBHome</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/ejb/EJBControl.JNDIContextEnv/EJBControl.JNDIContextEnv.html">@EJBControl.JNDIContextEnv</a></p>
+        </body>
+    <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-	&copy; 2005, Apache Software Foundation
-	</legal>
+    &copy; 2005, Apache Software Foundation
+    </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml Mon Aug 22 22:14:31 2005
@@ -7,7 +7,6 @@
     <body>
         <section>
             <title>Overview</title>
-
             <p>The EJB Control is an extensible control, and you do not use it directly. To create an EJB control 
                     for an EJB, you would create a control extending the EJB Control. An extended EJB control can 
                     only represent one EJB, so you must create one for each EJB.
@@ -15,14 +14,13 @@
     </section>
     <section>
             <title>Extending the EJB control</title>
-
             <ol>
                     <li>Create a Java interface extending the appropriate EJB Control interface. If the EJB is a 
-                            session bean, you must extend org.apache.beehive.controls.system.ejb.SessionEJBControl, or if it is an
-                            entity bean, extend org.apache.beehive.controls.system.ejb.EntityEJBControl.</li>
+                            session bean, you must extend <code>org.apache.beehive.controls.system.ejb.SessionEJBControl</code>, or if it is an
+                            entity bean, extend <code>org.apache.beehive.controls.system.ejb.EntityEJBControl</code>.</li>
 
-                    <li>Annotate the Java interface with @ControlExtension 
-                            (org.apache.beehive.controls.api.bean.ControlExtension), so the Control Annotation 
+                    <li>Annotate the Java interface with <code>@ControlExtension</code>
+                            (<code>org.apache.beehive.controls.api.bean.ControlExtension</code>), so the Control Annotation 
                             Processor will know that the Java interface is a control extension.</li>
 
                     <li>Have the Java interface also extend the EJB's home and business interfaces. The 
@@ -30,17 +28,16 @@
 
                     <li>Specifiy how the EJB control should lookup the EJB. To lookup the EJB by its JNDI name, 
                             set the EJB control's @EJBHome.jndiName annotation to the EJB's JNDI name. To lookup 
-                            the EJB using an EJB link, set the EJB control's @EJBHome.ejbLink annotation to the name 
-                            of the EJB link. (see Annotation).</li>
+                            the EJB using an EJB link, set the EJB control's <code>@EJBHome.ejbLink</code> annotation to the name 
+                            of the EJB link.</li>
 
                     <li>If the EJB control uses JNDI to look up an EJB, you may optionally specify the JNDI context 
-                            environment properties using the @JNDIContextEnv annotation (see Annotation).</li>
+                            environment properties using the <code>@JNDIContextEnv</code> annotation (see Annotation).</li>
             </ol>
     </section>
     <section>
-            <title>EJB Control Extension Example</title>
-
-            <source>
+        <title>EJB Control Extension Example</title>
+        <source>
 package org.apache.beehive.controls.system.ejb.sample.control;
 
 import org.apache.beehive.controls.api.bean.ControlExtension;
@@ -51,16 +48,14 @@
 import org.apache.beehive.controls.system.ejb.sample.bean.HelloRemote;
 
 @ControlExtension
-@EJBHome(
-        jndiName="org.apache.beehive.controls.system.ejb.sample.HelloHome")
+@EJBHome(jndiName="org.apache.beehive.controls.system.ejb.sample.HelloHome")
 @JNDIContextEnv(
         contextFactory="weblogic.jndi.WLInitialContextFactory", 
         providerURL="t3://localhost:7001", 
         principal="weblogic", 
         credentials="weblogic")
 public interface HelloEJBControl
-	extends SessionEJBControl, HelloHome, HelloRemote
-{
+    extends SessionEJBControl, HelloHome, HelloRemote {
 }
             </source>
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/ejbDoc.xml Mon Aug 22 22:14:31 2005
@@ -5,98 +5,54 @@
         <title>EJB Control Overview</title>
     </header>
     <body>
-        <section>
-            <title>Overview</title>
-
             <p>The EJB control makes it easy for you to use an existing, deployed EJB from within an application 
                     by relieving you of all the preparatory work prior to invoking a method on an EJB's interface 
                     to perform tasks. The EJB control automatically manages locating and referencing the EJB 
                     instance, and directs method invocations to the correct instance of the target EJB.</p>
 
-            <p>Here is an example of the code required to invoke a single method on an exposed EJB using standard 
-                    J2EE APIs:</p>
+            <p>Here is an example of the code required to invoke a single method on an exposed EJB using standard J2EE APIs:</p>
 
             <source>
 Trader trader = null;
-try
-{
+try {
      InitialContext ic = new InitialContext();
      TraderHome home = (TraderHome)ic.lookup("MyTraderBean");
-     Trader trader = home.create();
+     trader = home.create();
      TradeResult tradeResult = trader.buy(stock, shares);
      return  tradeResult;
 }
-catch (NamingException ne) 
-{
+catch (NamingException e) {
      ...
 }
-catch (CreateException ce)
-{
+catch (CreateException e) {
      ...
 }
-catch (RemoteException re)
-{
+catch (RemoteException e) {
      ...
 }
-finally
-{
+finally {
     if (trader != null)
         trader.remove();
 }
             </source>
-
             <p>The code can be reduced to the following using the EJB Control:</p>
-
             <source>
 @Control
 TraderControlBean traderControl;
 
-try
-{
+try {
      TradeResult tradeResult = traderControl.buy(stock, shares);
      return  tradeResult;
 }
-catch (RemoteException re)
-{
+catch (RemoteException re) {
      ...
 }
-finally
-{
+finally {
     if (traderControl != null)
         traderControl.remove();
 }
             </source>
-
             <p>You can access EJBs on a different server with an EJB control, provided the server hosting 
-                    the EJB control and the server to which the target EJB is deployed are in the same domain.</p>
-        </section>
-        <section>
-                <title>Annotations</title>
-
-                <p>The EJB control contains the following TYPE/FIELD level annotation:</p>
-                <p><strong>@EJBHome</strong></p>
-
-                <p>Specifies the target EJB's home interface for the EJB control.</p>
-                <table>
-                        <tr><th>Attribute</th><th>Value</th><th>Description</th></tr>
-                        <tr><td>jndiName</td><td>String</td><td>Specifies the JNDI name of the target EJB's home interface (e.g. EJBNameHome) The JNDI name specified may be an URL using the JNDI protocol (e.g. jndi://username:password@host:7001/my.resource.jndi.object).</td></tr>
-
-                        <tr><td>ejbLink</td><td>String</td><td>Specifies the name of the target EJB using the application relative path to the EJB JAR. This syntax causes the runtime to use an application scoped name rather than a global JNDI name when locating the referenced EJB. The naming syntax is EJBJAR#BeanName (e.g. CustomerData.jar#CreditCard).</td></tr>
-                </table>
-
-                <p>Note: A value must be specified for exactly one of the attributes.</p>
-
-                <p><strong>@JNDIContextEnv</strong></p>
-                <p>Specifies the environment properties for the JNDI context that will be used to lookup the target EJB. This attribute is optional. If you are using an URL with the JNDI protocol or if you want to use a JNDI context with the default environment properties, you do not need to specify any values for this attribute.</p>
-
-                <table>
-                        <tr><th>Attribute</th><th>Value</th><th>Description</th></tr>
-                        <tr><td>contextFactory</td><td>String</td><td>Specifies the name of the initial context factory class (e.g. weblogic.jndi.WLInitialContextFactory)</td></tr>
-                        <tr><td>providerURL</td><td>String</td><td>Specifies the URL of the service provider (e.g. t3://localhost:7001)</td></tr>
-                        <tr><td>principal</td><td>String</td><td>Specifies the identity of the principal for authenticating the caller to the service (e.g. username)</td></tr>
-                        <tr><td>credentials</td><td>String</td><td>Specifies the credentials of the principal for authenticating the caller to the service (e.g. password)</td></tr>
-                </table>
-        </section> 
-
+               the EJB control and the server to which the target EJB is deployed are in the same domain.</p>
     </body>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbc-annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbc-annotations.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbc-annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbc-annotations.xml Mon Aug 22 22:14:31 2005
@@ -2,21 +2,18 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>Jdbc Control Annotations</title>
+    <title>JDBC Control Annotations</title>
   </header>
-	<body>
-		<section>
-			<title>Jdbc Control Annotations</title>
-                        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionDataSource.html">@JdbcControl.ConnectionDataSource</a></p>
-                        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionDriver.html">@JdbcControl.ConnectionDriver</a></p>
-                        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionOptions.html">@JdbcControl.ConnectionOptions</a></p>
-                        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.SQL.html">@JdbcControl.SQL</a></p>
-                        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.TypeMapper.html">@JdbcControl.TypeMapper</a></p>
-		</section>
-			</body>
-			<footer>
+    <body>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionDataSource.html">@JdbcControl.ConnectionDataSource</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionDriver.html">@JdbcControl.ConnectionDriver</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.ConnectionOptions.html">@JdbcControl.ConnectionOptions</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.SQL.html">@JdbcControl.SQL</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jdbc/JdbcControl.TypeMapper.html">@JdbcControl.TypeMapper</a></p>
+    </body>
+    <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-	&copy; 2005, Apache Software Foundation
-	</legal>
+               &copy; 2005, Apache Software Foundation
+        </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml Mon Aug 22 22:14:31 2005
@@ -87,11 +87,13 @@
  */ 
 @org.apache.beehive.controls.api.bean.ControlExtension
 @JdbcControl.ConnectionDataSource(jndiName="java:comp/env/jdbc/JdbcControlSampleDB")
-public interface SimpleDBControl extends JdbcControl
-{ 
+public interface SimpleDBControl 
+    extends JdbcControl { 
+   
+    static final long serialVersionUID = 1L;
+
+    public static class Product { 
 
-    static public class Product 
-    { 
         private String _name; 
         private String _description;
         private int _quantity; 
@@ -120,13 +122,9 @@
      */
     @JdbcControl.SQL(statement="SELECT * FROM products WHERE name={productName}")
     public Product getProductDetails(String productName) throws SQLException;
-   
-    static final long serialVersionUID = 1L;
 }
                 </source>
-
                 <p>The SimpleJdbcControl can be accessed from an application as follows:</p>
-
                 <source>
 public class Foo {
 
@@ -140,7 +138,6 @@
     }
 }
                 </source>
-
                 <p>Note the use of the @SQL method annotation in SimpleDBControl.java, see the JdbcControl Annotation Reference for 
                 additional information about the SQL annotation.</p>
             </section>
@@ -148,7 +145,6 @@
                 <title>SQL Parameter Substitution</title>
 
                 <p>It is also possible to substitute method parameter values into the statement member of the @SQL annotation:</p>
-
                 <source>
 //
 // simple query with param substitution
@@ -162,12 +158,9 @@
 @SQL(statement="SELECT * FROM USERS WHERE {sql: where}")
 public ResultSet getJustOneUser(String where) throws SQLException;
                 </source>
-
-
                 <p>For the first method, the value of the parameter 'someUserId' gets substituted into the SQL statement at 
                 runtime when the getSomeUser() method is invoked.  For the second method, the substitution gets added to the 
                 SQL statement as the literal value of the 'where' parameter.</p>
-
             </section>
     </section>
     </body>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jms-annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jms-annotations.xml?rev=239347&r1=239346&r2=239347&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jms-annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/jms-annotations.xml Mon Aug 22 22:14:31 2005
@@ -4,24 +4,21 @@
   <header>
     <title>JMS Control Annotations</title>
   </header>
-	<body>
-		<section>
-			<title>JMS Control Annotations</title>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.CorrelationId.html">@JMSControl.CorrelationId</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Delivery.html">@JMSControl.Delivery</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Destination.html">@JMSControl.Destination</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Expiration.html">@JMSControl.Expiration</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Message.html">@JMSControl.Message</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Priority.html">@JMSControl.Priority</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Properties.html">@JMSControl.Properties</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Property.html">@JMSControl.Property</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.PropertyValue.html">@JMSControl.PropertyValue</a></p>
-			<p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Type.html">@JMSControl.Type</a></p>
-		</section>
-			</body>
-			<footer>
+    <body>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.CorrelationId.html">@JMSControl.CorrelationId</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Delivery.html">@JMSControl.Delivery</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Destination.html">@JMSControl.Destination</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Expiration.html">@JMSControl.Expiration</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Message.html">@JMSControl.Message</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Priority.html">@JMSControl.Priority</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Properties.html">@JMSControl.Properties</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Property.html">@JMSControl.Property</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.PropertyValue.html">@JMSControl.PropertyValue</a></p>
+        <p><a href="../../apidocs/classref_systemcontrols/org/apache/beehive/controls/system/jms/JMSControl.Type.html">@JMSControl.Type</a></p>
+    </body>
+    <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-	&copy; 2005, Apache Software Foundation
-	</legal>
+               &copy; 2005, Apache Software Foundation
+        </legal>
     </footer>
 </document>