Author: steveh
Date: Mon Feb  7 10:29:38 2005
New Revision: 151737

URL: http://svn.apache.org/viewcvs?view=rev&rev=151737
Log:
(1) Update to netui-config.xml docs (after converstation with Rich Feit).
(2) General docs update to tutorial topics, TOC.

Modified:
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/netui-config.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml
    
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
 Mon Feb  7 10:29:38 2005
@@ -33,7 +33,7 @@
                                        <ul>
                                                <li><code>ANT_HOME</code></li>
                                                <li><code>JAVA_HOME</code></li>
-                                               
<li><code>TOMCAT_HOME</code></li>
+                                               
<li><code>CATALINA_HOME</code></li>
                                        </ul>
                                        <p>Also ensure that the following 
elements are on your <code>PATH</code>:</p>
                                        <ul>
@@ -44,7 +44,7 @@
             <section>
                 <title>To Start the Tomcat Server</title>
                 <p>At the command prompt, enter:</p>
-                <source>%TOMCAT_HOME%\bin\startup.bat</source>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>            
         </section>
         <section id="step_2">

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
 Mon Feb  7 10:29:38 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>Apache Beehive 1.0 Beta 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/trunk/docs/forrest/src/documentation/content/xdocs/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml 
(original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml 
Mon Feb  7 10:29:38 2005
@@ -47,6 +47,10 @@
                        </ul>
                </section>
                <section>
+                       <title>Documentation</title>
+                       <p><a href="docs/index.html">Documentation</a></p>
+               </section>
+               <section>
                        <title>Links</title>
                        <p>
                                <a href="downloads.html">Download Page</a>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/netui-config.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/netui-config.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/netui-config.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/netui-config.xml
 Mon Feb  7 10:29:38 2005
@@ -88,11 +88,11 @@
             <section 
id="action-interceptor"><title>&lt;action-interceptor&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;action-interceptor>
-  &lt;interceptor-class> xsd:string &lt;/interceptor-class> [occurences: 1]
+  &lt;interceptor-class> xsd:string &lt;/interceptor-class> [occurrences: 1]
   &lt;custom-property> 
-    &lt;name> xsd:string &lt;/name> [occurences: 1]
-    &lt;value> xsd:string &lt;/value> [occurences: 1]  
-  &lt;/custom-property> [occurences: 0-*]
+    &lt;name> xsd:string &lt;/name> [occurrences: 1]
+    &lt;value> xsd:string &lt;/value> [occurrences: 1]  
+  &lt;/custom-property> [occurrences: 0-*]
 &lt;/action-interceptor></source>
                                <p><strong>Parents:</strong></p>
                                <p><a href="#global">&lt;global></a>, 
@@ -105,14 +105,14 @@
                                </section>
         <section id="action-name"><title>&lt;action-name&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;action-name> xsd:string 
&lt;action-name> [occurences: 1]</source>
+                               <source>&lt;action-name> xsd:string 
&lt;action-name> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#per-action">&lt;per-action></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section id="after-action"><title>&lt;after-action&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source> &lt;after-action> xsd:boolean 
&lt;after-action> [occurences: 0-1] </source>
+                               <source> &lt;after-action> xsd:boolean 
&lt;after-action> [occurrences: 0-1] </source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#intercept-path">&lt;intercept-path></a>
                                           </p>
@@ -121,9 +121,9 @@
                                
         <section id="binding-context"><title>&lt;binding-context&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;binding-context> [occurences: 0-*]
-  &lt;name> xsd:string &lt;/name> [occurences: 1]
-  &lt;factory-class> xsd:string &lt;/factory-class> [occurences: 1]
+                               <source>&lt;binding-context> [occurrences: 0-*]
+  &lt;name> xsd:string &lt;/name> [occurrences: 1]
+  &lt;factory-class> xsd:string &lt;/factory-class> [occurrences: 1]
 &lt;/binding-context></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#binding-contexts">&lt;binding-contexts></a></p>
@@ -132,10 +132,10 @@
                    <a 
href="#factory-class">&lt;factory-class></a></p></section>
         <section id="binding-contexts"><title>&lt;binding-contexts&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;/binding-contexts> [occurences: 0-1]
-  &lt;binding-context> [occurences: 0-*]
-    &lt;name> xsd:string &lt;/name> [occurences: 1]
-    &lt;factory-class> xsd:string &lt;/factory-class> [occurences: 1]
+                               <source>&lt;/binding-contexts> [occurrences: 
0-1]
+  &lt;binding-context> [occurrences: 0-*]
+    &lt;name> xsd:string &lt;/name> [occurrences: 1]
+    &lt;factory-class> xsd:string &lt;/factory-class> [occurrences: 1]
   &lt;/binding-context>
 &lt;/binding-contexts></source>
                                <p><strong>Parents:</strong></p>
@@ -144,7 +144,7 @@
                                        <p><a 
href="#binding-context">&lt;binding-context></a></p></section>
         <section id="converter-class"><title>&lt;converter-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;converter-class> xsd:string 
&lt;/converter-class> [1]</source>
+                               <source>&lt;converter-class> xsd:string 
&lt;/converter-class> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#type-converter">&lt;type-converter></a></p>
                                <p><strong>Children:</strong></p>
@@ -152,8 +152,8 @@
         <section id="custom-property"><title>&lt;custom-property&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;custom-property>
-  &lt;name> xsd:string &lt;/name> [1]
-  &lt;value> xsd:string &lt;/value> [1]
+  &lt;name> xsd:string &lt;/name> [occurrences: 1]
+  &lt;value> xsd:string &lt;/value> [occurrences: 1]
 &lt;/custom-property></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#action-interceptor">&lt;action-interceptor></a></p>
@@ -162,42 +162,48 @@
                                   <a href="#value">&lt;value></a></p></section>
         <section id="default-language"><title>&lt;default-language&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;default-language> xsd:string 
&lt;/default-language> [1]</source>
+                               <source>&lt;default-language> xsd:string 
&lt;/default-language> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#expression-language">&lt;expression-language></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section id="description"><title>&lt;description&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;description> xsd:string 
&lt;/description> [0..1]</source>
+                               <source>&lt;description> xsd:string 
&lt;/description> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#module-config-locator">&lt;module-config-locator></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section id="doctype"><title>&lt;doctype&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;doctype> [ default | legacy | 
legacyOnly ] &lt;/doctype> [0..1]</source>
+                               <source>&lt;doctype> [ default | legacy | 
legacyOnly ] &lt;/doctype> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#jsp-tag-config">&lt;jsp-tag-config></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section id="enable-renesting"><title>&lt;enable-renesting&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;enable-renesting> xsd:boolean 
&lt;/enable-renesting> [0..1]</source>
+                               <source>&lt;enable-renesting> xsd:boolean 
&lt;/enable-renesting> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section 
id="ensure-secure-forwards"><title>&lt;ensure-secure-forwards&gt;</title>
+                           <p>For some server implementations, security checks 
are executed only when an URL is called 
+                                       directly, while security checks for 
server forwards are ignored.</p>
+                               <p>When this element is set to 
<code>true</code>, server forwards are guaranteed to be checked.</p>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;ensure-secure-forwards> xsd:boolean 
&lt;/ensure-secure-forwards> [0..1]</source>
+                               <source>&lt;ensure-secure-forwards> xsd:boolean 
&lt;/ensure-secure-forwards> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section 
id="exceptions-handler-class"><title>&lt;exceptions-handler-class&gt;</title>
+                           <p>Typically, exceptions thrown by the controller 
class are delivered in a wrapper exception
+                                       class.  The class named here, can be 
used to unwrap these exceptions and handle
+                                       the underlying exception in a more 
fine-grained manner.</p>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;exceptions-handler-class> 
xsd:string &lt;/exceptions-handler-class> [0..1]</source>
+                               <source>&lt;exceptions-handler-class> 
xsd:string &lt;/exceptions-handler-class> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-handlers">&lt;pageflow-handlers></a></p>
                                <p><strong>Children:</strong></p>
@@ -211,12 +217,12 @@
                                <p>none</p></section>
         <section 
id="expression-languages"><title>&lt;expression-languages&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;expression-languages> [1]
-  &lt;default-language> xsd:string &lt;/default-language> [1]
-  &lt;expression-language> [1..*]
-    &lt;name> xsd:string &lt;/name> [1]
-    &lt;factory-class> xsd:string &lt;/factory-class> [1]
-    &lt;binding-contexts> binding-contexts &lt;/binding-contexts> [0..1]
+                               <source>&lt;expression-languages> [occurrences: 
1]
+  &lt;default-language> xsd:string &lt;/default-language> [occurrences: 1]
+  &lt;expression-language> [occurrences: 1-*]
+    &lt;name> xsd:string &lt;/name> [occurrences: 1]
+    &lt;factory-class> xsd:string &lt;/factory-class> [occurrences: 1]
+    &lt;binding-contexts> binding-contexts &lt;/binding-contexts> 
[occurrences: 0-1]
   &lt;/expression-language> 
 &lt;/expression-languages></source>
                                <p><strong>Parents:</strong></p>
@@ -227,32 +233,32 @@
                                        </p></section>
         <section id="factory-class"><title>&lt;factory-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;factory-class> xsd:string 
&lt;/factory-class> [1]</source>
+                               <source>&lt;factory-class> xsd:string 
&lt;/factory-class> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#binding-contexts">&lt;binding-contexts></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section 
id="forward-redirect-handler-class"><title>&lt;forward-redirect-handler-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;forward-redirect-handler-class> 
xsd:string &lt;/forward-redirect-handler-class> [0..1]</source>
+                               <source>&lt;forward-redirect-handler-class> 
xsd:string &lt;/forward-redirect-handler-class> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-handlers">&lt;pageflow-handlers></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section id="global"><title>&lt;global&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;global> [0..1]
+                               <source>&lt;global> [occurrences: 0-1]
   &lt;simple-action-interceptor> 
-    &lt;intercept-path> xsd:string &lt;/intercept-path> [1]
-    &lt;after-action> xsd:boolean &lt;/after-action> [0..1]  
-  &lt;/simple-action-interceptor> [0..*]
+    &lt;intercept-path> xsd:string &lt;/intercept-path> [occurrences: 1]
+    &lt;after-action> xsd:boolean &lt;/after-action> [occurrences: 0-1]  
+  &lt;/simple-action-interceptor> [occurrences: 0-*]
   &lt;action-interceptor> 
-    &lt;interceptor-class> xsd:string &lt;/interceptor-class> [1]
+    &lt;interceptor-class> xsd:string &lt;/interceptor-class> [occurrences: 1]
     &lt;custom-property> 
-      &lt;name> xsd:string &lt;/name> [1]
-      &lt;value> xsd:string &lt;/value> [1]
-    &lt;/custom-property> [0..*]
-  &lt;/action-interceptor> [0..*]
+      &lt;name> xsd:string &lt;/name> [occurrences: 1]
+      &lt;value> xsd:string &lt;/value> [occurrences: 1]
+    &lt;/custom-property> [occurrences: 0-*]
+  &lt;/action-interceptor> [occurrences: 0-*]
 &lt;/global></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-action-interceptors">&lt;pageflow-action-interceptors></a></p>
@@ -261,14 +267,14 @@
                                        <a 
href="#action-inteceptor">&lt;action-inteceptor></a></p></section>
         <section id="id-javascript"><title>&lt;id-javascript&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;id-javascript> [ default | legacy | 
legacyOnly ] &lt;/id-javascript> [0..1]</source>
+                               <source>&lt;id-javascript> [ default | legacy | 
legacyOnly ] &lt;/id-javascript> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#jsp-tag-config">&lt;jsp-tag-config></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section 
id="interceptor-class"><title>&lt;interceptor-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;id-javascript> [ default | legacy | 
legacyOnly ] &lt;id-javascript> [0..1]</source>
+                               <source>&lt;id-javascript> [ default | legacy | 
legacyOnly ] &lt;id-javascript> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#jsp-tag-config">&lt;jsp-tag-config></a></p>
                                <p><strong>Children:</strong></p>
@@ -276,7 +282,7 @@
 
         <section id="intercept-path"><title>&lt;intercept-path&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;intercept-path> xsd:string 
&lt;/intercept-path> [1]</source>
+                               <source>&lt;intercept-path> xsd:string 
&lt;/intercept-path> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#simple-action-interceptor">&lt;simple-action-interceptor></a></p>
                                <p><strong>Children:</strong></p>
@@ -285,7 +291,7 @@
         <section 
id="iterator-factories"><title>&lt;iterator-factories&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;iterator-factories>
-  &lt;iterator-factory> [0..*]
+  &lt;iterator-factory> [occurrences: 0-*]
     ...
   &lt;/iterator-factory>
 &lt;/iterator-factories></source>
@@ -296,9 +302,9 @@
 
         <section id="iterator-factory"><title>&lt;iterator-factory&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;iterator-factory> [0..*]
-  &lt;name> xsd:string &lt;/name> [1]
-  &lt;factory-class> xsd:string &lt;/factory-class> [1]
+                               <source>&lt;iterator-factory> [occurrences: 0-*]
+  &lt;name> xsd:string &lt;/name> [occurrences: 1]
+  &lt;factory-class> xsd:string &lt;/factory-class> [occurrences: 1]
 &lt;/iterator-factory></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#iterator-factorys">&lt;iterator-factorys></a></p>
@@ -309,9 +315,9 @@
         <section id="jsp-tag-config"><title>&lt;jsp-tag-config&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;jsp-tag-config>
-  &lt;doctype> xsd:string &lt;/doctype> [0..1]
-  &lt;id-javascript> [ default | legacy | legacyOnly ] &lt;/id-javascript> 
[0..1]
-  &lt;tree-image-location> xsd:string &lt;/tree-image-location> [0..1]
+  &lt;doctype> xsd:string &lt;/doctype> [occurrences: 0-1]
+  &lt;id-javascript> [ default | legacy | legacyOnly ] &lt;/id-javascript> 
[occurrences: 0-1]
+  &lt;tree-image-location> xsd:string &lt;/tree-image-location> [occurrences: 
0-1]
 &lt;/jsp-tag-config></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config></a></p>
@@ -322,7 +328,7 @@
 
         <section 
id="legacy-tag-support"><title>&lt;legacy-tag-support&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;legacy-tag-support> xsd:boolean 
&lt;/legacy-tag-support> [0..1]</source>
+                               <source>&lt;legacy-tag-support> xsd:boolean 
&lt;/legacy-tag-support> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config></a></p>
                                <p><strong>Children:</strong></p>
@@ -330,14 +336,14 @@
 
         <section id="locator-class"><title>&lt;locator-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;locator-class> xsd:string 
&lt;/locator-class> [1]</source>
+                               <source>&lt;locator-class> xsd:string 
&lt;/locator-class> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#module-config-locators">&lt;module-config-locators></a></p>
                                <p><strong>Children:</strong></p>
                                <p>none</p></section>
         <section 
id="login-handler-class"><title>&lt;login-handler-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;login-handler-class> xsd:string 
&lt;/login-handler-class> [0..1]</source>
+                               <source>&lt;login-handler-class> xsd:string 
&lt;/login-handler-class> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-handlers">&lt;pageflow-handlers></a></p>
                                <p><strong>Children:</strong></p>
@@ -361,8 +367,9 @@
 <p>If the jpf-forward-overflow-count parameter is omitted from the web.xml 
file, 
 the error will be written to the response after 50 server forwards within a 
single request. ÃÂ 
 </p>
+<p>When an application is in development, a descriptive error is sent; for 
deployed applications, a 500 response is sent.</p>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;max-forwards-per-request> xsd:int 
&lt;/max-forwards-per-request> [0..1]</source>
+                               <source>&lt;max-forwards-per-request> xsd:int 
&lt;/max-forwards-per-request> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config></a></p>
                                <p><strong>Children:</strong></p>
@@ -375,8 +382,9 @@
         If Page Flows are repeatedly nested until the stack exceeds the 
specified value, 
         an error is written to the response object and any further nesting is 
not allowed. 
         This helps prevent the nesting stack from consuming large amounts of 
resources.</p>
+<p>When an application is in development, a descriptive error is sent; for 
deployed applications, a 500 response is sent.</p>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;max-nesting-stack-depth> xsd:int 
&lt;/max-nesting-stack-depth> [0..1]</source>
+                               <source>&lt;max-nesting-stack-depth> xsd:int 
&lt;/max-nesting-stack-depth> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config></a></p>
                                <p><strong>Children:</strong></p>
@@ -385,9 +393,9 @@
 
         <section 
id="module-config-locator"><title>&lt;module-config-locator&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;module-config-locator> [0..*]
-  &lt;description> xsd:string &lt;/description> [0..1]
-  &lt;locator-class> xsd:string &lt;/locator-class> [1]
+                               <source>&lt;module-config-locator> 
[occurrences: 0-*]
+  &lt;description> xsd:string &lt;/description> [occurrences: 0-1]
+  &lt;locator-class> xsd:string &lt;/locator-class> [occurrences: 1]
 &lt;/module-config-locator></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#module-config-locators">&lt;module-config-locators></a></p>
@@ -396,11 +404,16 @@
                                        <a 
href="#locator-class">&lt;locator-class></a></p></section>
 
         <section 
id="module-config-locators"><title>&lt;module-config-locators&gt;</title>
-                               <p><strong>Syntax</strong></p>
-                               <source>&lt;module-config-locators> [0..1]
-  &lt;module-config-locator> [0..*]
-    &lt;description> xsd:string &lt;/description> [0..1]
-    &lt;locator-class> xsd:string &lt;/locator-class> [1]
+                       <p>Names a class or group of classes that know the 
location of the web application's 
+                               Struts configuration files.  By default these 
configuation files are saved to 
+                               
<code>WEB-INF/.pageflow-struts-generated/</code>.  But, in cases where this 
default location
+                               has been overridden by a custom compilation 
process, use <code>&lt;module-config-locators></code> to point to a Java class 
that knows the
+                               new location.  </p>
+                               <p><strong>Syntax</strong></p>
+                               <source>&lt;module-config-locators> 
[occurrences: 0-1]
+  &lt;module-config-locator> [occurrences: 0-*]
+    &lt;description> xsd:string &lt;/description> [occurrences: 0-1]
+    &lt;locator-class> xsd:string &lt;/locator-class> [occurrences: 1]
   &lt;/module-config-locator>
 &lt;/module-config-locators></source>
                                <p><strong>Parents:</strong></p>
@@ -409,8 +422,14 @@
                                <p><a 
href="#module-config-locator">&lt;module-config-locator></a></p></section>
 
         <section 
id="multipart-handler"><title>&lt;multipart-handler&gt;</title>
+                           <p>By default multi-part file uploading is disabled 
for page flow web applications.
+                                       To turn it on, you must (1) explicitly 
set this element to <code>memory</code>
+                                       or <code>disk</code>, or (2) decorate a 
given controller class with 
+                                       the @Jpf.MultipartHandler annotation.   
Doing (1) will enable file uploading across 
+                                       the entire web applcation, doing (2) 
enables file uploading on a
+                                       controller-by-controller basis.</p>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;multipart-handler> [ disabled | 
memory | disk ] &lt;/multipart-handler> [0..1]</source>
+                               <source>&lt;multipart-handler> [ disabled | 
memory | disk ] &lt;/multipart-handler> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config></a></p>
                                <p><strong>Children:</strong></p>
@@ -422,7 +441,7 @@
 
         <section id="name"><title>&lt;name&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;name> xsd:string &lt;/name> 
[1]</source>
+                               <source>&lt;name> xsd:string &lt;/name> 
[occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#expression-language">&lt;expression-language></a>,
                                                <a 
href="#iterator-factory">&lt;iterator-factory></a>,
@@ -438,15 +457,15 @@
          ÃÂ </p>                             
                                <p><strong>Syntax</strong></p>
                                <source>&lt;netui-config>
-  &lt;legacy-tag-support> xsd:boolean &lt;/legacy-tag-support> [0..1]
-  &lt;expression-languages> ... &lt;/expression-languages> [1]
-  &lt;pageflow-action-interceptors> ... &lt;/pageflow-action-interceptors> 
[0..1]
-  &lt;pageflow-handlers> ... &lt;/pageflow-handlers> [0..1]
-  &lt;pageflow-config> ... &lt;/pageflow-config> [0..1]
-  &lt;type-converters> ... &lt;/type-converters> [0..1]
-  &lt;jsp-tag-config> ... &lt;/jsp-tag-config> [0..1]
-  &lt;iterator-factories> ... &lt;/iterator-factories> [0..1]
-  &lt;request-interceptors> ... &lt;/request-interceptors> [0..1]
+  &lt;legacy-tag-support> xsd:boolean &lt;/legacy-tag-support> [occurrences: 
0-1]
+  &lt;expression-languages> ... &lt;/expression-languages> [occurrences: 1]
+  &lt;pageflow-action-interceptors> ... &lt;/pageflow-action-interceptors> 
[occurrences: 0-1]
+  &lt;pageflow-handlers> ... &lt;/pageflow-handlers> [occurrences: 0-1]
+  &lt;pageflow-config> ... &lt;/pageflow-config> [occurrences: 0-1]
+  &lt;type-converters> ... &lt;/type-converters> [occurrences: 0-1]
+  &lt;jsp-tag-config> ... &lt;/jsp-tag-config> [occurrences: 0-1]
+  &lt;iterator-factories> ... &lt;/iterator-factories> [occurrences: 0-1]
+  &lt;request-interceptors> ... &lt;/request-interceptors> [occurrences: 0-1]
 &lt;/netui-config></source>
                                <p><strong>Parents:</strong></p>
                                        <p></p>
@@ -474,22 +493,24 @@
 to go to the current one; for instance, it might take you to a nested page 
flow 
 that asks you to fill out a "satisfaction survey" before sending you to the 
 destination page flow. </p>
+<p>The action-intercepting class is run twice: <em>both</em> before 
<em>and</em> after the execution of the 
+       action.</p>
  <p><strong>Also see:</strong></p>
  <p><a 
href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.html">Interface
 org.apache.beehive.netui.pageflow.interceptor.ActionInterceptor</a></p>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;pageflow-action-interceptors>
-       &lt;global> [0..1]
-               &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [0..*]
-               &lt;action-interceptor> ... &lt;/action-interceptor> [0..*]
+       &lt;global> [occurrences: 0-1]
+               &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+               &lt;action-interceptor> ... &lt;/action-interceptor> 
[occurrences: 0-*]
        &lt;/global>
-       &lt;per-pageflow> [0..*]
-               &lt;pageflow-uri> xsd:string &lt;/pageflow-uri> [1]
-               &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [0..*]
-               &lt;action-interceptor> ... &lt;/action-interceptor> [0..*]
-               &lt;per-action> [0..*]
-                       &lt;action-name> xsd:string &lt;/action-name> [1]
-                       &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [0..*]
-                       &lt;action-interceptor> ... &lt;/action-interceptor> 
[0..*]
+       &lt;per-pageflow> [occurrences: 0-*]
+               &lt;pageflow-uri> xsd:string &lt;/pageflow-uri> [occurrences: 1]
+               &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+               &lt;action-interceptor> ... &lt;/action-interceptor> 
[occurrences: 0-*]
+               &lt;per-action> [occurrences: 0-*]
+                       &lt;action-name> xsd:string &lt;/action-name> 
[occurrences: 1]
+                       &lt;simple-action-interceptor> ... 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+                       &lt;action-interceptor> ... &lt;/action-interceptor> 
[occurrences: 0-*]
                &lt;/per-action>
        &lt;/per-pageflow>
 &lt;/pageflow-action-interceptors></source>
@@ -503,13 +524,13 @@
                 <title>&lt;pageflow-config&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;pageflow-config>
-       &lt;enable-renesting> xsd:boolean &lt;/enable-renesting> [0..1]
-       &lt;max-forwards-per-request> xsd:int &lt;/max-forwards-per-request> 
[0..1]
-       &lt;max-nesting-stack-depth> xsd:int &lt;/max-nesting-stack-depth> 
[0..1]
-       &lt;ensure-secure-forwards> xsd:boolean &lt;/ensure-secure-forwards> 
[0..1]
-       &lt;throw-session-expired-exception> xsd:boolean 
&lt;/throw-session-expired-exception> [0..1]
-       &lt;multipart-handler> [ disabled | memory | disk ] 
&lt;/multipart-handler> [0..1]
-       &lt;module-config-locators> ... &lt;/module-config-locators> [0..1]
+       &lt;enable-renesting> xsd:boolean &lt;/enable-renesting> [occurrences: 
0-1]
+       &lt;max-forwards-per-request> xsd:int &lt;/max-forwards-per-request> 
[occurrences: 0-1]
+       &lt;max-nesting-stack-depth> xsd:int &lt;/max-nesting-stack-depth> 
[occurrences: 0-1]
+       &lt;ensure-secure-forwards> xsd:boolean &lt;/ensure-secure-forwards> 
[occurrences: 0-1]
+       &lt;throw-session-expired-exception> xsd:boolean 
&lt;/throw-session-expired-exception> [occurrences: 0-1]
+       &lt;multipart-handler> [ disabled | memory | disk ] 
&lt;/multipart-handler> [occurrences: 0-1]
+       &lt;module-config-locators> ... &lt;/module-config-locators> 
[occurrences: 0-1]
 &lt;/pageflow-config></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config&gt;</a></p>
@@ -543,10 +564,10 @@
 
                                <p><strong>Syntax</strong></p>
                                <source>&lt;pageflow-handlers&gt;
-       &lt;login-handler-class> xsd:string &lt;/login-handler-class> [0..1]
-       &lt;forward-redirect-handler-class> xsd:string 
&lt;/forward-redirect-handler-class> [0..1]
-       &lt;reloadable-class-handler-class> xsd:string 
&lt;/reloadable-class-handler-class> [0..1]
-       &lt;exceptions-handler-class> xsd:string &lt;/exceptions-handler-class> 
[0..1]
+       &lt;login-handler-class> xsd:string &lt;/login-handler-class> 
[occurrences: 0-1]
+       &lt;forward-redirect-handler-class> xsd:string 
&lt;/forward-redirect-handler-class> [occurrences: 0-1]
+       &lt;reloadable-class-handler-class> xsd:string 
&lt;/reloadable-class-handler-class> [occurrences: 0-1]
+       &lt;exceptions-handler-class> xsd:string &lt;/exceptions-handler-class> 
[occurrences: 0-1]
 &lt;/pageflow-handlers&gt;</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config&gt;</a></p>
@@ -559,7 +580,7 @@
             
        <section id="pageflow-uri"><title>&lt;pageflow-uri&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;pageflow-uri> xsd:string 
&lt;/pageflow-uri> [1]</source>
+                               <source>&lt;pageflow-uri> xsd:string 
&lt;/pageflow-uri> [occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#per-pageflow">&lt;per-pageflow&gt;</a></p>
                                <p><strong>Children:</strong></p>
@@ -567,10 +588,10 @@
 
        <section id="per-action"><title>&lt;per-action&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;per-action> [0..*]
-       &lt;action-name> xsd:string &lt;/action-name> [1]
-       &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [0..*]
-       &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [0..*]
+                               <source>&lt;per-action> [occurrences: 0-*]
+       &lt;action-name> xsd:string &lt;/action-name> [occurrences: 1]
+       &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+       &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [occurrences: 0-*]
 &lt;/per-action></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#global">&lt;global&gt;</a></p>
@@ -581,14 +602,14 @@
 
        <section id="per-pageflow"><title>&lt;per-pageflow&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;per-pageflow> [0..*]
-       &lt;pageflow-uri> xsd:string &lt;/pageflow-uri> [1]
-       &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [0..*]
-       &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [0..*]
-       &lt;per-action> [0..*]
-               &lt;action-name> xsd:string &lt;/action-name> [1]
-               &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [0..*]
-               &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [0..*]
+                               <source>&lt;per-pageflow> [occurrences: 0-*]
+       &lt;pageflow-uri> xsd:string &lt;/pageflow-uri> [occurrences: 1]
+       &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+       &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [occurrences: 0-*]
+       &lt;per-action> [occurrences: 0-*]
+               &lt;action-name> xsd:string &lt;/action-name> [occurrences: 1]
+               &lt;simple-action-interceptor> netui:simple-action-interceptor 
&lt;/simple-action-interceptor> [occurrences: 0-*]
+               &lt;action-interceptor> netui:action-interceptor 
&lt;/action-interceptor> [occurrences: 0-*]
        &lt;/per-action>
 &lt;/per-pageflow></source>
                                <p><strong>Parents:</strong></p>
@@ -601,7 +622,7 @@
 
        <section 
id="reloadable-class-handler-class"><title>&lt;reloadable-class-handler-class&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;reloadable-class-handler-class> 
xsd:string &lt;/reloadable-class-handler-class> [0..1]</source>
+                               <source>&lt;reloadable-class-handler-class> 
xsd:string &lt;/reloadable-class-handler-class> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-handlers">&lt;pageflow-handlers&gt;</a></p>
                                <p><strong>Children:</strong></p>
@@ -611,7 +632,7 @@
                                <title>&lt;request-interceptors&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;request-interceptors>
-  &lt;interceptor-class> xsd:string &lt;/interceptor-class> [1..*]
+  &lt;interceptor-class> xsd:string &lt;/interceptor-class> [occurrences: 1-*]
 &lt;/request-interceptors></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config&gt;</a></p>
@@ -621,8 +642,8 @@
        <section 
id="simple-action-interceptor"><title>&lt;simple-action-interceptor&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;simple-action-interceptor>
-  &lt;intercept-path> xsd:string &lt;/intercept-path> [1]
-  &lt;after-action> xsd:boolean &lt;/after-action> [0..1]
+  &lt;intercept-path> xsd:string &lt;/intercept-path> [occurrences: 1]
+  &lt;after-action> xsd:boolean &lt;/after-action> [occurrences: 0-1]
 &lt;/simple-action-interceptor></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#netui-config">&lt;netui-config&gt;</a></p>
@@ -631,7 +652,7 @@
 
        <section 
id="throw-session-expired-exception"><title>&lt;throw-session-expired-exception&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;throw-session-expired-exception> 
xsd:boolean &lt;/throw-session-expired-exception> [0..1]</source>
+                               <source>&lt;throw-session-expired-exception> 
xsd:boolean &lt;/throw-session-expired-exception> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#pageflow-config">&lt;pageflow-config&gt;</a></p>
                                <p><strong>Children:</strong></p>
@@ -639,7 +660,7 @@
 
        <section 
id="tree-image-location"><title>&lt;tree-image-location&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;tree-image-location> xsd:string 
&lt;/tree-image-location> [0..1]</source>
+                               <source>&lt;tree-image-location> xsd:string 
&lt;/tree-image-location> [occurrences: 0-1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#jsp-tag-config">&lt;jsp-tag-config&gt;</a></p>
                                <p><strong>Children:</strong></p>
@@ -647,7 +668,7 @@
 
        <section id="type"><title>&lt;type&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;type> xsd:string &lt;/type> 
[1]</source>
+                               <source>&lt;type> xsd:string &lt;/type> 
[occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#type-converter">&lt;type-converter&gt;</a></p>
                                <p><strong>Children:</strong></p>
@@ -655,9 +676,9 @@
 
        <section id="type-converter"><title>&lt;type-converter&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;type-converter> [0..*]
-  &lt;type> xsd:string &lt;/type> [1]
-  &lt;converter-class> xsd:string &lt;/converter-class> [1]
+                               <source>&lt;type-converter> [occurrences: 0-*]
+  &lt;type> xsd:string &lt;/type> [occurrences: 1]
+  &lt;converter-class> xsd:string &lt;/converter-class> [occurrences: 1]
 &lt;/type-converter></source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#type-converters">&lt;type-converters&gt;</a></p>
@@ -667,9 +688,9 @@
        <section id="type-converters"><title>&lt;type-converters&gt;</title>
                                <p><strong>Syntax</strong></p>
                                <source>&lt;type-converters>
-  &lt;type-converter> [0..*]
-    &lt;type> xsd:string &lt;/type> [1]
-    &lt;converter-class> xsd:string &lt;/converter-class> [1]
+  &lt;type-converter> [occurrences: 0-*]
+    &lt;type> xsd:string &lt;/type> [occurrences: 1]
+    &lt;converter-class> xsd:string &lt;/converter-class> [occurrences: 1]
   &lt;/type-converter>
 &lt;/type-converters></source>
                                <p><strong>Parents:</strong></p>
@@ -679,7 +700,7 @@
 
         <section id="value"><title>&lt;value&gt;</title>
                                <p><strong>Syntax</strong></p>
-                               <source>&lt;value> xsd:string &lt;/value> 
[1]</source>
+                               <source>&lt;value> xsd:string &lt;/value> 
[occurrences: 1]</source>
                                <p><strong>Parents:</strong></p>
                                        <p><a 
href="#custom-property">&lt;custom-property&gt;</a></p>
                                <p><strong>Children:</strong></p>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
 Mon Feb  7 10:29:38 2005
@@ -30,7 +30,7 @@
                                        <ul>
                                                <li><code>ANT_HOME</code></li>
                                                <li><code>JAVA_HOME</code></li>
-                                               
<li><code>TOMCAT_HOME</code></li>
+                                               
<li><code>CATALINA_HOME</code></li>
                                        </ul>
                                        <p>Also ensure that the following 
elements are on your <code>PATH</code>:</p>
                                        <ul>
@@ -55,7 +55,7 @@
 set ANT_HOME=C:\apache-ant-1.6.2
 
 REM location of Tomcat
-set TOMCAT_HOME=C:\jakarta-tomcat-5.0.25
+set CATALINA_HOME=C:\jakarta-tomcat-5.0.25
 
 set PATH=%PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin</source>
                                        
<p><strong><code>tutorialSetup.sh</code></strong></p>
@@ -73,7 +73,7 @@
 export [EMAIL PROTECTED]@
 
 # location of Tomcat
-export [EMAIL PROTECTED]@
+export [EMAIL PROTECTED]@
 
 export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$PATH
 </source>
@@ -82,7 +82,7 @@
             <section>
                 <title>To Start the Tomcat Server</title>
                 <p>At the command prompt, enter:</p>
-                <source>%TOMCAT_HOME%\bin\startup.bat</source>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>
         </section>
         <section id="step_2_create">

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release_notes.xml
 Mon Feb  7 10:29:38 2005
@@ -11,7 +11,9 @@
     </section>
     <section>
         <title>Known Issues in this Release</title>
-        <p></p>
+        <section id="beehive-228">
+                       <title></title>
+        </section>
     </section>
     <section>
         <title>Issues Fixed in this Release</title>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml 
(original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/setup.xml 
Mon Feb  7 10:29:38 2005
@@ -43,9 +43,9 @@
                                Download: <a class="fork" 
                                        
href="http://jakarta.apache.org/site/binindex.cgi#tomcat";>http://jakarta.apache.org/site/binindex.cgi#tomcat</a>
                                </p>
-                               <p>(2) Ensure that the <code>TOMCAT_HOME</code> 
environmental variable is set in your shell.</p>
+                               <p>(2) Ensure that the 
<code>CATALINA_HOME</code> environmental variable is set in your shell.</p>
                                <p>(3) Edit the file 
-                                       
<code>TOMCAT_HOME/conf/tomcat-users.xml</code> so it 
+                                       
<code>CATALINA_HOME/conf/tomcat-users.xml</code> so it 
                                        appears as follows. Elements to add are 
shown in bold 
                                        type.</p>
                                <source>&lt;?xml version='1.0' 
encoding='utf-8'?>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml 
(original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml 
Mon Feb  7 10:29:38 2005
@@ -1,45 +1,36 @@
 <?xml version="1.0"?>
 <site label="Beehive" href="" xmlns="http://apache.org/forrest/linkmap/1.0"; 
tab="welcome">
-    <about label="Welcome" tab="welcome">
+    <about label="Project" tab="welcome">
         <introduction label="Introduction" href="index.html"/>
         <license label="License" href="license.html"/>
         <downloads label="Downloads" href="downloads.html"/>
         <release_notes label="Release Notes" href="release_notes.html"/>
-        <faq label="FAQ" href="faq.html"/>
-    </about>
-    <community label="Community" tab="welcome">
         <mailinglists label="Mailing Lists" href="mailinglists.html"/>
         <contributors label="Contributors" href="contributors.html"/>
-    </community>
-    <links label="Links" tab="welcome">
-        <wiki label="Beehive Wiki" href="http://wiki.apache.org/beehive"/>
-        <controlhaus label="Controlhaus" href="http://www.controlhaus.com/"/>
-        <jira label="Bugs and Issues" 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570"/>
-        <pollinate label="Pollinate" href="http://www.eclipse.org/pollinate/"/>
-        <svn label="Browse SVN" 
href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/"/>
-    </links>
-    <docs label="Documentation" tab="docs">
-        <docs label="Introduction" href="docs/index.html"/>
+        <faq label="FAQ" href="faq.html"/>
+    </about>
+    <docs label="Documentation" tab="welcome">
+        <docs label="Beehive 1.0 Beta Docs" href="docs/index.html"/>
         <setup label="Installation and Setup" href="setup.html" />
-        <pageflow label="Page Flows">
+        <pageflow label="Page Flows">        
+            <tutorial_pageflow label="Tutorial" 
href="pageflow/tutorial_pageflow.html"/>
             <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_building label="Building a Web-App" 
href="pageflow/pageflow_building.html"/>
             <pageflow_altering label="Altering a Page Flow" 
href="pageflow/pageflow_altering.html"/>
-            <pageflow_programming label="Page Flow Programming" 
href="pageflow/guide.html"/>        
-            <tutorial_pageflow label="Tutorial" 
href="pageflow/tutorial_pageflow.html"/>
+            <pageflow_programming label="Page Flow Programming" 
href="pageflow/guide.html"/>
         </pageflow>
         <controls label="Controls">
+            <tutorial_control label="Tutorial" 
href="controls/tutorial_controls.html"/>
             <control_overview label="Controls Overview" 
href="controls/controlsOverview.html"/>
             <control_prog label="Control Programming" 
href="controls/controlsProgramming.html"/>
-            <tutorial_control label="Control Tutorial" 
href="controls/tutorial_controls.html"/>
         </controls>
         <wsm label="Web Services">
+            <tutorial_wsm label="Tutorial" href="wsm/tutorial_wsm.html"/>
             <wsm_overview label="Web Services Overview" 
href="wsm/wsm_overview.html"/>
             <wsm_overview label="Java Web Service Files" 
href="wsm/wsm_JWSFiles.html"/>
             <supported_datatypes label="Supported Data Types" 
href="wsm/datatypes.html"/>
-            <tutorial_wsm label="Web Services Tutorial" 
href="wsm/tutorial_wsm.html"/>
             <jsr181 label="Web Services (JSR 181)" href="webservices.html"/>
         </wsm>
         <samples label="Samples">
@@ -71,8 +62,14 @@
             </ws>
         </ref>
         <gloss label="Glossary" href="glossary.html"/>
-
     </docs>
+    <links label="Links" tab="welcome">
+        <wiki label="Beehive Wiki" href="http://wiki.apache.org/beehive"/>
+        <controlhaus label="Controlhaus" href="http://www.controlhaus.com/"/>
+        <jira label="Bugs and Issues" 
href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570"/>
+        <pollinate label="Pollinate" href="http://www.eclipse.org/pollinate/"/>
+        <svn label="Browse SVN" 
href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/"/>
+    </links>
 </site>    
     <!--
     <external-refs>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml 
(original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml 
Mon Feb  7 10:29:38 2005
@@ -17,6 +17,6 @@
     be displayed when their parent tab is selected.    
   -->
 
-  <tab id="welcome" label="Welcome" dir="" indexfile="index.html"/>
-  <tab id="docs" label="Documentation" dir="docs" indexfile="index.html"/>
+  <tab id="welcome" label="Beehive" dir="" indexfile="index.html"/>
+  <!--<tab id="docs" label="Documentation" dir="docs" 
indexfile="index.html"/>-->
 </tabs>

Modified: 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml?view=diff&r1=151736&r2=151737
==============================================================================
--- 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 (original)
+++ 
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
 Mon Feb  7 10:29:38 2005
@@ -30,7 +30,7 @@
                                        <ul>
                                                <li><code>ANT_HOME</code></li>
                                                <li><code>JAVA_HOME</code></li>
-                                               
<li><code>TOMCAT_HOME</code></li>
+                                               
<li><code>CATALINA_HOME</code></li>
                                        </ul>
                                        <p>Also ensure that the following 
elements are on your <code>PATH</code>:</p>
                                        <ul>
@@ -41,7 +41,7 @@
             <section>
                 <title>To Start the Tomcat Server</title>
                 <p>At the command prompt, enter:</p>
-                <source>%TOMCAT_HOME%\bin\startup.bat</source>
+                <source>%CATALINA_HOME%\bin\startup.bat</source>
             </section>            
         </section>
         <section id="step_2">


Reply via email to