Added: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml?view=auto&rev=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
 (added)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
 Fri Mar 18 10:31:07 2005
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+       "http://forrest.apache.org/dtd/document-v20.dtd";>
+<document>
+       <header>
+               <title>Popup Windows</title>
+       </header>
+       <body>
+               <section id="intro">
+                       <title>Introduction</title>
+                   <p>The following topic explains how to collect data from a 
nested page flow and 'return'
+                               the data to the nesting/main page flow.  The 
nested page flow 
+                               can appear as a popup window if so desired.</p>
+                       
+               </section>
+               <section id="single_pageflow">
+                       <title>Submit/Display Cycle in a Single Page 
Flow</title>
+                       <p>Before we get to nested page flows and popup 
windows, lets first take a look at the 
+                               basic page flow submission cycle.  Below is a 
diagram of the basic cycle.</p>
+                       <p><img src="images/nested_1.png" 
alt="singlepageflow"/></p>
+<p>Below is the code for the basic cycle: (1) <code>index.jsp</code> contains 
the form for 
+       collecting data, (2) the submission is handled by the method 
<code>submit()</code>,
+       and (3) the submitted data is displayed by <code>results.jsp</code>.</p>
+<p><strong>index.jsp</strong></p>
+       <source>    &lt;netui:form action="submit">
+      Name:            &lt;netui:textBox dataSource="actionForm.name"/>
+      Favorite Color:  &lt;netui:textBox dataSource="actionForm.color"/>
+      &lt;br/>
+      &lt;netui:button type="submit" value="submit"/>
+    &lt;/netui:form></source>
+                               <p><strong>Controller.jpf</strong></p>
+                       <source>...
+                               
[EMAIL PROTECTED](
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    }
+)
+public class Controller 
+    extends PageFlowController
+{
+
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(
+                name = "success",
+                path = "results.jsp"
+            )
+        }
+    )
+    protected Forward submit(SubmitForm form)
+    {
+        return new Forward("success", "form", form );
+    }
+
+    public static class SubmitForm extends FormData
+    {
+        private String _name;
+        private String _color;
+
+        public String getName()
+        {
+            return _name;
+        }
+
+        public void setName(String value)
+        {
+            _name = value;
+        }
+
+        public String getColor()
+        {
+            return _color;
+        }
+
+        public void setColor(String value)
+        {
+            _color = value;
+        }
+    }
+}</source>
+<p><strong>results.jsp</strong></p>
+<source>    Submitted Name: ${pageInput.form.name}
+    &lt;br/>
+    Submitted Color: ${pageInput.form.color}
+    &lt;br/>
+    &lt;br/>
+    &lt;netui:anchor action="begin">[start over]&lt;/netui:anchor></source>
+               </section>
+               <section id="nesting_nested_pageflows">
+                       <title>Submit/Display Cycle with Nested Page 
Flow</title>
+                       <p>In this section we introduce a nested page flow to 
help collect data from the user.</p>
+                       <p>When the user clicks the "get color" button (see the 
<code>index.jsp</code>
+                               page below), an instance of a nested page flow 
is created (GetColor.jpf).
+                               When the user submits the form within the 
nested page flow, the data is 'returned'
+                               to populate the form within the main/nesting 
page flow.</p>
+                               <p>The diagram below shows how the user moves 
into the nested page flow, and 
+                                       then back into the main/nesting page 
flow.</p>
+                       <p><img alt="nested_2" src="images/nested_2.png"/></p>
+                       <p>The code for the main and nested page flow follows. 
<!--[todo: more description of 
+                               this code]--></p>
+                       <p><strong>index.jsp</strong></p>
+                       <source>    &lt;netui:form action="submit">
+      Name:            &lt;netui:textBox dataSource="actionForm.name"/>
+      Favorite Color:  &lt;netui:textBox dataSource="actionForm.color"/>
+      &lt;br/>
+      <strong>&lt;netui:button type="submit" value="get color" 
action="getColor"/></strong>
+      &lt;netui:button type="submit" value="submit"/>
+    &lt;/netui:form></source>
+<p><strong>Controller.jpf</strong></p>
+<source>...
+
+public class Controller 
+    extends PageFlowController
+{
+
+    ...
+
+    <strong>/**
+     * This action forwards to the nested page flow to gather the favorite 
color.
+     */
+    protected Forward getColor(SubmitForm form)
+    {
+        return new Forward("getColorFlow");
+    }
+
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(
+                name="success",
+                navigateTo=Jpf.NavigateTo.currentPage
+            )
+        }
+    )
+    protected Forward colorSuccess( String color )
+    {
+        SubmitForm previousForm = ( SubmitForm ) getPreviousFormBean();
+        previousForm.setColor( color );
+        return new Forward( "success", previousForm );
+    }</strong>
+
+    ...
+
+}</source>
+<p><strong>results.jsp</strong></p>
+<source>[unchanged from above]</source>
+<p><strong>getColor/index.jsp</strong></p>
+<source>      &lt;netui:form action="submitColor">
+        Color:&lt;br/>
+          &lt;netui:select dataSource="actionForm.color" size="5">
+            &lt;netui:selectOption value="red" />
+            &lt;netui:selectOption value="blue" />
+            &lt;netui:selectOption value="green" />
+            &lt;netui:selectOption value="yellow" />
+            &lt;netui:selectOption value="orange" />
+          &lt;/netui:select>
+        &lt;br/>&nbsp;
+        &lt;netui:button type="submit" value="submit"/>
+      &lt;/netui:form></source>
+<p><strong>getColor/GetColor.jpf</strong></p>
+<source>package getColor;
+
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.struts.action.ActionMapping;
+import org.apache.beehive.netui.pageflow.FormData;
+
+
[EMAIL PROTECTED](
+    nested=true,
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    }
+)
+public class GetColor extends PageFlowController
+{
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(
+                name="done", 
+                returnAction="colorSuccess",
+                outputFormBeanType=String.class)
+        }
+    )
+    protected Forward submitColor( ColorForm form )
+    {
+        return new Forward( "done", form.getColor() );
+    }
+
+    public static class ColorForm extends FormData
+    {
+        private String _color;
+
+        public String getColor()
+        {
+            return _color;
+        }
+
+        public void setColor(String value)
+        {
+            _color = value;
+        }
+    }
+}</source>
+               </section>
+               <section id="popups">
+                       <title>Submit/Display Cycle with Nested Page Flow 
(Popup Window Enabled)</title>
+            <p>This section explains how to make the nested page flow appear 
as a popup window.</p> 
+<section id="popup_attribute"><title>The Popup Attribute</title>
+       <p>If you want your nested page flow to run inside a popup window set 
the popup attribute to "true"
+</p>
+<source>      &lt;netui:button type="submit" value="Pick Color" 
action="getColor" <strong>popup="true"</strong>>
+          &lt;netui:configurePopup location="false" width="550" height="150">
+          &lt;/netui:configurePopup>
+      &lt;/netui:button></source>
+
+<p>This attribute is legal on all tags that can raise an action, except for <a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/imageButton.html">&lt;netui:imageButton></a>.
+</p>
+<ol>
+       <li><a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/anchor.html">&lt;netui:anchor></a></li>
+       <li><a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/imageAnchor.html">&lt;netui:imageAnchor></a></li>
+       <li><a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/button.html">&lt;netui:button></a></li>
+       <li><a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/area.html">&lt;netui:area></a></li>
+       </ol>
+<p>Note - <a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/imageButton.html">&lt;netui:imageButton></a>
 should be used for submitting a form *without* javascript.</p>
+</section>
+       <section id="configurePopupTag"><title>The 
&lt;netui:configurePopupTag></title>
+       <p>Use the <a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/configurePopup.html">&lt;netui:configurePopup></a>
+       tag to determine the shape of the popup window.</p>
+       <source>      &lt;netui:button type="submit" value="Pick Color" 
action="getColor" popup="true">
+          <strong>&lt;netui:configurePopup location="false" width="550" 
height="150">
+          &lt;/netui:configurePopup></strong>
+      &lt;/netui:button></source>
+               </section>
+               <section id="retrievePopupOutputTag"><title>The 
&lt;netui:retrievePopupOutput</title>
+                       <p>To access values returned by the nested page flow 
use the <a 
href="../apidocs/taglib/beehive.apache.org/netui/tags-html-1.0/retrievePopupOutput.html">&lt;netui:retrievePopupOutput></a>
 tag,
+for example,</p>
+                       <source>&lt;netui:retrievePopupOutput 
dataSource="outputFormBean.zipCode" tagIdRef="zipCodeField"/></source>
+                       <p>Include multiple instances of the tag to set 
multiple fields.</p>
+                       <p><strong>Note</strong> - the 
&lt;netui:retrievePopupOutput> tag must be nested inside 
+                               the &lt;netui:configurePopup> tag even if the 
&lt;netui:configurePopup> tag has no attributes</p>
+                       <p>The &lt;netui:configurePopup> tag has two 
attributes, <code>dataSource</code>
+                               and <code>tagIdRef</code>, both of which are 
required.  Both accept expressions that
+                               can be evaluated at runtime.</p>
+                       <p><strong>Note</strong> - 
'<code>outputFormBean</code>' is a special binding context 
+                               that applies in this situation.  It is the 
"return value" of the nested page 
+                               flow: It receives the value generated by the 
'outputFormBean' 
+                               (or 'outputFormBeanType') in the returnAction 
forward from the nested page flow. 
+                               This binding context is only legal when used in 
the &lt;netui:retrievePopupOutput> tag.</p>
+                       </section>
+                       <section id="_auto"><title>The <code>_auto</code> 
Global Forward</title>
+                               <p>If you are returning data from the nested 
flow it is passed as a bean to 
+                                       the action in the nesting page flow, 
for example</p>
+                               <source>        @Jpf.Action()
+        public Forward nestedPageFlowGotZip(ZipForm zipForm)
+        {
+            return new Forward("_auto");
+        }</source>
+               <p>Here is what the code looks like in the nested page flow</p> 
+<source>        @Jpf.Action(
+            forwards={
+                @Jpf.Forward(name="success",
+                             returnAction="nestedPageFlowGotZip", 
+                             outputFormBeanType=ZipForm.class
+                )
+            }
+        )
+        public Forward done()
+        {
+            ZipForm returnForm = new ZipCodeForm();
+            returnForm.setZipCode("12345");     // pretend we got this through 
user input
+            return new Forward("success", new ZipForm( "12345" ));
+        }</source>
+               <p>
+The bean returned to the nesting flow is accessed in the page using the 
special data binding 
+context, <code>outputFormBean</code></p>
+               
+                               
+                                       </section>
+       </section>
+       </body>
+</document>
\ No newline at end of file

Propchange: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml?view=diff&r1=158118&r2=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
 Fri Mar 18 10:31:07 2005
@@ -22,53 +22,85 @@
                                required and optional steps in the Beehive set 
up procedure at 
                                <a href="site:../setup">Installation and 
Setup</a>.</p>
                        <p>To use the template, follow these steps:</p>
-                       <section id="copy">
+                       <section id="copy_rename">
                                <title>Copy and Rename the Template 
Folder</title>
                                <p>Copy the folder 
                                        
<code>BEEHIVE_HOME/samples/netui-blank</code> to your 
-                                       development directory. </p>
+                                       development directory. Below we assume 
that you have copied <code>netui-blank</code> into the 
+                                       folder 
<strong><code>C:/myDevelopmentDirectory</code></strong>.</p>
+                               
<source>C:/myDevelopmentDirectory/netui-blank</source>
                                <p>Rename <code>netui-blank</code> to something 
more 
-                                       appropriate to your application. Below 
we assume that the path to
-                                       the renamed <code>netui-blank</code> is 
-                                       
<strong><code>&lt;Project-Folder></code></strong>. </p>
-                       </section>
-                       <section id="copy_runtime">
+                                       appropriate to your application. Below 
we assume that <code>netui-blank</code> has been 
+                                       renamed as 
<strong><code>myWebApplication</code></strong>. </p>
+                               
<source>C:/myDevelopmentDirectory/myWebApplication</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>
+                               <p>Open the file 
<code>C:/myDevelopmentDirectory/myWebApplication/WEB-INF/src/build.properties</code>
+                                       in a text editor.</p>
+                               <p>Edit the <code>beehive.home</code> property 
so that it points to the 
+                                       top-level folder of your beehive 
installation.
+                               </p>
+                               <p>Edit the <code>context.path</code> property 
to some value that is appropriate to your 
+                                       web application.</p>
+                               <p>  For example, if you beehive installation
+                                       resides at 
<code>C:/apache/apache-beehive-1.0</code>, then your 
<code>build.properties</code> file
+                                       would appear as follows.</p>
+                               <p><strong>Note:</strong> the value of 
<code>&lt;SomeContext></code> will determine the 
+                                       app's URL address.</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>&lt;SomeContext></strong></source>
+                                       </section>
+                       
+                       <!--
+                               <section id="copy_runtime">
                                <title>Copy the Runtime JARs into the Template 
Folder</title>
                                <p>Copy the runtime JARs to the project's 
WEB-INF/lib 
                                        directory.</p>
                                <p>The following Ant command will copy the 
necessary runtime 
                                        and tag library JARs to 
-                                       
<code>&lt;Project-Folder>/WEB-INF/lib</code>.</p>
-<source>ant -f 
-  %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-  -Dwebapp.dir=<strong>&lt;Project-Folder></strong>
-  deploy.beehive.webapp.runtime
-
-<strong>Copy and paste version:</strong>  
-
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=<strong>&lt;Project-Folder></strong> 
deploy.beehive.webapp.runtime</source>
+                                       
<code>C:/myDevelopmentDirectory/myWebApplication/WEB-INF/lib</code>.</p>
+                <source>ant 
+  -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
+  deploy-beehive
+  
+<strong>Copy and Paste version:</strong>
+ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml 
deploy-beehive</source>
                        </section>
-                       <section><title>Build the Template Web App</title>
-                               <p>To build the web app, run the following Ant 
command.</p>
+                       -->
+                       <section id="build"><title>Build the Template Web 
App</title>
+                               <p>To build the web app, run the following Ant 
command.  This Ant command will delete
+                                       any build artifacts in the 
<code>classes</code> directory, compile the web application 
+                                       source, and archive the result as a WAR 
file.  The WAR file will be saved at 
+                                       
<code>C:/myDevelopmentmentDirectory/</code>.  The name of the WAR file will
+                                       be 
<code>&lt;SomeContext>.war</code>.</p>
 <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=<strong>&lt;Project-Folder></strong>
+  -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
+  clean
   build
+  war
 
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=<strong>&lt;Project-Folder></strong> build</source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml clean 
build war</source>
 </section>
-                       <section>
+                       <section id="deploy_run">
                                <title>To Deploy and Run the Template Web 
App</title>
                                <p>Before deploying the application, ensure 
that Tomcat is turned on.</p>
 <source>%CATALINA_HOME%\bin\startup.bat</source>                               
-       <p>To deploy the web application, visit the following URL in a web 
browser.  (We recommend that you open the 
+       <p>To deploy the web application copy the applcation WAR file to 
Tomcat's <code>webapps</code> dir.</p>
+       <source>copy C:\webDevelopementDirectory\&lt;SomeContext>.war 
%CATALINA_HOME%\webapps</source>
+               
+       <!--<p>, 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
                application.  This string will appear in the URL when users 
visit your application.
-               Replace <strong>&lt;Project-Folder></strong> with the path to 
your project folder.</p>  
+               Replace <strong>&lt;Project-Folder></strong> with the path to 
your project folder (e.g., 
<code>C:/myDevelopmentDirectory/myWebApplication</code>).</p>  
     <p class="quote">
          
http://localhost:8080/manager/deploy?path=/<strong>&lt;SomeContext></strong>&amp;war=file:<strong>&lt;Project-Folder></strong>&amp;update=true
        </p>
@@ -76,6 +108,7 @@
                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>You can now try out the web app by pointing 
your browser at 
                                        the following link.</p>
                                <ul>

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=158118&r2=158119
==============================================================================
--- 
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
 Fri Mar 18 10:31:07 2005
@@ -7,7 +7,7 @@
     <body>
         <section id="intro">
             <title>Introduction</title>
-            <section>
+            <section id="goals">
                 <title>Tutorial Goals</title>
                 <p>In this tutorial, you will learn:</p>
                 <ul>
@@ -28,7 +28,6 @@
                                <p>Open a command shell and confirm that you 
have the following variables 
                                        have been set:</p>
                                        <ul>
-                                               
<li><code>BEEHIVE_HOME</code></li>
                                                <li><code>ANT_HOME</code></li>
                                                <li><code>JAVA_HOME</code></li>
                                                
<li><code>CATALINA_HOME</code></li>
@@ -39,6 +38,25 @@
                                                
<li><code>JAVA_HOME/bin</code></li>
                                        </ul>
                        </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/pageflow_tutorial/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>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
+                                       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
+
+context.path=<strong>pageflow_tutorial</strong></source>
+                                       </section>
             <section id="start_tomcat">
                 <title>To Start the Tomcat Server</title>
                 <p>At the command prompt, enter:</p>
@@ -93,7 +111,7 @@
       error.jsp
       index.jsp</source>
             </section>
-            <section id="copy_JARs">
+<!--            <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.  
                                        The runtime JARs include the Page Flow 
runtime, the &lt;netui> tag library, etc. 
@@ -101,12 +119,11 @@
                                        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\pageflow_tutorial 
-  deploy.beehive.webapp.runtime
+  -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+  deploy-beehive
   
 <strong>Copy and Paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
deploy.beehive.webapp.runtime</source>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml 
deploy-beehive</source>
                 <p>Before proceeding, confirm that the following directory 
structure exists:</p>
 <source>C:
   beehive_projects
@@ -114,7 +131,7 @@
       WEB-INF
         lib
           [many JAR files]</source>
-         </section>
+         </section>-->
             <section id="examine">
                 <title>To Examine the <code>Controller.jpf</code> and 
<code>index.jsp</code> Files</title>
                 <p>There are no edits to make in this step.  The point of this 
step is 
@@ -183,13 +200,16 @@
                 <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 %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
+  -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+  clean
   build
+  war
 
 <strong>Copy and Paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
-       <p>To deploy the web application, click the following link.  We 
recommend that you open the 
+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">
@@ -199,7 +219,14 @@
        <p>(For an explanation of this method of deploying an application to 
Tomcat, 
                see the Tomcat 5 documentation: 
                <a class="fork" 
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
 A New Application from a Local Path</a>)</p>    
-            </section>
+    <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>
                 <p>Visit the following address:</p> 
@@ -281,26 +308,46 @@
 {
     ...
 }</source>
-            </section>
             <p>Save <code>Controller.jpf</code>.</p>
+            </section>
             <section id="compile_3">
-                <title>To Compile and Redeploy the Page Flow</title>
+                <title>To Compile and Deploy 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 %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
+  -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+  clean
   build
+  war
 
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 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>  
+<strong>Copy and Paste version:</strong>
+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>
+       <!--    <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/control_tutorial&amp;update=true</a>
-       </p></section>
+         <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>
-                <p>Visit the following link: 
+                
+                               <p>Visit the following link: 
                 </p>
                 <p><a class="fork" 
href="http://localhost:8080/pageflow_tutorial";>http://localhost:8080/pageflow_tutorial</a></p>
                 <p>You will be directed to the index.jsp page.</p>
@@ -435,13 +482,11 @@
                 <title>To Compile and Redeploy the Page Flow</title>
                 <p>At the command prompt, enter:</p>
 <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
+  -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
   build
 
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
+<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">
@@ -515,13 +560,11 @@
                 <title>To Compile and Redeploy the Page Flow</title>
                 <p>At the command prompt, enter:</p>
 <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
+  -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
   build
 
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build  </source>
+<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">

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/setup.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/setup.xml?view=diff&r1=158118&r2=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/setup.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/setup.xml
 Fri Mar 18 10:31:07 2005
@@ -7,8 +7,8 @@
        </header>
        <body>
                <p>This topic explains how to install a Beehive distribution on 
your 
-                       machine. The instructions below are divided into (1) 
basic stetup steps 
-                       and tutorial-specific steps.</p>
+                       machine. The instructions below are divided into (1) 
basic setup steps 
+                       and (2) tutorial-specific steps.</p>
                        <p>
                         Once you have completed the basic setup steps, 
                        you can begin developing Beehive applications. You only 
need to 

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/site.xml?view=diff&r1=158118&r2=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/site.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/site.xml
 Fri Mar 18 10:31:07 2005
@@ -17,9 +17,12 @@
             <pageflow_overview label="Overview" 
href="pageflow/pageflow_overview.html"/>
             <pageflow_controllers label="Controller Files" 
href="pageflow/pageflow_controllers.html"/>
             <pageflow_jsp label="JSP Files" href="pageflow/pageflow_jsp.html"/>
+            <pageflow_databinding label="Databinding" 
href="pageflow/pageflow_databinding.html"/>
             <pageflow_building label="Building a Web-App" 
href="pageflow/pageflow_building.html"/>
             <pageflow_altering label="Altering a Page Flow" 
href="pageflow/pageflow_altering.html"/>
+            <pageflow_sharedFlow label="Using Data Grids" 
href="pageflow/pageflow_datagrid.html"/>
             <pageflow_sharedFlow label="Shared Flow" 
href="pageflow/sharedFlow.html"/>
+            <pageflow_popups label="Popup Windows" 
href="pageflow/popupWindows.html"/>
             <pageflow_programming label="Page Flow Programming" 
href="pageflow/guide.html"/>
         </pageflow>
         <controls label="Controls">
@@ -37,8 +40,8 @@
         <samples label="Samples">
             <sam_index label="Samples" href="samples/index.html"/>
             <jpetstore label="Petstore" href="jpetstore.html"/>
-            <dash label="Petstore Dashboard" href="wsm/sample_Dashboard.html"/>
-            <address label="AddressBook/Employee" 
href="wsm/sample_AddressBook.html"/>
+            <!--<dash label="Petstore Dashboard" 
href="wsm/sample_Dashboard.html"/>-->
+            <address label="AddressBook" href="wsm/sample_AddressBook.html"/>
             <db label="Database Control" 
href="controls/sample_controls-db.html"/>
             <control-blank label="Page Flow Project" 
href="pageflow/sample_netui-blank.html"/>
             <control-blank label="Control Project" 
href="controls/sample_controls-blank.html"/>
@@ -52,7 +55,7 @@
             <netui label="Page Flows">
                 <netui_taglib label="&lt;netui> Tags" 
href="apidocs/taglib/index.html"/>
                 <netui_annotations label="@Jpf Annotations" 
href="pageflow/jpf-annotations/pageflow_annotations.html"/>
-                <netui_config label="netui-config.xml" 
href="pageflow/config/netui-config.html"/>
+                <netui_config label="beehive-netui-config.xml" 
href="pageflow/config/beehive-netui-config.html"/>
                 <netui_api label="Page Flow Javadoc" 
href="apidocs/classref_pageflows/index.html"/>
             </netui>
             <ws label="Web Services">

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml?view=diff&r1=158118&r2=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
 Fri Mar 18 10:31:07 2005
@@ -3,44 +3,44 @@
        "http://forrest.apache.org/dtd/document-v20.dtd";>
 <document>
        <header>
-               <title>Beehive AddressBookWS and EmployeeWS Samples</title>
+               <title>Beehive AddressBookWSSample</title>
        </header>
        <body>
                <section id="intro">
-                       <title>The AddressBookWS and EmployeeWS Samples</title>
+                       <title>The AddressBookWS Sample</title>
                        <p>The <strong>AddressBookWS</strong> sample is an 
annotation-aware 
                                web service based on the Apache Axis sample of 
the same name. 
                                AddressBookWS is organized as an application 
with POJO (Plain 
                                Old Java Objects) models, service interface, 
service 
                                implementation, and unit tests for the service. 
Apache Axis 
                                provides automatic client-generation and junit 
test cases for 
-                               the sample. The directory structure and ant 
build file can be 
+                               the sample. The directory structure and Ant 
build file can be 
                                used as a template for building new standalone 
web services.</p>
-                       <p><strong>EmployeeWS</strong> provides a web service 
interface for 
+                       <!--<p><strong>EmployeeWS</strong> provides a web 
service interface for 
                                an Employee database. Using SOAP messages, the 
web service 
                                queries the backend database: selecting, 
updating and inserting 
                                employee data. A Beehive database control 
connects the web 
                                service and the database. The web service class 
is located at 
-                               <code>EmployeeWS/WEB-INF/src/web/Service. 
jws</code>. The 
+                               
<code>EmployeeWS/WEB-INF/src/web/Service.jws</code>. The 
                                database control is located at 
                                
<code>EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</code>.
 
                                Note that EmployeeDBControl is a subclass of 
DatabaseControl, 
                                another Beehive sample. For more information 
see <a 
                                
href="../controls/sample_controls-db.html">Database 
-                               Control</a>. </p>
-                       <p>Apache Derby supplies the database implementation. 
(Installing 
-                               Derby requires a simple JAR file download, 
described below.) 
+                               Control</a>. </p>-->
+                       <p><!--Apache Derby supplies the database 
implementation. (Installing 
+                               Derby requires a simple JAR file download, 
described below.)--> 
                                Apache Axis provides the automatic 
client-generation for the 
                                web service. Custom unit tests are provided to 
exercise the 
-                               webservice methods. The unit tests creates the 
database table, 
-                               inserts a new record, queries the database, and 
finally drops 
+                               webservice methods. The unit tests create the 
database table, 
+                               insert new records, query the database, and 
finally drop 
                                the table. Use the junit tests as a template 
for building 
                                automatic tests for your own controls.</p>
                </section>
                <section id="running">
                        <title>Running the Samples</title>
                        <section id="reqs">
-                               <title>Requirements for Running the 
Sample</title>
+                               <title>Requirements for Running the 
Samples</title>
                                <p>To run the Samples, you need:</p>
                                <ul>
                                        <li>Beehive</li>
@@ -48,7 +48,7 @@
                                        <li>J2SE 5</li>
                                        <li>Ant 1.6.2</li>
                                        <li>junit.jar (v3.8.1 or later, details 
below)</li>
-                                       <li>derby.jar (for EmployeeWS only, 
details below)</li>
+                                       <!--<li>derby.jar (for EmployeeWS only, 
details below)</li>-->
                                </ul>
                        </section>
                        <section id="enviro">
@@ -56,7 +56,7 @@
                                <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 the following 
+                               <p>Open a command shell and confirm that the 
following 
                                        variables have been set:</p>
                                <ul>
                                        <li>
@@ -98,56 +98,41 @@
                                                following directory 
structure.</p>
 <source>C: 
   beehive_projects 
-    AddressBookWS 
-    EmployeeWS</source>
+    wsm-addressbook 
+    <!--EmployeeWS--></source>
                                </section>
-                       <section id="copy_runtime">
-                               <title>To Copy the Runtime Resources</title>
-                               <p>The AddressBookWS and EmployeeWS 
applications are distributed without the Beehive 
-                                       runtime JAR files they need to run.
-                                       To copy the runtime JARs into the apps, 
-                                       run the following Ant commands.  </p>
-<source>ant 
-  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-  -Dwebapp.dir=C:\beehive_projects\AddressBookWS
-  deploy.beehive.webapp.runtime
-
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=C:\beehive_projects\AddressBookWS 
deploy.beehive.webapp.runtime</source>
-<source>ant 
-  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-  -Dwebapp.dir=C:\beehive_projects\EmployeeWS
-  deploy.beehive.webapp.runtime
-
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
-Dwebapp.dir=C:\beehive_projects\EmployeeWS 
deploy.beehive.webapp.runtime</source>
-                       </section>
                                <section id="external_jars">
-                                       <title>To Download Junit and Derby JAR 
Files</title>
+                                       <title>To Download Junit the JAR 
File<!--and Derby JAR Files--></title>
                                <p>Download the junit ZIP archive from <a 
                                        
href="http://prdownloads.sourceforge.net/junit/junit3.8.1.zip?download";>http://prdownloads.sourceforge.net/junit/junit3.8.1.zip?download</a>
 
                                        </p>
                                <p>Unzip the archive, locate 
<code>junit.jar</code>, and copy <code>junit.jar</code> to 
                                        <code>ANT_HOME/lib</code>.</p>
-                               <p> Download the derby ZIP archive from <a 
+                               <!--<p> Download the derby ZIP archive from <a 
                                        
href="http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP";>http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP</a>.</p>
                                <p>Unzip the archive, locate 
<code>derby.jar</code>, and copy <code>derby.jar</code> to 
-                                       
<code>C:/beehive_projects/EmployeeWS/WEB-INF/lib</code>.</p>
+                                       
<code>C:/beehive_projects/EmployeeWS/WEB-INF/lib</code>.</p>-->
                                </section>
+<section id="edit_build_file"><title>Edit the <code>build.xml</code> 
File</title>
+                                       <p>Open the following build file.</p>
+                               
<source>C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml</source>
+                               <p>Edit the following line</p> 
+                               <source>  &lt;import 
file="../../../beehive-imports.xml" /></source>
+                                       <p>so that it points to the 
+                                       <code>beehive-import.xml</code> file, 
for example:</p>
+                               <source>  &lt;import 
file="C:/apache/apache-beehive-1.0/beehive-imports.xml" /></source>
+               </section>
                        <section id="compile">
-                               <title>To Compile the Apps</title>
+                               <title>To Compile the App</title>
                 <p>To compile the AddressBookWS app, enter the following Ant 
command.</p>                                              
 <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\AddressBookWS 
+  -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml 
   build
 
 <strong>Copy and paste version:</strong>
 
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\AddressBookWS build</source>
-                <p>To compile the EmployeeWS app, enter the following Ant 
command:</p>
+ant -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml build</source>
+<!--                <p>To compile the EmployeeWS app, enter the following Ant 
command.</p>
 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\EmployeeWS 
@@ -155,14 +140,14 @@
 
 <strong>Copy and paste version:</strong>
 
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\EmployeeWS build</source>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\EmployeeWS build</source>-->
                        </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">
+                       <section id="deploy_to_tomcat">
                                <title>To Deploy to Tomcat</title>
        <p>To deploy the applications, click the following links.  We recommend 
that you open the 
                links in new browser windows.  Each time you want to redeploy 
an application,
@@ -171,78 +156,73 @@
                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 class="quote">
-         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/AddressBookWS&amp;war=file:C:/beehive_projects/AddressBookWS&amp;update=true";>http://localhost:8080/manager/deploy?path=/AddressBookWS&amp;war=file:C:/pageflow_projects/AddressBookWS&amp;update=true</a>
+         <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/AddressBookWS&amp;war=file:C:/beehive_projects/wsm-addressbook&amp;update=true";>http://localhost:8080/manager/deploy?path=/AddressBookWS&amp;war=file:C:/pageflow_projects/wsm-addressbook&amp;update=true</a>
        </p>
-    <p class="quote">
+<!--    <p class="quote">
          <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/EmployeeWS&amp;war=file:C:/beehive_projects/EmployeeWS&amp;update=true";>http://localhost:8080/manager/deploy?path=/EmployeeWS&amp;war=file:C:/pageflow_projects/EmployeeWS&amp;update=true</a>
-       </p>
+       </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>    
                        </section>
-            <section><title>To Verify the Deployments</title>
-                               <p>Verify that the web services are running by 
pointing your 
+            <section id="verify_deploy"><title>To Verify the 
Deployments</title>
+                               <p>Verify that the web service is running by 
pointing your 
                                        browser to:</p>
                                <p>
                                        <a class="fork" 
href="http://localhost:8080/AddressBookWS/";>
                                                 
http://localhost:8080/AddressBookWS/</a>
                                </p>
-                               <p>and</p>
+<!--                           <p>and</p>
                                <p>
                                        <a class="fork" 
href="http://localhost:8080/EmployeeWS/";> 
                                                
http://localhost:8080/EmployeeWS/</a>
-                               </p>
-                               <p>Follow the validation links (<a class="fork" 
+                               </p>-->
+                               <p>Follow the validation link (<a class="fork" 
                                        
href="http://localhost:8080/AddressBookWS/happyaxis.jsp";>http://localhost:8080/AddressBookWS/happyaxis.jsp</a>
 
-                                       and <a class="fork" 
+                                       <!--and <a class="fork" 
                                        
href="http://localhost:8080/EmployeeWS/happyaxis.jsp";>http://localhost:8080/EmployeeWS/happyaxis.jsp</a>)
 
-                                       to see the verification pages.</p>
+                                       -->
+                                       to see the verification page.</p>
                                <p>For the WSDLs visit</p>
                                <p>
-                                       <a 
-                                               
href="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl";>
-                                                
-                                               
http://localhost:8080/AddressBookWS/web/Service.jws?wsdl</a>
-                               </p>
-                               <p>
-                                       <a 
-                                               
href="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl";>
-                                                
-                                               
http://localhost:8080/EmployeeWS/web/Service.jws?wsdl</a>
+                                       <a 
href="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl";>http://localhost:8080/AddressBookWS/web/Service.jws?wsdl</a>
                                </p>
+<!--                           <p>
+                                       <a 
href="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl";>http://localhost:8080/EmployeeWS/web/Service.jws?wsdl</a>
+                               </p>-->
                                </section>      
                        </section>
                        <section id="setup_clients">
                                <title>To Run the Web Service Clients</title>
-                               <p>Open the following two build files.</p>
+                               <p>Open the following build file.</p>
                                
<source>C:\beehive_projects\AddressBookWS\WEB-INF\build-client-dist.xml</source>
-                               
<source>C:\beehive_projects\EmployeeWS\WEB-INF\build-client-dist.xml</source>
-                               <p>In each file, edit the following line</p> 
+                               
<!--<source>C:\beehive_projects\EmployeeWS\WEB-INF\build-client-dist.xml</source>-->
+                               <p>Edit the following line</p> 
                                <source>  &lt;import 
file="../../../beehive-imports.xml" /></source>
                                        <p>so that it points to the 
                                        <code>beehive-import.xml</code> file, 
for example:</p>
-                               <source>  &lt;import 
file="C:/apache/apache-beehive-incubating-svn-snapshot/beehive-imports.xml" 
/></source>
-                               <p>To generate and run the clients run the 
following build files.</p>
+                               <source>  &lt;import 
file="C:/apache/apache-beehive-1.0/beehive-imports.xml" /></source>
+                               <p>To generate and run the client, run the 
following build file.</p>
 <source>ant -f 
C:/beehive_projects/AddressBookWS/WEB-INF/build-client-dist.xml</source>
-                               <p>and</p>
-<source>ant -f 
C:/beehive_projects/EmployeeWS/WEB-INF/build-client-dist.xml</source>
+<!--                           <p>and</p>
+<source>ant -f 
C:/beehive_projects/EmployeeWS/WEB-INF/build-client-dist.xml</source>-->
                                <p>Note that you do not need to run a 
particular target within 
-                                       <code>client-build.xml</code>. Simply 
run the ant commands 
+                                       <code>client-build.xml</code>. Simply 
run the Ant command 
                                        shown above and the client will be 
generated in 
                                        
<code>WEB-INF/build/generated</code>.</p>
-                               <p>The clients consist of JUnit test cases that 
exercise the 
+                               <p>The client consist of JUnit test cases that 
exercise the 
                                        contract published in the WSDL. The 
final result shows the 
                                        number of successfully passed JUnit 
tests.</p>
                                <p>The code generated in 
<code>/WEB-INF/build/generated/</code> 
                                        can be used as a template to write your 
own client side 
                                        applications.</p>
-                               <p>Note that the client-build.xml scripts make 
certain 
-                                       assumptions about the Tomcat deployment 
context path, namely, that the apps are 
+                               <p>Note that the client-build.xml script makes 
certain 
+                                       assumptions about the Tomcat deployment 
context path, namely, that the app is 
                                        deployed 
-                                       on the context paths 
<code>AddressBookWS</code> and <code>EmployeeWS</code>. 
-                                       If the context paths differ from these 
values, the URLs in 
-                                       the build-client.xml files must be 
adjusted accordingly. </p>
+                                       on the context path 
<code>AddressBookWS</code> <!--and <code>EmployeeWS</code>-->. 
+                                       If the context path differs from these 
values, the URL in 
+                                       the build-client.xml file must be 
adjusted accordingly. </p>
                        </section>
                </section>
        </body>

Modified: 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml?view=diff&r1=158118&r2=158119
==============================================================================
--- 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
 (original)
+++ 
incubator/beehive/branches/v1/beta/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
 Fri Mar 18 10:31:07 2005
@@ -7,7 +7,11 @@
     <body>
         <section id="dir_struct">
             <title>The Petstore Dashboard Sample</title>
-        <p>Petstore has both a web site and a web service interface.  The web 
site is designed for customer access; the web service is for employee access.  
Through the web service, employees update the prices and inventory seen on the 
customer web site.  The Petstore Dashboard is a Swing client application for 
this web service. Updates made on the Dashboard are passed to the web service 
and ultimately the updates appear on the Petstore web site.  
+        <p>Petstore has both a web site and a web service interface.  The web 
site is designed for 
+                       customer access; the web service is for employee 
access.  Through the web service, employees 
+                       update the prices and inventory seen on the customer 
web site.  The Petstore Dashboard is a 
+                       Swing client application for this web service. Updates 
made on the Dashboard are passed to 
+                       the web service, and ultimately the updates appear on 
the Petstore web site.  
 </p>
 <!--
             <p>The Dashboard sample source code is located at 
<code>BEEHIVE_HOME/samples/PetStoreDashboard</code>.  [todo: more about the 
code breakdown]</p>
@@ -96,19 +100,19 @@
         </section>
 <section id="build_petstore">
     <title>To Recompile and Redeploy Petstore</title>
-<p>In this step you will recompile and redeploy Petstore.  The following 
instruction assume that you have Petstore 
+<p>In this step you will recompile and redeploy Petstore.  The following 
instructions assume that you have Petstore 
        up and running on an instance of Tomcat server.  If Petstore is not up 
and running, complete the following
        instructions before proceeding: <a href="site:jpetstore">Beehive 
Sample: Petstore</a>.</p>
        <p>To recompile the Petstore web app, run the following Ant command.</p>
+
 <source>ant 
-  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-  -Dwebapp.dir=C:\beehive_projects\petstoreWeb 
+  -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml
   build
-  
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-Dwebapp.dir=C:\beehive_projects\petstoreWeb build</source>  
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml build</source>
        <p>To redeploy the Petstore web app, click the following link. (We 
recommend opening the link in a new window.
-               after deployment has completed, the browser window will display 
a status message.  After the 
+               After deployment has completed, the browser window will display 
a status message.  After the 
                status message has been displayed, you may close the browser 
window.)</p>
     <p class="quote">
          <a class="fork" 
href="http://localhost:8080/manager/deploy?path=/petstoreWeb&amp;war=file:C:/beehive_projects/petstoreWeb&amp;update=true";>http://localhost:8080/manager/deploy?path=/petstoreWeb&amp;war=file:C:/pageflow_projects/petstoreWeb&amp;update=true</a>
@@ -123,7 +127,7 @@
   <source>ant -f 
<code>C:\beehive_projects\PetstoreDashboard\build.xml</code></source>
 <p>The Swing application comes up in its own window. Click on the different 
categories and modify price and quantity. The changes show up on the Petstore 
site (when the browser is refreshed).
 </p>
-<p>  Note: If the petstoreWeb sample is deployed to Tomcat with a context.path 
different from 
+<p>  Note: If the petstoreWeb sample is deployed to Tomcat with a 
<code>context.path</code> different from 
        "petstoreWeb", or if it is deployed to a different server than 
localhost:8080, 
        then the file 
<code>C:/beehive_projects/PetstoreDashboard/build.xml</code> needs to be 
modified accordingly. 
        The Dashboard client generator relies on these default values.</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=158118&r2=158119
==============================================================================
--- 
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
 Fri Mar 18 10:31:07 2005
@@ -17,7 +17,7 @@
     </section>
                <section id="using">
                        <title>Using the Web Service Template</title>
-                       <p>The following instruction assume that you have 
completed all of 
+                       <p>The following instructions assume that you have 
completed all of 
                                required and optional steps in the Beehive set 
up procedure at 
                                <a href="site:../setup">Installation and 
Setup</a>.</p>
                        <p>To use the template, follow these steps:</p>
@@ -64,7 +64,7 @@
        <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 
+       <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">

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

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

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

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

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

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

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

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

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

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

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

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


Reply via email to