Author: steveh
Date: Wed Mar 23 16:13:24 2005
New Revision: 158854

URL: http://svn.apache.org/viewcvs?view=rev&rev=158854
Log:
(1) Latest content to data grid topic.
(2) General beta content.

Added:
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid1.gif
   (with props)
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid2.gif
   (with props)
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid3.gif
   (with props)
Modified:
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/docs/index.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/samples/index.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
    
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
 Wed Mar 23 16:13:24 2005
@@ -58,7 +58,7 @@
                        </section>
                        <section id="make_proj">
                                <title>To Make a Control Project Folder</title>
-                               <p>In this task you will make a web application 
project folder. 
+                               <p>In this task you will make a control project 
folder. 
                                        </p>
                                <p>On your C: drive, create a directory called 
                                        
<strong><code>beehive_projects</code></strong>.</p>
@@ -73,7 +73,9 @@
                                        structure exists:</p>
                                <source>C:
   beehive_projects
-    controls_tutorial</source>
+    controls_tutorial
+      src
+      build.xml</source>
                        </section>
             <section id="make_test_enviro">
                 <title>To Create a Web Application Test Environment</title>
@@ -94,30 +96,24 @@
       Controller.jpf
       error.jsp
       index.jsp</source>
-            </section>
-            <section id="copy_JARs">
-                <title>To Copy Runtime JARs to the Web Application</title>
-                <p>In this step you will assemble the runtime resources for 
your web application.  
-                                       The runtime JARs include the Page Flow 
runtime, the &lt;netui> tag library, etc. 
-                                       These resources are loaded into your 
project's <code>WEB-INF/lib</code> folder 
-                                       using the Ant command below.</p>
-                <p>At the command prompt, enter the following Ant command:</p>
-                <source>ant 
-  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-  -Dwebapp.dir=C:\beehive_projects\controls_tutorial_test 
-  deploy.beehive.webapp.runtime
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=C:\beehive_projects\controls_tutorial_test 
deploy.beehive.webapp.runtime</source>
-                <p>Before proceeding, confirm that the following directory 
structure exists:</p>
-<source>C:
-  beehive_projects
-    controls_tutorial_test
-      WEB-INF
-        lib
-          [many JAR files]</source>
-         </section>
+                               <p>In this section you will edit the 
<code>build.properties</code> file--the file
+                                       that sets the build-related properties 
for your test environment.</p>
+                               <p>Open the file 
<code>C:/beehive_projects/controls_tutorial_test/WEB-INF/src/build.properties</code>
+                                       in a text editor.</p>
+                               <p>Edit the <code>beehive.home</code> property 
points to the 
+                                       top-level folder of your beehive 
installation.</p>  
+                               <p>Add the line 
<strong><code>contextPath=controls_tutorial_test</code></strong> (as shown 
below).</p>
+                               <p>For example, if your beehive installation
+                                       resides at 
<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>
+<strong>contextPath=controls_tutorial_test</strong>
 
+servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+</source>
+         
+            </section>
                        <section id="start_tomcat">
                                <title>To Start the Tomcat Server</title>
                                <p>At the command prompt, enter:</p>
@@ -185,7 +181,8 @@
                        -->
                                <section id="examine"><title>To Examine the 
Template Control Files</title>
                        <p>Open the file 
<code>C:/beehive_projects/controls_tutorial/src/pkg/HelloImpl.jcs</code>.</p>
-                       <p>[todo: more here]</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;
 
 import org.apache.beehive.controls.api.bean.*;
@@ -199,7 +196,8 @@
     }
 }</source>
 <p>Open the file 
<code>C:/beehive_projects/controls_tutorial/src/pkg/Hello.java</code>.</p>
-<p>[todo: more here]</p>
+                       <p>The interface file appears as follows. (There is no 
need to edit the file at 
+                               this point in the tutorial.)</p>
 <source>package pkg;
 
 import org.apache.beehive.controls.api.bean.*;
@@ -259,17 +257,18 @@
 <strong>Copy and Paste version:</strong>  
 copy C:\beehive_projects\controls_tutorial\build\mycontrols.jar 
C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 </source>
-       <p>To deploy the web application (with the control imbedded in it), 
click the following link. We 
-               recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/controls_tutorial_test&amp;war=file:C:/beehive_projects/controls_tutorial_test&amp;update=true";>http://localhost:8080/manager/deploy?path=/controls_tutorial_test&amp;war=file:C:/beehive_projects/controls_tutorial_test&amp;update=true</a>
-       </p>
-       <p>If you are prompted for a username/password, enter: 
manager/manager</p>
-       <p>(For an explanation of this method of deploying an application to 
Tomcat, 
-               see the Tomcat 5 documentation: 
-               <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>
+                <p>You are now ready to compile the test environment and 
deploy it to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\controls_tutorial_test\WEB-INF\src\build.xml
+  clean
+  build
+  war
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\controls_tutorial_test\WEB-INF\src\build.xml clean 
build war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's 
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\controls_tutorial_test.war 
%CATALINA_HOME%\webapps</source>
             </section>
             <section id="test_2">
                 <title>To Test the Control</title>
@@ -361,17 +360,18 @@
 <strong>Copy and Paste version:</strong>  
 copy C:\beehive_projects\controls_tutorial\build\mycontrols.jar 
C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 </source>
-       <p>To deploy the web application (with the control imbedded in it), 
click the following link. We 
-               recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/controls_tutorial_test&amp;war=file:C:/beehive_projects/controls_tutorial_test&amp;update=true";>http://localhost:8080/manager/deploy?path=/controls_tutorial_test&amp;war=file:C:/beehive_projects/controls_tutorial_test&amp;update=true</a>
-       </p>
-       <p>If you are prompted for a username/password, enter: 
manager/manager</p>
-       <p>(For an explanation of this method of deploying an application to 
Tomcat, 
-               see the Tomcat 5 documentation: 
-               <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>
+                <p>You are now ready to compile the test environment and 
deploy it to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\controls_tutorial_test\WEB-INF\src\build.xml
+  clean
+  build
+  war
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\controls_tutorial_test\WEB-INF\src\build.xml clean 
build war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's 
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\controls_tutorial_test.war 
%CATALINA_HOME%\webapps</source>
             </section>
             <section id="test_3">
                 <title>To Test the Control</title>

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/docs/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/docs/index.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/docs/index.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/docs/index.xml
 Wed Mar 23 16:13:24 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
"http://forrest.apache.org/dtd/document-v20.dtd";>
 <document>
     <header>
-        <title>Beehive Documentation</title>
+        <title>Beehive 1.0 Beta Documentation</title>
     </header>
     <body>
         <p>Beehive documetation contains documentation for all three Beehive 
sub-projects: Controls, 

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
 Wed Mar 23 16:13:24 2005
@@ -41,12 +41,142 @@
                        <p>The remainder of this topic concentrates on using 
the &lt;netui-data:xxx>
                                tab library to handle data sets.</p>
         </section>
+               <section id="setup_basic_grid"><title>Setting Up a Basic 
Grid</title>
+                       <p>This section takes you through a step by step 
process of setting up a basic grid
+                               for 'tabular' data, data such as a ResultSet, 
RowSet, or any kind of data
+                               that can easily be set out like table with rows 
and columns.</p>
+                       <p>(1) The first thing needed to set up a grid, is a 
data source of some tabular data.
+                               Below we use the jpetstoreWeb's data as the 
source 
+                               of tabluar data.  Begin by running through the 
set up instructions for the <a href="site:jpetstore">jpetstoreWeb</a> 
+                               Sample.  In the following steps will add a data 
grid to the jpetstoreWeb.
+                               </p>
+                       <p>(2) Next edit the <code>viewCategory()</code> method 
of the 
+                               file 
<code>petstoreWeb/shop/Controller.jpf</code> as 
+                               follows.  Code to edit is shown in bold.</p>
+                               
<p><strong><code>petstoreWeb/shop/Controller.jpf</code></strong></p>
+<source>    @Jpf.Action(
+        forwards = { 
+            @Jpf.Forward(name = "category", path = 
"<strong>categoryGrid.jsp</strong>",
+                         actionOutputs = { 
+                             @Jpf.ActionOutput(name = "category",
+                                               type = 
org.apache.beehive.samples.petstore.model.Category.class,
+                                               required = true),
+                             @Jpf.ActionOutput(name = "products",
+                                               type = 
org.apache.beehive.samples.petstore.model.Product[].class,
+                                               required = false)
+                         })
+        }
+    )
+    protected Forward viewCategory() {
+    ...
+    }
+       
+</source>
+                               <p>(3) Add a page called 
<code>categoryGrid.jsp</code> to the folder <code>petstoreWeb\shop\</code>.
+                                       Edit the file so it appears as 
follows.</p>
+                               
<p><strong><code>petstoreWeb/shop/categoryGrid.jsp</code></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"%>
+
+&lt;netui-data:declarePageInput name="products" 
type="org.apache.beehive.samples.petstore.model.Product[]" 
required="false"/></source>
+                <p>You now have an action method (<code>viewCategory()</code>) 
that sends 
+                                       tabular data to a JSP page 
(<code>categoryGrid.jsp</code>).  The 
+                                       tabular data is available through the 
databinding context 
+                                               
<code>pageInput.products</code>.  In the next step you will 
+                                               point a data grid at this 
databinding context.  </p>
+                               <p>(4) Before proceeding, recompile 
jpetstoreWeb and visit the following URL.</p>
+                               
<source>http://localhost:8080/petstoreWeb/shop/rootSharedFlow.globalViewCategory.do?catId=FISH</source>
+                               <p>You should see a blank page.</p>
+                                         <p>The recompile step is necessary
+                                       because you have modified the 
Controller.jpf file.  In the steps below,
+                                       where you only modify the JSP page 
<code>categoryGrid.jsp</code>, 
+                                       you will not need to recompile the 
jpetstoreWeb app.</p>
+                               <p>(4) Edit <code>categoryGrid.jsp</code> so it 
appears as follows.</p>
+                               
<p><strong><code>petstoreWeb/shop/Controller.jpf</code></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"%>
+
+&lt;netui-data:declarePageInput name="products" 
type="org.apache.beehive.samples.petstore.model.Product[]" required="false"/>
+
+<strong>&lt;netui-data:dataGrid name="productsGrid" 
dataSource="pageInput.products">
+    &lt;netui-data:rows>
+        &lt;netui-data:spanCell value="${container.item.productId}" />
+         &lt;netui-data:spanCell value="${container.item.name}" />
+         &lt;netui-data:spanCell value="${container.item.description}"/>
+    &lt;/netui-data:rows>
+&lt;/netui-data:dataGrid></strong>
+</source>                              
+<p>When you visit the URL</p>
+<source>http://localhost:8080/petstoreWeb/shop/rootSharedFlow.globalViewCategory.do?catId=FISH</source>
+<p>you should see the following page</p>
+<p><img alt="categoryGrid1" src="images/categoryGrid1.gif"/></p>
+<p>Notice that the tabular data is passed to the data grid 
(&lt;netui-data:dataGrid>) 
+       through the <code>dataSource</code> attribute:</p>
+<source>&lt;netui-data:dataGrid name="productsGrid" 
dataSource="pageInput.products"></source>
+<p>The tabular data is rendered as an HTML table, by the remaining tags 
+       (&lt;netui-data:rows> and &lt;netui-data:spanCell).  <!--[todo: more 
description here]--></p>
+<p> <strong>(5) Adding a Header</strong></p>
+<p>Edit <code>categoryGrid.jsp</code> so it appears as follows.</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;netui-data:declarePageInput 
+   name="products" 
+   type="org.apache.beehive.samples.petstore.model.Product[]" 
+   required="false"/>
+
+&lt;netui-data:dataGrid name="productsGrid" dataSource="pageInput.products">
+    <strong>&lt;netui-data:header>
+        &lt;netui-data:headerCell headerText="PetID"/>
+        &lt;netui-data:headerCell headerText="Name"/>
+        &lt;netui-data:headerCell headerText="Description"/>
+    &lt;/netui-data:header></strong>
+    &lt;netui-data:rows>
+        &lt;netui-data:spanCell value="${container.item.productId}" />
+        &lt;netui-data:spanCell value="${container.item.name}" />
+        &lt;netui-data:spanCell value="${container.item.description}"/>
+    &lt;/netui-data:rows>
+&lt;/netui-data:dataGrid></source>
+<p>Refresh the browser.  You should see the following page.</p>
+<p><img alt="categoryGrid2" src="images/categoryGrid2.gif"></img></p>
+<p><strong>(6) Configure the Pager</strong></p>
+<p>Edit <code>categoryGrid.jsp</code> so it appears as follows.</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;netui-data:declarePageInput 
+   name="products" 
+   type="org.apache.beehive.samples.petstore.model.Product[]" 
+   required="false"/>
+
+&lt;netui-data:dataGrid name="productsGrid" dataSource="pageInput.products">
+    <strong>&lt;netui-data:configurePager pageSize="3" pagerFormat="prevNext" 
pageAction="viewCategory.do"/></strong>
+    &lt;netui-data:header>
+        &lt;netui-data:headerCell headerText="PetID"/>
+        &lt;netui-data:headerCell headerText="Name"/>
+        &lt;netui-data:headerCell headerText="Description"/>
+    &lt;/netui-data:header>
+    &lt;netui-data:rows>
+        &lt;netui-data:spanCell value="${container.item.productId}" />
+        &lt;netui-data:spanCell value="${container.item.name}" />
+        &lt;netui-data:spanCell value="${container.item.description}"/>
+    &lt;/netui-data:rows>
+&lt;/netui-data:dataGrid></source>
+<p>Refresh the browser.  You will see the following page.</p>
+<p><img alt="categoryGrid3" src="images/categoryGrid3.gif"/></p>
+                       </section>
         <section id="pager">
             <title>The &lt;netui-data:pager> Tag</title>
+                       <p>[todo]</p>
         </section>
         <section id="filtering">
             <title>Filtering a Data Grid</title>
-       <p>A filter is specified using three bits of information -- the filter 
expression, 
+       <p>[todo]</p>
+               <!--<p>A filter is specified using three bits of information - 
the filter expression, 
                the filter operation, and the filter value.  The filter 
expression is specified 
                as an attribute on a grid's header cell and is used to loosely 
couple the filetr 
                information for the header from the data displayed in the 
header.  </p>
@@ -56,11 +186,12 @@
        <p>converts into the SQL filter</p>  
        <source>WHERE symbol = beas</source>
        <p>Filters are added to the URL using JavaScript to convert an HTML 
form from the 
-               input fields into query parameters in the above format. </p>
+               input fields into query parameters in the above format. </p>-->
         </section>
         <section id="sorting">
             <title>Sorting a Data Grid</title>
-<p>A sort is specified using two bits of information -- the sort expression 
and the sort 
+                       <p>[todo]</p>
+<!--<p>A sort is specified using two bits of information - the sort expression 
and the sort 
        direction.  The sort expression is specified as an attribute on a 
grid's header cell 
        and is used to loosely couple the sort information for the header from 
the data displayed 
        in the header.  A sort appears in the URL as:</p>
@@ -81,9 +212,9 @@
        <li>no sort > ascending</li>
        <li>ascending > descending</li>
        <li>descending > no sort</li>
-</ul>
+</ul>-->
         </section>
-               <section id="sample_code">
+<!--           <section id="sample_code">
                        <title>Sample Code</title>
                        
                        <p><strong>carDB.java</strong></p>
@@ -221,6 +352,6 @@
         &lt;/blockquote>
     &lt;/netui-template:section>
 &lt;/netui-template:template></source>
-               </section>
+               </section>-->
 </body>
 </document>

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 Wed Mar 23 16:13:24 2005
@@ -38,6 +38,27 @@
                                                
<li><code>JAVA_HOME/bin</code></li>
                                        </ul>
                        </section>
+            <section id="make_proj">
+                <title>Make a Project Folder</title>
+                <p>On your C: drive, create a directory named 
<code>beehive_projects</code>.</p>
+                <p>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 installation; a 
typical value might be 
+                                       
<code>C:/apache/apache-beehive-1.0</code>.)</p>
+                               <p>Rename the folder 
+                                       
<code>C:/beehive_projects/</code><strong><code>netui-blank</code></strong> to 
the name 
+                                       
<code>C:/beehive_projects/</code><strong><code>pageflow_tutorial</code></strong></p>
+                               <p>Before proceeding, confirm that the 
following directory structure exists:</p>
+                <source>C:
+  beehive_projects
+    pageflow_tutorial
+      resources
+      WEB-INF
+      Controller.jpf
+      error.jsp
+      index.jsp</source>
+            </section>
+                       
                        <section id="edit_properties_file"><title>Edit the 
<code>build.properties</code> File</title>
                                <p>In this section you will edit the 
<code>build.properties</code> file--the file
                                        that sets the build-related properties 
for your web application.</p>
@@ -45,17 +66,16 @@
                                        in a text editor.</p>
                                <p>Edit the <code>beehive.home</code> property 
points to the 
                                        top-level folder of your beehive 
installation.</p>  
-                               <p>Edit the <code>context.path</code> property 
so it has the value <code>pageflow_tutorial</code>.
-                                       (See the example below.)</p>
-                               <p>For example, if you beehive installation
+                               <p>Add the line 
<strong><code>contextPath=pageflow_tutorial</code></strong> (as shown 
below).</p>
+                               <p>For example, if your beehive installation
                                        resides at 
<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>
+<strong>contextPath=pageflow_tutorial</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>pageflow_tutorial</strong></source>
+</source>
                                        </section>
             <section id="start_tomcat">
                 <title>To Start the Tomcat Server</title>
@@ -93,24 +113,6 @@
                                step, you will create a more complex Action 
method.
                                </p>
             </section>
-            <section id="make_proj">
-                <title>Make a Project Folder</title>
-                <p>On your C: drive, create a directory named 
<code>beehive_projects</code>.</p>
-                <p>Copy the folder 
<code>BEEHIVE_HOME/samples/netui-blank</code> into 
-                                       <code>C:/beehive_projects</code>.</p>
-                               <p>Rename the folder 
-                                       
<code>C:/beehive_projects/</code><strong><code>netui-blank</code></strong> to 
the name 
-                                       
<code>C:/beehive_projects/</code><strong><code>pageflow_tutorial</code></strong></p>
-                               <p>Before proceeding, confirm that the 
following directory structure exists:</p>
-                <source>C:
-  beehive_projects
-    pageflow_tutorial
-      resources
-      WEB-INF
-      Controller.jpf
-      error.jsp
-      index.jsp</source>
-            </section>
 <!--            <section id="copy_JARs">
                 <title>To Copy Runtime JARs to the Project Folder</title>
                 <p>In this step you will assemble the runtime resources for 
your Page Flow application.  
@@ -209,23 +211,6 @@
 ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml clean build 
war</source>
 <p>To deploy the application, copy the WAR file into Tomcat's 
<code>webapps</code> directory.</p>
 <source>copy C:\beehive_projects\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
-       <!--    <p>To deploy the web application, click the following link.  We 
recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true</a>
-       </p>
-       <p>If you are prompted for a username/password, enter: 
<code>manager/manager</code></p>
-       <p>(For an explanation of this method of deploying an application to 
Tomcat, 
-               see the Tomcat 5 documentation: 
-               <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>    
-    <p>And alternative build/deploy cycle is shown below.</p>
-       <p>cd to the directory 
<code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src</code></p>
-    <p>To build an application WAR file, run the following Ant command.</p>
-    <source>ant build war -DcontextPath=pageflow_tutorial</source>     
-       <p>To deploy the WAR file to Tomcat, move it into Tomcat's 
<code>webapps</code> directory.</p>
-       <source>copy ..\..\..\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
--->
                        </section>
             <section id="test_2">
                 <title>To Test the Page Flow Web Application</title>
@@ -326,23 +311,6 @@
 <source>copy C:\beehive_projects\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
 <p>If you are asked to overwrite the old WAR file, enter 'Yes'.</p>
 <p>Wait a few seconds for Tomcat to redeploy the WAR file, then move on to the 
next step.</p>
-       <!--    <p>To deploy the web application, click the following link.  We 
recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true</a>
-       </p>
-       <p>If you are prompted for a username/password, enter: 
<code>manager/manager</code></p>
-       <p>(For an explanation of this method of deploying an application to 
Tomcat, 
-               see the Tomcat 5 documentation: 
-               <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>    
-    <p>And alternative build/deploy cycle is shown below.</p>
-       <p>cd to the directory 
<code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src</code></p>
-    <p>To build an application WAR file, run the following Ant command.</p>
-    <source>ant build war -DcontextPath=pageflow_tutorial</source>     
-       <p>To deploy the WAR file to Tomcat, move it into Tomcat's 
<code>webapps</code> directory.</p>
-       <source>copy ..\..\..\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
--->
                        </section>
             <section id="test_3">
                 <title>To Test the Page Flow Web Application</title>
@@ -480,18 +448,21 @@
             </section>
             <section id="compile_redeploy">
                 <title>To Compile and Redeploy the Page Flow</title>
+                <p>You are now ready to compile the Page Flow and deploy it to 
Tomcat.</p>
                 <p>At the command prompt, enter:</p>
 <source>ant 
   -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+  clean
   build
+  war
 
 <strong>Copy and Paste version:</strong>
-ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml 
build</source>
-       <p>To deploy the web application, click the following link. (Or, if you 
have the link below
-               open in a dedicated browser window, refresh that browser 
window.)</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
-       </p></section>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml clean build 
war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's 
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
+<p>If you are asked to overwrite the old WAR file, enter 'Yes'.</p>
+<p>Wait a few seconds for Tomcat to redeploy the WAR file, then move on to the 
next step.</p>
+</section>
            <section id="test">
                 <title>To Test the Page Flow Web Application</title>
                 <p>Visit the following link: 
@@ -558,18 +529,21 @@
             </section>
             <section id="compile_5">
                 <title>To Compile and Redeploy the Page Flow</title>
+                <p>You are now ready to compile the Page Flow and deploy it to 
Tomcat.</p>
                 <p>At the command prompt, enter:</p>
 <source>ant 
   -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+  clean
   build
+  war
 
 <strong>Copy and Paste version:</strong>
-ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml 
build</source>
-       <p>To deploy the web application, click the following link. (Or, if you 
have the link below
-               open in a dedicated browser window, refresh that browser 
window.)</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
-       </p></section>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml clean build 
war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's 
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\pageflow_tutorial.war 
%CATALINA_HOME%\webapps</source>
+<p>If you are asked to overwrite the old WAR file, enter 'Yes'.</p>
+<p>Wait a few seconds for Tomcat to redeploy the WAR file, then move on to the 
next step.</p>
+</section>
             <section>
                 <title>To Test the Page Flow Web Application</title>
                 <p>Visit the following link: 

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/samples/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/samples/index.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/samples/index.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/samples/index.xml
 Wed Mar 23 16:13:24 2005
@@ -16,16 +16,19 @@
                                <a href="../jpetstore.html">Beehive Sample: 
Petstore</a>
                        </li>
                        <li>
+                               <a 
href="../controls/sample_controls-db.html">Database Control 
+                                       Sample</a>
+                       </li>
+                       <!--<li>
                                <a href="../wsm/sample_Dashboard.html">Beehive 
Web Service 
                                        Sample: Petstore Dashboard</a>
-                       </li>
+                       </li>-->
                        <li>
                                <a 
href="../wsm/sample_AddressBook.html">Beehive AddressBookWS 
-                                       and EmployeeWS Samples</a>
+                                       and EnhancedAddressBookWS Samples</a>
                        </li>
                        <li>
-                               <a 
href="../controls/sample_controls-db.html">Database Control 
-                                       Sample</a>
+                               <a href="site:wsm-samples">Web Service 
Annotation Samples</a>
                        </li>
                </ul>
                <p>

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
 Wed Mar 23 16:13:24 2005
@@ -33,53 +33,38 @@
                        </section>
                        <section id="edit_properties_file"><title>Edit the 
<code>build.properties</code> File</title>
                                <p>In this section you will 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/WEB-INF/src/build.properties</code>
+                                       that sets the build-related properties 
for your web service.</p>
+                               <p>Open the file 
<code>&lt;Project-Folder>/WEB-INF/src/build.properties</code>
                                        in a text editor.</p>
-                               <p>Edit the file so that the 
<code>beehive.home</code> property points to the 
-                                       top-level folder of your beehive 
installation.  For example, if you beehive installation
+                               <p>Edit the <code>beehive.home</code> property 
points to the 
+                                       top-level folder of your beehive 
installation.</p>  
+                               <p>Add the line 
<strong><code>service.name=&lt;SomeContext></code></strong> (as shown 
below).</p>
+                               <p>For example, if your beehive installation
                                        resides at 
<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
-
-contextPath=<strong>myWebService</strong></source>
+<strong>service.name=&lt;SomeContext></strong></source>
+<p><strong>Note:</strong> the value of &lt;SomeContext> will determine (1) the 
name of the WAR file 
+       produced when the web service is compiled and the (2) part of the URL 
used by Tomcat to
+       access the web service.</p>  
+               <p>The WAR file will be named 
<code>&lt;SomeContext>WS.war</code></p>
+               <p>The URL will be 
<code>http://localhost:8080/&lt;SomeContext>/</code></p>
                                        </section>                      
-                       <section><title>Build the Template Web App</title>
-                               <p>To build the template web service, run the 
following Ant command.</p>
+                       <section><title>Build and Deploy the Template Web 
App</title>
+                               <p>To build the template web service and deploy 
it the resulting WAR file, run the following Ant command.</p>
+                               <p>The following command assumes that you are 
using Tomcat server.</p>
 <source>ant 
-  -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml 
-  -Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong>
-  clean
-  build
-  war
-
-<strong>Copy and paste version:</strong>
+  -f &lt;Project-Folder>WEB-INF\build.xml
+  -Dto.dir=%CATALINA_HOME%\webapps 
+  clean 
+  build 
+  deploy
 
-ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml 
-Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong> clean build war
-</source>
+<strong>Copy and Paste version:</strong>
+ant -f &lt;Project-Folder>\WEB-INF\build.xml -Dto.dir=%CATALINA_HOME%\webapps 
clean build deploy</source>
 </section>
                        <section>
-                               <title>To Deploy and Run the Template Web 
Service</title>
-                               <p>Before deploying the web service, ensure 
that Tomcat is turned on.</p>
-<source>%CATALINA_HOME%\bin\startup.bat</source>                               
-<!--   <p>To deploy the web service, visit the following URL in a web browser. 
 (We recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.)</p>
-       <p>In the URL below, replace <strong>&lt;SomeContext></strong> with 
some string that is appropriate for 
-your web service.
-               Replace <strong>&lt;Path-to-Project-Folder></strong> with the 
path to your project folder.</p>  
-    <p class="quote">
-         
http://localhost:8080/manager/deploy?path=/<strong>&lt;SomeContext></strong>&amp;war=file:<strong>&lt;Path-to-Project-Folder></strong>&amp;update=true
-       </p>
-       <p>This method of application deployment assumes that you have added 
the <code>manager</code>
-               role to your Tomcat installation.  For instructions on adding 
the <code>manager</code> role, 
-               see <a class="fork" href="../setup.html#optional">Beehive 
Installation and Setup</a>.</p>
-       <p>If you are prompted for a username/password, enter: 
<code>manager/manager</code></p>-->
-<p>To deploy the web service to Tomcat, copy the WAR file to Tomcat's 
<code>webapps</code> directory.</p>
-<source>copy C:\beehive_projects\netui-blank.war 
%CATALINA_HOME%\webapps</source>
+                               <title>To Run the Template Web Service</title>
                                <p>You can now try out the web service by 
pointing your browser at 
                                        the following link.</p>
                                <ul>

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml?view=diff&r1=158853&r2=158854
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 Wed Mar 23 16:13:24 2005
@@ -39,18 +39,6 @@
                                                
<li><code>JAVA_HOME/bin</code></li>
                                        </ul>
             </section>
-            <section id="start_tomcat">
-                <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: Install the Web Service Template</title>
-            <!--<section>
-                <title>Introduction</title>
-                <p>[todo]</p>
-            </section>-->
             <section id="make_project">
                 <title>To Make a Project Folder Using the Web Service 
Application Template</title>
                 <p>On your C: drive, create a directory called 
<code>beehive_projects</code>.</p>
@@ -66,18 +54,34 @@
       happyaxis.jsp
       index.html</source>
             </section>
-            <section id="copy_JARs">
-                <title>To Copy Runtime JARs into the Project Folder</title>
-       <p>At the command prompt, enter the following ant command.</p>          
                
-       <source>ant 
-  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-  -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  deploy.wsm.webapp.runtime
-
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=C:\beehive_projects\ws_tutorial deploy.wsm.webapp.runtime</source>
-            </section>
-            <section id="examine_JWS">
+                       <section id="edit_properties_file"><title>Edit the 
<code>build.properties</code> File</title>
+                               <p>In this section you will edit the 
<code>build.properties</code> file--the file
+                                       that sets the build-related properties 
for your web service application.</p>
+                               <p>Open the file 
<code>C:/beehive_projects/ws_tutorial/WEB-INF/build.properties</code>
+                                       in a text editor.</p>
+                               <p>Edit the <code>beehive.home</code> property 
points to the 
+                                       top-level folder of your beehive 
installation.</p>  
+                               <p>Add the line 
<strong><code>service.name=tutorial</code></strong> (as shown below).</p>
+                               <p>For example, if your beehive installation
+                                       resides at 
<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>
+<strong>service.name=tutorial</strong></source>
+                                       </section>
+                       
+            <section id="start_tomcat">
+                <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: Run the Web Service Template</title>
+            <!--<section>
+                <title>Introduction</title>
+                <p>[todo]</p>
+            </section>-->
+             <section id="examine_JWS">
                 <title>To Examine the Blank.jws Web Service</title>
                 <p>You are now ready to compile and run the template web 
service already included
                                        in the project folder--but before we 
run the web service, let's first look at the code.</p>
@@ -98,24 +102,22 @@
                 <source>package web;
 ...
 import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
 
-<strong>@WebService</strong>
-public class Blank
-{
-    <strong>@WebMethod</strong>
-    public String 
sayHelloWorld(<strong>@WebParam</strong>(name="name",header=true) String s)
-    {
[EMAIL PROTECTED]
+public class Blank {
+
+    @WebMethod
+    public String sayHelloWorld(String s) {
         return "Hello world, " + s + "!";
     }
-}</source>
+}
+</source>
 <p>If you are familiar with Java code, everything probably looks familiar to 
you, 
        although these two elements may be new:</p>
 <source>
     @WebService
     @WebMethod
-    @WebParam
 </source>
 <p><code>@WebService</code>, <code>@WebMethod</code>, and 
<code>@WebParam</code> are "metadata annotations", a.k.a. "annotations".  
        Annotations allow you to set properties on Java classes and methods.  
They can be used to generate 
@@ -126,37 +128,27 @@
        that Blank is a web service that listens for SOAP messages and responds 
in kind.</p>  
                <p><code>@WebMethod</code> annotates the method 
sayHelloWorld(): this tells the runtime that the 
                method can be invoked over the web.</p>
-               <p><code>@WebParam</code> tells the runtime that the 
<code>sayHelloWorld()</code> method
+               <!--<p><code>@WebParam</code> tells the runtime that the 
<code>sayHelloWorld()</code> method
                accepts a parameter.  (Note that the parameter is only an OUT 
parameter.  We will 
-               add an IN parameter, and explain the difference between OUT and 
IN parameters, in a future step.)</p>
+               add an IN parameter, and explain the difference between OUT and 
IN parameters, in a future step.)</p>-->
             </section>
             <section id="compile_2">
                 <title>To Compile and Deploy the Web Service</title>
-                <p>In this step you will compile the web service and deploy it 
to Tomcat.</p>
-                <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
-       <p>To deploy the web service, click the following link. 
-               </p>
-               <p>We recommend that you open the 
-               link in a new browser window.  Each time you want to redeploy 
the application,
-               simply refresh the browser.  
-               (Also, make sure that your Tomcat server is running, or the 
following step will fail.)</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true</a>
-       </p>
-       <p>If you are prompted for a username/password, enter: 
<strong>manager/manager</strong></p>
-       <p>(For an explanation of this method of deploying an application to 
Tomcat, 
-               see the Tomcat 5 documentation: 
-               <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>
+                <p>You are now ready to compile the web service and deploy it 
to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
+  -Dto.dir=%CATALINA_HOME%\webapps 
+  clean 
+  build 
+  deploy
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml 
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
             </section>
             <section id="run_2">
                 <title>To Run the Web Service</title>
-                <p>Visit the index.jsp page: <a class="fork"  
href="http://localhost:8080/ws_tutorial/index.html";>http://localhost:8080/ws_tutorial/index.html</a>.</p>
+                <p>Visit the index.jsp page: <a class="fork"  
href="http://localhost:8080/tutorialWS/index.html";>http://localhost:8080/tutorialWS/index.html</a>.</p>
                 <p>Click the "Validate" link for an evaluation of the 
resources available to your web service.  Note that you will need to download 
additional resources to take full advantage of Beehive web services.  For 
example, for Axis to work properly with SOAP attachments, additional, external 
jars (activation.jar and mailapi.jar) are required.  You will download those 
resources in later steps in the tutorial.</p>
                 <p>Click the "WSDL" link to see the web service's WSDL. </p>
                 <p>Click the "sayHelloWorld()" link to see a SOAP response 
from the web service's sayHelloWorld() method.</p>
@@ -173,18 +165,17 @@
 <source>package web;
 ...
 import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
+<strong>import javax.jws.WebParam;</strong>
 
 @WebService
-public class Blank
-{
+public class Blank {
+
     @WebMethod
-    public String sayHelloWorld(@WebParam(name="name",header=true) String s)
-    {
+    public String sayHelloWorld(String s) {
         return "Hello world, " + s + "!";
     }
-    
+
     <strong>@WebMethod
     public String sayHelloWorldInParam( @WebParam String greetee ) 
     {
@@ -193,30 +184,28 @@
     
         return "Hello, " + greetee + "!";
     }</strong> 
-}</source>
+}
+</source>
 <p>The <code>@WebParam</code> you just added lets you pass a String parameter 
to the method over the web.</p>
             </section>
             <section id="compile_3">
                 <title>To Compile and Redeploy the Web Service</title>
-                 <p>At the command prompt, enter the following Ant command.</p>
-                <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
-       <p>To redeploy the web service, click the following link. 
-               (Or, if you have the link below
-               open in a dedicated browser window, refresh that browser 
window.)</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true</a>
-       </p>
+                <p>To compile the web service and deploy it to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
+  -Dto.dir=%CATALINA_HOME%\webapps 
+  clean 
+  build 
+  deploy
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml 
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
             </section>
             <section id="test_3">
                 <title>To Test the Parameterized Method</title>
                 <p>Enter the following URL in the address bar of your browser. 
</p>
-                <p><a class="fork"  
href="http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon";>http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon</a></p>
+                <p><a class="fork"  
href="http://localhost:8080/tutorialWS/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon";>http://localhost:8080/tutorialWS/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon</a></p>
                 <p>The following SOAP response appears in the browser:</p>
                 <source><![CDATA[<soapenv:Envelope>
   <soapenv:Body>
@@ -235,18 +224,17 @@
 <source>package web;
 ...
 import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
+import javax.jws.WebParam;
 
 @WebService
-public class Blank
-{
+public class Blank {
+
     @WebMethod
-    public String sayHelloWorld(@WebParam(name="name",header=true) String s)
-    {
+    public String sayHelloWorld(String s) {
         return "Hello world, " + s + "!";
     }
-    
+
     @WebMethod
     public String sayHelloWorldInParam( @WebParam String greetee ) 
     {
@@ -254,7 +242,7 @@
             { greetee = "World"; }
     
         return "Hello, " + greetee + "!";
-    }
+    }  
 
     <strong>public String sayNothingOverTheWeb()
     {
@@ -266,25 +254,22 @@
 </section>
             <section id="compile_4">
                 <title>To Compile and Redeploy the Web Service</title>
-                 <p>At the command prompt, enter the following Ant command.</p>
-                <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
-       <p>To redeploy the web service, click the following link. 
-               (Or, if you have the link below
-               open in a dedicated browser window, refresh that browser 
window.)</p>  
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true</a>
-       </p>
+                <p>To compile the web service and deploy it to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
+  -Dto.dir=%CATALINA_HOME%\webapps 
+  clean 
+  build 
+  deploy
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml 
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
             </section>
             <section id="test_4">
                 <title>To Test the Non-Web Invokable Method</title>
                 <p>Enter the following URL in the address bar of your browser. 
</p>
-                <p><a class="fork"  
href="http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayNothingOverTheWeb";>http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayNothingOverTheWeb</a></p>
+                <p><a class="fork"  
href="http://localhost:8080/tutorialWS/web/Blank.jws?method=sayNothingOverTheWeb";>http://localhost:8080/tutorialWS/web/Blank.jws?method=sayNothingOverTheWeb</a></p>
                 <p>The following SOAP response appears in the browser, 
indicating that the method sayNothingOverTheWeb() cannot be invoked through the 
web service (although it can be called by other methods within the web 
service).</p>
                 <source><![CDATA[<soapenv:Envelope>
   <soapenv:Body>
@@ -338,25 +323,22 @@
 </section>
             <section id="compile_5">
                 <title>To Compile and Redeploy the Web Service</title>
-                 <p>At the command prompt, enter the following Ant command.</p>
-                <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
-       <p>To redeploy the web service, click the following link. 
-               (Or, if you have the link below
-               open in a dedicated browser window, refresh that browser 
window.)</p>
-    <p class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true";>http://localhost:8080/manager/deploy?path=/ws_tutorial&amp;war=file:C:/beehive_projects/ws_tutorial&amp;update=true</a>
-       </p>                
+                <p>To compile the web service and deploy it to Tomcat.</p>
+                <p>At the command prompt, enter:</p>
+<source>ant 
+  -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
+  -Dto.dir=%CATALINA_HOME%\webapps 
+  clean 
+  build 
+  deploy
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml 
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
             </section>
             <section id="test_5">
                 <title>To Test the SOAP-encoded Style</title>
                 <p>Enter the following URL in the address bar of your browser. 
</p>
-                <p><a class="fork"  
href="http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon";>http://localhost:8080/ws_tutorial/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon</a></p>
+                <p><a class="fork"  
href="http://localhost:8080/tutorialWS/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon";>http://localhost:8080/tutorialWS/web/Blank.jws?method=sayHelloWorldInParam&amp;greetee=Moon</a></p>
                 <p>The following SOAP response appears in the browser. Compare 
the RPC style below with the DOC style above.</p>
                 <source><![CDATA[<soapenv:Envelope>
   <soapenv:Body>

Added: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid1.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid1.gif?view=auto&rev=158854
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid1.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid2.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid2.gif?view=auto&rev=158854
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid2.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid3.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid3.gif?view=auto&rev=158854
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/resources/images/categoryGrid3.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream


Reply via email to