You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/25 23:49:59 UTC

svn commit: r240148 - in /beehive/trunk/docs/forrest/release/src/documentation/content/xdocs: ./ pageflow/ samples/

Author: ekoneil
Date: Thu Aug 25 14:49:52 2005
New Revision: 240148

URL: http://svn.apache.org/viewcvs?rev=240148&view=rev
Log:
Whole bunch of edits:

- renaming <pageflow_databinding> to <databinding> and fixing references
- renaming <pageflow_datagrid> to <datagrid> and fixing references
- adding a Controls and NetUI section to the glossary along with additional terms
- add a bunch of overview content to index.xml
- rename jpetstore.xml to petstore.xml since it really is the latter

BB: self
DRT: build.release pass


Added:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/petstore.xml
      - copied unchanged from r240136, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml
Removed:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/jpetstore.xml
Modified:
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml Thu Aug 25 14:49:52 2005
@@ -5,33 +5,73 @@
         <title>Glossary of Terms</title>
     </header>
     <body>
+        <section id="glossaryControls">
+            <title>Glossary: Controls</title>
             <dl id="control">
                 <dt><strong>Control</strong></dt>
-                <dd>Controls are designed to make it easier to integrate complex resources into your Java application.  Controls 
-                    consist of two Java files: a Control implementation file, and a Control interface file.</dd>
+                <dd>
+                Controls are designed to make it easier to integrate complex resources into your Java application.  Controls 
+                consist of two Java files: a Control implementation file, and a Control interface file.
+                </dd>
+            </dl>
+            <dl id="controlBean">
+                <dt><strong>Control Bean</strong></dt>
+                <dd>
+                A Control Bean is a file that is generated while running the Controls annotation processing.  The Control Bean
+                is the glue between a control interface and a control implementation.  When using a Control from a Control client,
+                either the Control's interface or the Control Bean may be used to refer to declare a Control.  The Control Bean
+                provides access to methods supporting adding / removing event listeners and getting / setting Control properties.
+                </dd>
+            </dl>
+            <dl id="systemControl">
+                <dt><strong>System Control</strong></dt>
+                <dd>
+                System controls are those that are low-level abstractions atop typical system resources such as EJB, JMS, JDBC, and web services.
+                </dd>
             </dl>
+        </section>
+        <section id="glossaryNetUI">
+            <title>Glossary: NetUI</title>
             <dl id="page_flow">
                 <dt><strong>Page Flow</strong></dt>
-                <dd>A Page Flow consists of one JPF Controller file and one or more JSP pages.  A Page Flow is a web 
-                    application module.  A whole web application consists of one or more Page Flows.</dd>
+                <dd>
+                A Page Flow consists of one JPF Controller file and one or more JSP pages.  A Page Flow is a web 
+                application module.  A whole web application consists of one or more Page Flows.
+                </dd>
             </dl>
             <dl id="controller_file">
                 <dt><strong>Page Flow Controller</strong></dt>
-                <dd>The Controller class is a Java class that handles the data processing tasks in a <a href="#page_flow">Page Flow</a>.
-                    Controller classes contain the action methods and configuration information (encoded as metadata annotations) for a Page Flow web application.</dd>
+                <dd>
+                The Controller class is a Java class that handles the data processing tasks in a <a href="#page_flow">Page Flow</a>.
+                Controller classes contain the action methods and configuration information (encoded as metadata annotations) for a Page Flow web application.
+                </dd>
             </dl>
             <dl id="databinding">
-                <dt><strong>Databinding</strong></dt>
-                <dd>Databinding connects JSP pages to data objects.  The data objects can be located in various places throughout the web application: 
-                    in the <a href="#controller_file">Controller file</a>, in the standard JSP objects, etc. A list of the different databinding expressions
-                    can be found at <a href="site:pageflow_databinding">Data binding</a>.</dd>
+                <dt><strong>data binding</strong></dt>
+                <dd>
+                <p>
+                Data binding used to bind UI widgets to data in the web-tier environment.  The data objects can be located in various places throughout 
+                the web application:
+                </p>
+                <ul>
+                    <li>in the <a href="#controller_file">Controller file</a></li>
+                    <li>in container provided JSP implicit objects</li>
+                    <li>in NetUI framework provided JSP implicit objects</li>
+                </ul>
+                <p>
+                More details about data binding can be found <a href="site:pageflow/databinding">here</a>.
+                </p>
+                </dd>
             </dl>
             <dl id="formbean">
-                <dt><strong>Form Bean</strong></dt>
-                <dd><p>Typically, a Form Bean is a server-side representation of the data in an HTML &lt;form> tag.  A Form Bean follow ordinary 
+                <dt><strong>form bean</strong></dt>
+                <dd>
+                <p>
+                Typically, a Form Bean is a server-side representation of the data in an HTML &lt;form> tag.  A Form Bean follow ordinary 
                 Java Bean syntax: each Form Bean is a class consisting of any number of members, each member having a setter and a getter 
                 method associated with it.  Form Beans should also extend <code>java.io.Serializable</code> in order to facilitate persistence 
-                of Form Bean instances.  The Sample Form Bean below has two members, each member has a getter and setter method associated with it.</p>
+                of Form Bean instances.  The Sample Form Bean below has two members, each member has a getter and setter method associated with it.
+                </p>
             <source>
 public class ProfileFormBean 
     implements java.io.Serializable {
@@ -56,21 +96,26 @@
     }
 }
             </source>
-            <p>Form Beans are most often used to pick up data that is submitted from a &lt;netui:form> tag, or incoming data from a back-end resource.  
-               Once the POST data has been mapped to a Form Bean instance, the Form Bean is passed to a Page Flow Action method.  Note, Form Beans
-               can be either standalone Java files or inner-classes of a Page Flow Controller.
+            <p>
+            Form Beans are most often used to pick up data that is submitted from a &lt;netui:form> tag, or incoming data from a back-end resource.  
+            Once the POST data has been mapped to a Form Bean instance, the Form Bean is passed to a Page Flow Action method.  Note, Form Beans
+            can be either standalone Java files or inner-classes of a Page Flow Controller.
             </p>
                 </dd>
             </dl>
             <dl id="netui_tag_lib">
                 <dt><strong>NetUI JSP Tag Library</strong></dt>
-                <dd>The JSP library for Page Flow web applications.  The &lt;netui> tag library uses JSP 2.0 and NetUI databinding expressions to 
-                    bind UI to data provided by the Page Flow Controller and other web application data / resources.</dd>
+                <dd>
+                The JSP library for Page Flow web applications.  The &lt;netui> tag library uses JSP 2.0 and NetUI databinding expressions to 
+                bind UI to data provided by the Page Flow Controller and other web application data / resources.
+                </dd>
             </dl>
+        </section>
     </body>
     <footer>
-        <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-    &copy; 2004, Apache Software Foundation
-    </legal>
+        <legal>
+        Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
+        &copy; 2004, Apache Software Foundation
+        </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml Thu Aug 25 14:49:52 2005
@@ -2,43 +2,83 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Beehive SVN Documentation</title>
+        <title>Beehive $VERSION Documentation</title>
     </header>
     <body>
-        <p>The Beehive documentation contains instructions, tutorials, samples, and user guides for the Beehive sub-projects.  If 
-           you are new to Beehive, the control, page flow, and WSM overviews are a good place to start:</p>
+        <p>
+        Welcome to Beehive!  Apache Beehive is a project focused on building ease-of-use frameworks for enterprise Java applications.  
+        Using <a href="site:jsr/n175">JSR 175</a> metadata for configuration and declarative programming, Beehive reduces the
+        amount of coding necessary for building enterprise applications.
+        </p>
+        <p>
+        Beehive consists of several projects which can be used either together or seprately depending on the requirements of an application.
+        These include:
+        </p>
         <ul>
-            <li><a href="site:control_overview">Controls Overview</a></li>
-            <li><a href="site:pageflow_overview">Page Flow Overview</a></li>
-            <li><a href="site:wsm_overview">Web Service Overview</a></li>
+            <li><strong>NetUI</strong>: An annotation-driven web application programming framework that is built atop Struts. 
+                NetUI centralizes navigation logic, state, metadata, and exception handling in a single enacpsulated
+                and reusable <a href="site:pageflow/pageflow_overview">Page Flow Controller</a> class.  In addition, NetUI provides a set of JSP tags
+                for rendering HTML / XHTML and higher-level UI constructs such as data grids and trees and has first-class
+                integration with JavaServer Faces and Struts.</li>
+            <li><strong>Controls</strong>: A lightweight, metadata-driven component framework for building that reduces the 
+                complexity of being a client of enterprise resources.  Controls provide a unified client abstraction that
+                can be implemented to access a diverse set of enterprise resources using a single configuration model.
+            </li>
+            <li><strong>Web Service Metadata (WSM)</strong>: An implementation of <a href="site:jsr/n181">JSR 181</a> which 
+                standardizes a simplified, annotation-driven model for building Java web services.
+            </li>
         </ul>
-        <p>To start building Beehive-enabled applications, follow the <a href="site:setup">Installation and Setup</a> instructions.</p>
-        <p><strong>Getting Started Guides</strong></p>
+        <p>
+        In addition, Beehive includes a set of <em>system controls</em> that are abstractions for low-level J2EE resource APIs such
+        as EJB, JMS, JDBC, and web services.
+        </p>
+        <p>
+        The Beehive documentation package contains tutorials, user guies, samples, and project templates for getting started building
+        various kinds of applications.  If you are new to Beehive, the overview documentation for NetUI, Controls, and WSM are 
+        good starting points:
+        </p>
+        <ul>
+            <li><a href="site:control_overview">Controls</a></li>
+            <li><a href="site:pageflow_overview">Page Flow</a></li>
+            <li><a href="site:wsm_overview">Web Service Metadata</a></li>
+        </ul>
+        <p>
+        To get started building Beehive-enabled projects, follow the <a href="site:setup">Setup</a> instructions and look at the 
+        Beehive <strong>project templates</strong> which are skeletons for building new Beehive-enabled web, control, and web 
+        service projects:
+        </p>
+        <ul>
+            <li><a href="site:netui-blank">Blank Page Flow</a></li>
+            <li><a href="site:control-blank">Blank Control</a></li>
+            <li><a href="site:wsm-blank">Web Service Metadata</a></li>
+            <li><a href="site:ws-control-blank">Web Service Control</a></li>
+        </ul>
+        <p>
+        More detailed information on starting projects is available in the <strong>getting started</strong> guides:
+        </p>
         <ul>
             <li><a href="site:control_getting_started">Controls</a></li>
             <li><a href="site:pageflow_getting_started">Page Flows</a></li>
-            <li><a href="site:wsm_getting_started">Web Services</a></li>
+            <li><a href="site:wsm_getting_started">Web Service metadata</a></li>
         </ul>
-        <p><strong>Tutorials</strong> are end-to-end examples of how to build webapps using these Beehive features.</p>
+        <p>
+        The <strong>tutorials</strong> are end-to-end examples of how to build projects with Beehive features:
+        </p>
         <ul>
             <li><a href="site:tutorial_control">Controls</a></li>
             <li><a href="site:tutorial_pageflow">Page Flow</a></li>
+            <li><a href="site:wsm/tutorial">Web Service Metadata</a></li>
         </ul>
-        <p><strong>Samples</strong> are a good starting point for learning about Beehive.</p>
+        <p>
+        The <strong>samples</strong> are another good starting point for learning about Beehive.
+        </p>
         <ul>
-            <li><a href="site:jpetstore">Petstore Sample</a></li>
-            <li><a href="site:netui-samples">Page Flow Samples</a></li>
-            <li><a href="site:netui-jsf">Page Flow: JSF Integration</a></li>
-            <li><a href="site:address-enhanced">Web Service: AddressBook Enhanced</a></li>
-            <li><a href="site:address-wsdl">Web Service: AddressBook from WSDL</a></li>
+            <li><a href="site:petstore">Petstore Sample</a></li>
+            <li><a href="site:netui-samples">NetuI Samples</a></li>
+            <li><a href="site:netui-jsf">NetUI + JSF Integration</a></li>
+            <li><a href="site:address-enhanced">Web Service Metadata: AddressBook</a></li>
+            <li><a href="site:address-wsdl">Web Service Metadata: Address Book starting with WSDL</a></li>
         </ul> 
-        <p><strong>Project Templates</strong> are project skeletons for building Beehive-enabled applications.</p>
-        <ul>
-            <li><a href="site:netui-blank">Project: Blank Page Flow</a></li>
-            <li><a href="site:control-blank">Project: Blank Control</a></li>
-            <li><a href="site:wsm-blank">Project: Blank Web Service</a></li>
-            <li><a href="site:ws-control-blank">Project: Web Service Control</a></li>
-        </ul>
     </body>
     <footer>
         <legal>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/getting_started.xml Thu Aug 25 14:49:52 2005
@@ -5,22 +5,20 @@
         <title>Page Flows: Getting Started</title>
     </header>
     <body>
-		<p>For an introduction to the basic concepts of Page Flows, see the <strong>users guide</strong>
-			topics:</p>
-		        <ul>
+        <p>For an introduction to the basic concepts of Page Flows, see the <strong>users guide</strong> topics:</p>
+        <ul>
             <li><a href="site:pageflow_overview">Page Flow Overview</a></li>
             <li><a href="site:pageflow_jsp">JSP Files</a></li>
         </ul>
-        <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle
-			Page Flow web applications:</p>
-		        <ul>
+        <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle Page Flow web applications:</p>
+        <ul>
             <li><a href="site:tutorial_pageflow">Page Flow Tutorial</a></li>
         </ul>
-        <p>The following <strong>sample</strong> demonstrates 
-            a full Page Flow web application that uses multiple, modular Page Flows, and controls
-			to access back-end resources:</p>
+        <p>
+        The following <strong>sample</strong> demonstrates a complete Page Flow web application that uses 
+        multiple, modular Page Flows, and Controls for back-end resource access:</p>
         <ul>
-            <li><a href="site:jpetstore">Petstore</a></li>
+            <li><a href="site:samples/petstore">Petstore</a></li>
         </ul>
         <p>The following <strong>sample</strong> demonstrates individual Page Flow features:</p>
         <ul>
@@ -30,16 +28,14 @@
         <ul>
             <li><a href="site:netui-jsf">Page Flow: JSF Integration</a></li>
         </ul>
-        <p>The following <strong>project template</strong> will help you get a 
-			Page Flow project started:</p>
+        <p>The following <strong>project template</strong> will help you get a Page Flow project started:</p>
         <ul>
             <li><a href="site:netui-blank">Project: Page Flow</a></li>
-
         </ul>
     </body>
     <footer>
     <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-	&copy; 2004, Apache Software Foundation
-	</legal>
+    &copy; 2004, Apache Software Foundation
+    </legal>
     </footer>
 </document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/jspOverview.xml Thu Aug 25 14:49:52 2005
@@ -26,10 +26,10 @@
                 This tag library provides a very simple templating facility, allowing common elements such
                 as headers, footers, etc.</li>
         </ul>
-        <p> Page Flows also make extensive use of <strong><em>databinding expressions</em></strong>
+        <p> Page Flows also make extensive use of <strong><em>data binding expressions</em></strong>
             to bind the JSP pages to data in the controller class.  For a detailed explanation
             of databinding expressions see
-            <a href="site:pageflow_databinding">Databinding: Passing Data Between Controller Classes and JSP Pages</a>
+            <a href="site:pageflow/databinding">Databinding: Passing Data Between Controller Classes and JSP Pages</a>
         </p>
     </section>
     <section id="StartingJSP">

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/pageflow_overview.xml Thu Aug 25 14:49:52 2005
@@ -44,7 +44,7 @@
 		<p><strong>Page Flows are Modular</strong></p>
 <p>A single web application can have multiple Page Flows within it, allowing you to break up the application 
 	into separate, self-contained chunks of functionality.  For an example, see the 
-		<a class="fork" href="../samples/jpetstore.html">Petstore Sample</a>, which has different Page Flows 
+		<a class="fork" href="site:samples/petstore">Petstore Sample</a>, which has different Page Flows 
 		for browsing the Petstore, buying products, and handling user accounts.</p>
 <p>Page Flow web applications also contain a global Page Flow, called the "shared flow", which is both 
 	a fallback handler for unhandled actions and exceptions and a place to store session state. An instance 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/tagsOverview.xml Thu Aug 25 14:49:52 2005
@@ -43,7 +43,7 @@
                 attribute on the tags.  In addition, there are a number of binding contexts introduced to allow
                 binding to Page Flows and other NetUI implicit objects.
                 For more information on data binding see the
-                <a href="site:pageflow_databinding">Data binding to NetUI Implicit Objects</a> topic.
+                <a href="site:pageflow/databinding">Data binding to NetUI Implicit Objects</a> topic.
             </p>
         </section>
         <section id="RuntimeErrors">
@@ -93,7 +93,7 @@
             <p>The NetUI data grid tag library provides tags to render grids of data in an HTML page.  The library
                 supports a range of features from simple tables to complex data features.  The complex features include
                 sortable columns, filtering, paging and updatable grids.  Styles can be applied to the grids to
-                customize their presentation.   For more information on the grid see the <a href="site:pageflow_datagrid">
+                customize their presentation.   For more information on the grid see the <a href="site:pageflow/pageflow_tags/datagrid">
                 NetUI Data Grids</a> topic.
             </p>
         </section>
@@ -106,4 +106,4 @@
             </p>
         </section>
     </body>
-</document>
\ No newline at end of file
+</document>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml Thu Aug 25 14:49:52 2005
@@ -12,7 +12,7 @@
         </p>
         <ul>
             <li>
-                <a href="site:jpetstore">Petstore</a>
+                <a href="site:samples/petstore">Petstore</a>
             </li>
             <li>
                 <a href="site:netui-jsf">Page Flow: JSF Integration</a>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=240148&r1=240147&r2=240148&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml Thu Aug 25 14:49:52 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <site label="Beehive" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="release-svn">
     <docs label="Documentation" tab="release-svn">
-        <setup label="Installation and Setup" href="setup.html"/>
+        <setup label="Setup" href="setup.html"/>
         <tutorials label="Tutorials">
             <tutorial_setup label="Setup" href="tutorial/setup.html"/>
             <tutorial_pageflow label="Page Flows" href="pageflow/tutorial_pageflow.html"/>
@@ -22,7 +22,7 @@
                 <pageflow_jspOverview_StartingJSP href="#StartingJSP" />
             </pageflow_jsp>
             <pageflow_altering label="Altering a Page Flow" href="pageflow/pageflow_altering.html"/>
-            <pageflow_databinding label="Databinding" href="pageflow/databinding.html"/>
+            <databinding label="Databinding" href="pageflow/databinding.html"/>
             <pageflow_inheritance label="Inheritance" href="pageflow/pageflow_inheritance.html"/>
             <pageflow_sharedFlow label="Shared Flow" href="pageflow/sharedFlow.html"/>
             <pageflow_popups label="Popup Windows" href="pageflow/popupWindows.html"/>
@@ -68,12 +68,13 @@
         <wsm label="Web Services">
             <wsm_getting_started label="Getting Started" href="wsm/getting_started.html"/>
             <wsm_overview label="Overview" href="wsm/wsm_overview.html"/>
+            <tutorial label="Tutorial" href="wsm/tutorial_wsm.html"/>
             <jws_files label="Java Web Services" href="wsm/wsm_JWSFiles.html"/>
             <supported_datatypes label="Supported Data Types" href="wsm/datatypes.html"/>
         </wsm>
         <samples label="Samples">
             <sam_index label="Overview" href="samples/index.html"/>
-            <jpetstore label="Petstore" href="samples/jpetstore.html"/>
+            <petstore label="Petstore" href="samples/petstore.html"/>
             <netui-samples label="Page Flow Samples" href="pageflow/netui-samples.html"/>
             <netui-jsf label="Page Flow: JSF Integration" href="pageflow/sample_jpf_jsf_integration.html"/>
             <address-enhanced label="Web Service: AddressBook Enhanced" href="wsm/sample_AddressBookEnhanced.html"/>