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/22 17:12:50 UTC
svn commit: r234503 - in
/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs: ./
controls/ development/ pageflow/
Author: ekoneil
Date: Mon Aug 22 08:12:40 2005
New Revision: 234503
URL: http://svn.apache.org/viewcvs?rev=234503&view=rev
Log:
Whole bunch of cleanup in the release documentation.
- reorganize the index.html page to put the sub-project overviews at the top
- fix camel-case names to be "_" names in controls/
- move the page flow dev_mode.xml doc into the page flow subdirectory
- add "index.html" to the tab link
BB: self
DRT: build.release pass
Added:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_containment.xml
- copied unchanged from r234490, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsContainment.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_overview.xml
- copied unchanged from r234490, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsOverview.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_programming.xml
- copied, changed from r234490, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsProgramming.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/dev_mode.xml
- copied unchanged from r234490, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/development/dev_mode.xml
Removed:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsContainment.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsOverview.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsProgramming.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/development/
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/getting_started.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml
Copied: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_programming.xml (from r234490, beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsProgramming.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_programming.xml?p2=beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_programming.xml&p1=beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsProgramming.xml&r1=234490&r2=234503&rev=234503&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controlsProgramming.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/controls_programming.xml Mon Aug 22 08:12:40 2005
@@ -17,12 +17,12 @@
</ul>
<p>This document focuses on the Controls programming and configuration model from two distinct perspectives:</p>
<ul>
- <li> The authoring and extensibility model for defining a new type of Control</li>
+ <li> The authoring and extensibility model for defining a new type of Control</li>
- <li> The client access model for declaring and using Controls</li>
+ <li> The client access model for declaring and using Controls</li>
</ul>
- <p>An overview of the Control architecture and toolable access models can be found in the companion document entitled <a href="controlsOverview.html">Control Overview: Providing Simplified and Unified Access to J2EE Resources</a></p>
+ <p>An overview of the Control architecture and toolable access models can be found in the companion document entitled <a href="site:control_overview">Control Overview: Providing Simplified and Unified Access to J2EE Resources</a></p>
</section>
<section id="example">
@@ -94,18 +94,18 @@
<title>Defining a New Control Type</title>
<p>Controls are designed to make it very easy for users (and tools) to define new types of Controls. Control authors might be:</p>
<ul>
- <li> System vendors exposing specific types of resources</li>
+ <li> System vendors exposing specific types of resources</li>
- <li> Application developers defining new types of logical resources (possibly based upon physical ones)</li>
+ <li> Application developers defining new types of logical resources (possibly based upon physical ones)</li>
<li>Third-party software vendors, using Controls as a mechanism to interface to components or subsystems they provide.</li>
</ul>
<p>In all instances, the goal of the Controls authoring model is to provide a basic set of conventions and supporting tools to make it easy to author a new Control type.</p>
<p>To get started, a Control author would define the two basic artifacts: </p>
<ul>
- <li> the Control Public Interface</li>
+ <li> the Control Public Interface</li>
- <li> the Control Implementation Class</li>
+ <li> the Control Implementation Class</li>
</ul>
<p>For the JmsMessageControl, the declaration of the public interface might look like:</p>
<p><strong>Interface Declaration (Control Public Interface)</strong></p>
@@ -408,8 +408,8 @@
<p>A key aspect of this service model is that it can be contextual; for example, it might be possible to write a basic security service interface that provides logical role-checking functionality. The actual implementation of this interface might vary for different runtime contexts: for example, the role check might be done differently for a Control running within the context of an EJB container (by delegating to the containing EJBContext) vs. a Control running within the Web tier (by delegating to ServletHttpRequest services).</p>
<p>Having an extensibility and service provider location model is important to enable the following scenarios:</p>
<ul>
- <li> The Controlâs implementation is designed to run in a wide variety of environments. It uses the contextual service mechanism to declare its prerequisites and receive a provider implementation that is appropriate to the current runtime context.</li>
- <li> The Controlâs implementation is designed to run in a very specific context (for example, only in the http servlet tier) and wants access to services that are very specific to that context (for example, session state or request query parameters). It should not be possible to instantiate this Control in other contexts (for example, from within an EJB).</li>
+ <li> The Controlâs implementation is designed to run in a wide variety of environments. It uses the contextual service mechanism to declare its prerequisites and receive a provider implementation that is appropriate to the current runtime context.</li>
+ <li> The Controlâs implementation is designed to run in a very specific context (for example, only in the http servlet tier) and wants access to services that are very specific to that context (for example, session state or request query parameters). It should not be possible to instantiate this Control in other contexts (for example, from within an EJB).</li>
</ul>
<p><strong>One key contextual service for Controls that is guaranteed to be available in all contexts is the org.apache.beehive.controls.api.context.ControlBeanContext service interface. </strong>This service provides a common set of generic services that are available to Control authors, such as the ability to query property values on the current instance, or to receive a set of basic lifecycle or resource management events. The ControlBeanContext interface extends the java.beans.beancontext.BeanContextServices interface, so it also provides access to services provided by the JavaBeans bean context APIs. Later sections describe an overview of the internal architecture for contextual services, APIs to support property resolution, and lifecycle events.</p>
<section>
@@ -472,9 +472,9 @@
<p>Declarative access to context services is always available to a Control Implementation Class, and generally results in less code associated with accessing services. Why then, would using programmatic access ever be useful? There is a key difference between the two:</p>
<ul>
- <li> When using the declarative model for accessing a contextual service, the Control is effectively saying that the service is required for it to function; if not available in a particular runtime environment, then construction of an instance of the Control will fail. Essentially, the annotated context acts as a notification to the runtime factory that this prerequisite must be satisfied.</li>
+ <li> When using the declarative model for accessing a contextual service, the Control is effectively saying that the service is required for it to function; if not available in a particular runtime environment, then construction of an instance of the Control will fail. Essentially, the annotated context acts as a notification to the runtime factory that this prerequisite must be satisfied.</li>
- <li> Use of the programmatic model allows a Control Implementation Class to implement conditional behavior based upon whether a contextual service is or is not available. The Control Implementation Class can use the programmatic accessor, and then make a decision how to proceed based upon whether the requested service is available.</li>
+ <li> Use of the programmatic model allows a Control Implementation Class to implement conditional behavior based upon whether a contextual service is or is not available. The Control Implementation Class can use the programmatic accessor, and then make a decision how to proceed based upon whether the requested service is available.</li>
</ul>
</section>
</section>
@@ -484,26 +484,26 @@
<p>This section describes Control properties. Properties provide the basic mechanism for parameterizing the behavior of a Control instance.</p>
<p>The Controls architecture takes the basic JavaBeans notion of properties and extends it to support two new capabilities:</p>
<ul>
- <li> A declarative annotation model where properties can be preconfigured on a ControlBean using JSR-175 annotations</li>
+ <li> A declarative annotation model where properties can be preconfigured on a ControlBean using JSR-175 annotations</li>
- <li> An administrative model where the value of ControlBean properties can be externally defined or overridden.</li>
+ <li> An administrative model where the value of ControlBean properties can be externally defined or overridden.</li>
</ul>
<p>The external configuration and administrative model for Controls will be described in a separate document.</p>
<section id="declaring_props">
<title>Declaring Properties for a Control Type</title>
<p>For Controls, the set of properties is explicitly declared on the Control Public Interface.
- This makes the available parameterization of a Control type readily visible to both code
- and tools.</p>
+ This makes the available parameterization of a Control type readily visible to both code
+ and tools.</p>
<p>Properties are grouped together into related groups called PropertySets. All Properties within a
- PropertySet will have a common set of attributes (such as where they can be declared, the access
- model for JavaBean accessors, etc) and will have property names based upon a common naming
- convention.</p>
+ PropertySet will have a common set of attributes (such as where they can be declared, the access
+ model for JavaBean accessors, etc) and will have property names based upon a common naming
+ convention.</p>
<p>A PropertySet is declared as a JSR-175 attribute interface within the Control Public Interface,
- which is also decorated with the org.apache.beehive.controls.api.properties.PropertySet
- meta-attribute. Each of the members within a PropertySet will refer to a distinct property
- within the set, and the return value of the member defines the property type.</p>
+ which is also decorated with the org.apache.beehive.controls.api.properties.PropertySet
+ meta-attribute. Each of the members within a PropertySet will refer to a distinct property
+ within the set, and the return value of the member defines the property type.</p>
<p>Here is a sample declaration of the Destination PropertySet for the JmsMessageControl, which can
- be used to configure the target JMS destination for the Control:</p>
+ be used to configure the target JMS destination for the Control:</p>
<p><strong>Declaring Properties (Control Public Interface)</strong></p>
<source>package org.apache.beehive.controls.examples;
@@ -534,14 +534,14 @@
<p>This declaration defines the PropertySet named âDestinationâ that includes two properties: type and name. The type property is based upon the DestinationType enumerated type, which is also defined in the public interface. The name attribute is a simple String property.</p>
<p>Meta-attributes on a PropertySet or property declaration can be used to provide additional details about the properties and how they may be used. In the above example, the standard java.lang.annotations.Target annotation is used to define the places where the @Destination property set can appear (in this case in either an extension class or field declaration). </p>
<p>The full set of meta-attributes that can decorate PropertySet or Property declarations are TBD.
- They can be used to define constraint models for property values, or relationships between
- properties (such as exclusive or, where one is set or the other, but never both). These
- meta-attributes can be read and used by development or administrative tools to aid in the
- selection of property values. They can also be used by the runtime for runtime validation of
- property values when set dynamically. The current set of property constraint mechanisms
- is implemented by the <code>@AnnotationConstraints</code> annotation. See
- <a href="#property_constraints">Defining Property Constraints</a> below for details.
- </p>
+ They can be used to define constraint models for property values, or relationships between
+ properties (such as exclusive or, where one is set or the other, but never both). These
+ meta-attributes can be read and used by development or administrative tools to aid in the
+ selection of property values. They can also be used by the runtime for runtime validation of
+ property values when set dynamically. The current set of property constraint mechanisms
+ is implemented by the <code>@AnnotationConstraints</code> annotation. See
+ <a href="#property_constraints">Defining Property Constraints</a> below for details.
+ </p>
</section>
<section id="accessing_props_from_client_code">
@@ -638,21 +638,21 @@
</section>
<section id="property_constraints">
- <title>Defining Property Constraints</title>
- <p>You can set up constraints on control properties using the
- <code>@AnnotationConstraints</code>
- annotation. <code>@AnnotationConstraints</code> allows you to set up
- rules related to (1) the instantiation of the control properties
- by client code, (2) external overriding of the control, and (3)
- the Beehive runtime version required by the control. </p>
- <p><strong>Note:</strong> the constraint rules are enforced at build time,
- when controls are
- declared in client code by <code>@Control</code>. There is no runtime
- enforcement
- of the rules.</p>
- <p>For example the following constraint requires that exactly one property
- be referenced when declaring the control BookControl.</p>
- <source>
+ <title>Defining Property Constraints</title>
+ <p>You can set up constraints on control properties using the
+ <code>@AnnotationConstraints</code>
+ annotation. <code>@AnnotationConstraints</code> allows you to set up
+ rules related to (1) the instantiation of the control properties
+ by client code, (2) external overriding of the control, and (3)
+ the Beehive runtime version required by the control. </p>
+ <p><strong>Note:</strong> the constraint rules are enforced at build time,
+ when controls are
+ declared in client code by <code>@Control</code>. There is no runtime
+ enforcement
+ of the rules.</p>
+ <p>For example the following constraint requires that exactly one property
+ be referenced when declaring the control BookControl.</p>
+ <source>
@ControlInterface
public interface BookControl
{
@@ -660,7 +660,7 @@
/**
* The user must set one value, and only one value when
- * instantiating controls declaratively.
+ * instantiating controls declaratively.
*/
@PropertySet
@Target ({ElementType.FIELD, ElementType.TYPE})
@@ -674,22 +674,22 @@
public String subject();
@AnnotationMemberTypes.Text(maxLength=8)
public String content();
- }
+ }
...
}
- </source>
- <p>The following client code will cause a compile error, because it violates the
- "exactly one" constraint on the BookControl.Intro property.</p>
- <source> @Control
+ </source>
+ <p>The following client code will cause a compile error, because it violates the
+ "exactly one" constraint on the BookControl.Intro property.</p>
+ <source> @Control
@BookControl.Intro(title="some title", subject="some subject")
BookControlBean myBook</source>
<p>When constraining properties with <code>@AnnotationConstraints</code>, all of the property
- members must be annotated
- with <code>@AnnotationMemberTypes</code>, or compile errors will be thrown. For example, the following
- will <em>not</em> compile, because not all of the property members (namely <code>someMember3()</code>)
- are decorated with
- <code>@AnnotationMemberTypes</code>.</p>
+ members must be annotated
+ with <code>@AnnotationMemberTypes</code>, or compile errors will be thrown. For example, the following
+ will <em>not</em> compile, because not all of the property members (namely <code>someMember3()</code>)
+ are decorated with
+ <code>@AnnotationMemberTypes</code>.</p>
<source>
@AnnotationConstraints.MembershipRule(AnnotationConstraints.MembershipRuleValues.EXACTLY_ONE)
public @interface SomeProperty
@@ -699,9 +699,9 @@
@AnnotationMemberTypes.Text(maxLength=8)
public String someMember2();
<strong>public String someMember3();</strong>
- }</source>
+ }</source>
<p>Not all Java types are supported by <code>@AnnotationMemberTypes</code>. For a list of the supported types
- see <a href="../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.html">Interface AnnotationMemberTypes</a>.</p>
+ see <a href="../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.html">Interface AnnotationMemberTypes</a>.</p>
</section>
</section>
<section id="extensibility">
@@ -896,9 +896,9 @@
}</source>
<p>There are several attributes worth noting about the extended ControlBean Generated Class:</p>
<ul>
- <li> Its implementation will be a subclass of the base type ControlBean, so implementation of base type operations is inherited.</li>
+ <li> Its implementation will be a subclass of the base type ControlBean, so implementation of base type operations is inherited.</li>
- <li> The extended bean will implement the extended Control interface, meaning all extended operations will be implemented by the bean.</li>
+ <li> The extended bean will implement the extended Control interface, meaning all extended operations will be implemented by the bean.</li>
</ul>
<p>The implementation of these extended operations will always delegate down to the base Control Implementation Class by calling the Extensible.invoke() method.</p>
</section>
@@ -1082,7 +1082,7 @@
<title>The onAcquire Event</title>
<p>The onAcquire event is delivered to a registered listener the first time a ControlBean operation is invoked within a particular resource scope. It provides an opportunity for the Control Implementation instance (or other related entities, such as a contextual service provider) to acquire any short-term resources (connections, sessions, etc) needed by the ControlBean.</p>
<p>The onAcquire event is guaranteed to be delivered once (and only once) prior to invocation of any operation within a resource scope; it is also guaranteed that a paired onRelease event will be delivered when the resource scope ends.</p>
-<p>For more details on resource management, refer to the <a href="controlsOverview.html">Control Overview</a> document.</p>
+<p>For more details on resource management, refer to the <a href="site:control_overview">Control Overview</a>.</p>
</section>
<section>
@@ -1155,9 +1155,9 @@
<title>JavaBean Context Events</title>
<p>The org.apache.beehive.controls.api.context.ControlBeanContext API extends the following standard JavaBean context APIs:</p>
<ul>
- <li> java.beans.BeanContextChild</li>
- <li> java.beans.BeanContext</li>
- <li> java.beans.BeanContextServices</li>
+ <li> java.beans.BeanContextChild</li>
+ <li> java.beans.BeanContext</li>
+ <li> java.beans.BeanContextServices</li>
</ul>
<p>These APIs provide access to a standard set of JavaBean events that the Control Implementation Class can register an interest in. </p>
<p><em><!--[todo]-->[Issue: there is not a declarative mechanism for receiving these events, but probably should be.]</em></p>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/getting_started.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/getting_started.xml?rev=234503&r1=234502&r2=234503&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/getting_started.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/getting_started.xml Mon Aug 22 08:12:40 2005
@@ -5,31 +5,29 @@
<title>Controls: Getting Started</title>
</header>
<body>
- <p>For an introduction to the basic concepts of Java Controls, see the <strong>users guide</strong>
- topics:</p>
- <ul>
+ <p>For an introduction to the basic concepts of Java Controls, see the <strong>users guide</strong> topics:
+ </p>
+ <ul>
<li><a href="site:control_overview">Controls Overview</a></li>
<li><a href="site:control_prog">Control Programming</a></li>
</ul>
- <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle for
- Java Controls:</p>
- <ul>
- <li><a href="site:tutorial_control">Beehive Controls Tutorial</a></li>
+ <p>The following <strong>tutorial</strong> will familiarize with the basic development cycle for Java Controls:</p>
+ <ul>
+ <li><a href="site:tutorial_control">Controls Tutorial</a></li>
</ul>
<p>The following <strong>project template</strong> will help you get a
- Control project started:</p>
+ Control project started:</p>
<ul>
<li><a href="site:control-blank">Project: Control</a></li>
-
</ul>
-
- <p>The following <strong>project template</strong> will get your web service control project
- started </p>
- <ul><li><a href="site:ws-control-blank">Project: Web Service Control</a></li></ul>
+ <p>The following <strong>project template</strong> will get your web service control project started </p>
+ <ul>
+ <li><a href="site:ws-control-blank">Project: Web Service Control</a></li>
+ </ul>
</body>
<footer>
<legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
- © 2004, Apache Software Foundation
- </legal>
+ © 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=234503&r1=234502&r2=234503&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 Mon Aug 22 08:12:40 2005
@@ -2,30 +2,30 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Beehive 1.0 Milestone 1 Documentation</title>
+ <title>Beehive SVN Documentation</title>
</header>
<body>
- <p>Beehive documentation contains documentation for all three Beehive sub-projects:</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>
- </ul>
- <p>If you are new to Beehive, begin by following the <a href="setup.html">Installation and Startup</a> instructions.
- </p>
- <p>See the <strong>user guides</strong> for the Beehive sub-projects:</p>
- <ul>
+ <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>
+ <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>
</ul>
- <p>The following <strong>tutorials</strong> will familiarize you with the basic development cycles for Beehive applications:</p>
+ <p>To start building Beehive-enabled applications, follow the <a href="setup.html">Installation and Setup</a> instructions.</p>
+ <p><strong>Getting Started Guides</strong></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>
+ </ul>
+ <p><strong>Tutorials</strong> are end-to-end examples of how to build webapps using these Beehive features.</p>
<ul>
- <li><a href="site:tutorial_control">Beehive Controls Tutorial</a></li>
- <li><a href="site:tutorial_pageflow">Beehive Page Flow Tutorial</a></li>
- <li><a href="site:tutorial_wsm">Beehive Web Service Tutorial</a></li>
+ <li><a href="site:tutorial_control">Controls Tutorial</a></li>
+ <li><a href="site:tutorial_pageflow">Page Flow Tutorial</a></li>
+ <li><a href="site:tutorial_wsm">Web Service Tutorial</a></li>
</ul>
- <p>Beehive ships with the following <strong>samples</strong>:</p>
+ <p><strong>Samples</strong> are a 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>
@@ -33,7 +33,7 @@
<li><a href="site:address-enhanced">Web Service: AddressBook Enhanced</a></li>
<li><a href="site:address-wsdl">Web Service: AddressBook from WSDL</a></li>
</ul>
- <p>The following <strong>project templates</strong> will help you get a project started:</p>
+ <p><strong>Project Templates</strong> are project skeletons for building Beehive-enabled applications.</p>
<ul>
<li><a href="site:netui-blank">Project: Page Flow</a></li>
<li><a href="site:control-blank">Project: Control</a></li>
@@ -42,8 +42,8 @@
</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/>
- © 2004, Apache Software Foundation
- </legal>
+ <legal>
+ © 2005, Apache Software Foundation
+ </legal>
</footer>
</document>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=234503&r1=234502&r2=234503&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml Mon Aug 22 08:12:40 2005
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
-<site label="Beehive" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="release-v1m1">
- <docs label="Documentation" tab="release-v1m1">
+<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" />
<tutorials label="Tutorials">
<tutorial_pageflow label="Page Flows" href="pageflow/tutorial_pageflow.html"/>
<tutorial_control label="Controls" href="controls/tutorial_controls.html"/>
<tutorial_wsm label="Web Services" href="wsm/tutorial_wsm.html"/>
<tutorial_system-controls label="System Controls">
- <control label="EJB Control Tutorial" href="system-controls/ejb/ejbControlTutorial.html"/>
- <control label="JDBC Control Tutorial" href="system-controls/jdbc/jdbcControlTutorial.html"/>
- <control label="JMS Control Tutorial" href="system-controls/jms/jmsControlTutorial.html"/>
- <control label="Webservices Control Tutorial" href="system-controls/webservices/webservicesControlTutorial.html"/>
+ <control label="EJB Control Tutorial" href="system-controls/ejb/ejbControlTutorial.html"/>
+ <control label="JDBC Control Tutorial" href="system-controls/jdbc/jdbcControlTutorial.html"/>
+ <control label="JMS Control Tutorial" href="system-controls/jms/jmsControlTutorial.html"/>
+ <control label="Webservices Control Tutorial" href="system-controls/webservices/webservicesControlTutorial.html"/>
</tutorial_system-controls>
</tutorials>
<pageflow label="Page Flows">
@@ -24,25 +24,25 @@
<pageflow_datagrid label="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_tree label="Tree Tags" href="pageflow/treeTags.html" />
+ <pageflow_tree label="Tree Tags" href="pageflow/treeTags.html" />
<pageflow_tag_javascript label="Tag JavaScript Support" href="pageflow/tagsJavascript.html" />
<pageflow_valid label="Validation" href="pageflow/validation.html"/>
<pageflow_jsf label="Java Server Faces" href="pageflow/jsf.html"/>
<pageflow_servlet_adapter label="Servlet Container Adapters" href="pageflow/servlet_container_adapters.html"/>
- <devmode label="Development Mode" href="development/dev_mode.html"/>
- <pageflow_faq label="FAQ" href="pageflow/faq.html"/>
+ <devmode label="Development Mode" href="pageflow/dev_mode.html"/>
+ <pageflow_faq label="FAQ" href="pageflow/faq.html"/>
<!--<pageflow_programming label="Page Flow Programming" href="pageflow/guide.html"/>-->
</pageflow>
<controls label="Controls">
- <control_getting_started label="Getting Started" href="controls/getting_started.html"/>
- <control_overview label="Controls Overview" href="controls/controlsOverview.html"/>
- <control_prog label="Control Programming" href="controls/controlsProgramming.html"/>
- <control_contain label="Controls Containment" href="controls/controlsContainment.html"/>
+ <control_getting_started label="Getting Started" href="controls/getting_started.html"/>
+ <control_overview label="Controls Overview" href="controls/controls_overview.html"/>
+ <control_prog label="Control Programming" href="controls/controls_programming.html"/>
+ <control_contain label="Controls Containment" href="controls/controls_containment.html"/>
</controls>
<controls label="System Controls">
- <ejb_control label="Ejb Control" href="system-controls/ejb/ejbDoc.html"/>
- <jdbc_control label="Jdbc Control" href="system-controls/jdbc/jdbcControlDevGuide.html"/>
- <jms_control label="Jms Control" href="system-controls/jms/jmsDoc.html"/>
+ <ejb_control label="EJB Control" href="system-controls/ejb/ejbDoc.html"/>
+ <jdbc_control label="JDBC Control" href="system-controls/jdbc/jdbcControlDevGuide.html"/>
+ <jms_control label="JMS Control" href="system-controls/jms/jmsDoc.html"/>
<webservices_control label="Web Services Control" href="system-controls/webservices/webservicesDoc.html"/>
</controls>
<wsm label="Web Services">
@@ -62,7 +62,7 @@
<netui-blank label="Project: Page Flow" href="pageflow/sample_netui-blank.html"/>
<control-blank label="Project: Control" href="controls/sample_controls-blank.html"/>
<wsm-blank label="Project: Web Service" href="wsm/sample_wsm-blank.html"/>
- <ws-control-blank label="Project: Web Service Control" href="system-controls/webservices/sample-ws-control-blank.html" />
+ <ws-control-blank label="Project: Web Service Control" href="system-controls/webservices/sample-ws-control-blank.html" />
</samples>
<ref label="Reference Docs">
<infra label="Build Tools">
@@ -73,11 +73,11 @@
<control_javadoc label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
</controls>
<system-controls label="System Controls">
- <sys_control_javadoc label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
- <ejb_control_anno label="Ejb Control Annotations" href="system-controls/ejb/ejb-annotations.html"/>
- <db_control_anno label="Jdbc Control Annotations" href="system-controls/jdbc/jdbc-annotations.html"/>
- <jms_control_anno label="Jms Control Annotations" href="system-controls/jms/jms-annotations.html"/>
- <ws_control_anno label="Webservices Control Annotations" href="system-controls/webservices/webservices-annotations.html"/>
+ <sys_control_javadoc label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
+ <ejb_control_anno label="Ejb Control Annotations" href="system-controls/ejb/ejb-annotations.html"/>
+ <db_control_anno label="Jdbc Control Annotations" href="system-controls/jdbc/jdbc-annotations.html"/>
+ <jms_control_anno label="Jms Control Annotations" href="system-controls/jms/jms-annotations.html"/>
+ <ws_control_anno label="Webservices Control Annotations" href="system-controls/webservices/webservices-annotations.html"/>
</system-controls>
<netui label="Page Flows">
<netui_taglib label="<netui> Tags" href="apidocs/taglib/index.html"/>
@@ -90,12 +90,12 @@
<ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
</ws>
</ref>
- <javadoc label="Javadoc">
+ <javadoc label="Javadoc">
<javadoc_control label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
<javadoc_sys_control label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
<javadoc_netui label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
<javadoc_ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
- </javadoc>
+ </javadoc>
<release_notes label="Release Notes" href="release_notes.html"/>
<gloss label="Glossary" href="glossary.html"/>
</docs>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml?rev=234503&r1=234502&r2=234503&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml Mon Aug 22 08:12:40 2005
@@ -18,5 +18,5 @@
-->
<tab id="home" label="Home" dir="" href="http://incubator.apache.org/beehive"/>
- <tab id="release-v1m1" label="Beehive 1.0m1" dir="" indexfile=""/>
+ <tab id="release-svn" label="Beehive SVN" dir="" indexfile="index.html"/>
</tabs>