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 2006/01/26 19:07:00 UTC

svn commit: r372578 [1/3] - in /beehive/trunk: ./ controls/ docs/forrest/release/ docs/forrest/release/src/documentation/content/xdocs/ docs/forrest/release/src/documentation/content/xdocs/controls/ docs/forrest/release/src/documentation/content/xdocs/...

Author: ekoneil
Date: Thu Jan 26 10:06:32 2006
New Revision: 372578

URL: http://svn.apache.org/viewcvs?rev=372578&view=rev
Log:
Reorganize the structure of the distribution documentation's reference docs.  These are now structured:

(controls|netui|system-controls)/
    reference/
        apidocs/ <-- Javadoc
        <other generated doc kits>

So, each sub-project now contains its own documentation in a reference/ directory rather than having every project merged into a single reference directory.

Also changes references to the Javadoc from the Forrest documentation files.

BB: self
Test: build.dist pass, documentation links seem to look good


Modified:
    beehive/trunk/controls/build.xml
    beehive/trunk/distribution.xml
    beehive/trunk/docs/forrest/release/forrest.properties
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/annotations/control_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/programming.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/projects.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/actions.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_class_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_method_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_validation_annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/config/beehive-netui-config.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jsf.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jspOverview.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/lifecycleAndState.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/nestedPageFlow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowControllers.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/pageFlowInheritance.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/popupWindows.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/servlet_container_adapters.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow_vs_inheritance.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tags/datagrid.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tagsFormRepeating.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tagsTree.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tilesSupport.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/validation.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/ejb/annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jdbc/annotations.xml
    beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/jms/annotations.xml
    beehive/trunk/netui/ant/javadoc.xml
    beehive/trunk/system-controls/ant/javadoc.xml
    beehive/trunk/system-controls/src/jms/org/apache/beehive/controls/system/jms/impl/JMSControlImpl.java

Modified: beehive/trunk/controls/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/build.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/controls/build.xml (original)
+++ beehive/trunk/controls/build.xml Thu Jan 26 10:06:32 2006
@@ -200,7 +200,7 @@
     <!-- docs -->
     <!-- ==================================================================== -->
     <target name="docs">
-        <javadoc destdir="${docs.dir}/apidocs/classref_controls" 
+        <javadoc destdir="${docs.dir}/apidocs/" 
                  maxmemory="256M" 
                  windowtitle="Apache Beehive Controls API Documentation (Version ${beehive.version})" 
                  doctitle="Apache Beehive Controls API Documentation (Version ${beehive.version})" 

Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/distribution.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Thu Jan 26 10:06:32 2006
@@ -334,23 +334,38 @@
     </target>
 
     <target name="build.release.docs" unless="skip.docs" description="Builds documentation for a Beehive distribution">
-
         <property name="release.docs.build.dir" location="${build.dir}/docs"/>
         <mkdir dir="${release.docs.build.dir}"/>
 
         <!-- generate the Beehive documentation -->
         <ant antfile="build.xml" target="docs" inheritAll="false"/>    
 
-        <!-- copy Beehive API Javadoc together to the top-level docs directory -->
-        <copy todir="${release.docs.build.dir}/apidocs" failOnError="true">
-            <fileset dir="controls/build/docs/apidocs"/>
-            <fileset dir="netui/build/docs/apidocs"/>
-            <fileset dir="wsm/build/docs/apidocs"/>
-            <fileset dir="system-controls/build/docs/apidocs"/>
-        </copy>
-        
         <copy todir="${release.docs.build.dir}" failOnError="true">
             <fileset dir="docs/forrest/release/build/site"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/netui/apidocs/javadoc" failOnError="true">
+            <fileset dir="netui/build/docs/apidocs"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/netui/apidocs/taglib" failOnError="true" overwrite="true">
+            <fileset dir="netui/build/docs/taglib"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/controls/apidocs/javadoc" failOnError="true">
+            <fileset dir="controls/build/docs/apidocs"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/system-controls/jdbc/apidocs/javadoc" failOnError="true">
+            <fileset dir="system-controls/build/docs/jdbc/apidocs"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/system-controls/ejb/apidocs/javadoc" failOnError="true">
+            <fileset dir="system-controls/build/docs/ejb/apidocs"/>
+        </copy>
+
+        <copy todir="${release.docs.build.dir}/system-controls/jms/apidocs/javadoc" failOnError="true">
+            <fileset dir="system-controls/build/docs/jms/apidocs"/>
         </copy>
     </target>		
 

Modified: beehive/trunk/docs/forrest/release/forrest.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/forrest.properties?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/forrest.properties (original)
+++ beehive/trunk/docs/forrest/release/forrest.properties Thu Jan 26 10:06:32 2006
@@ -81,7 +81,7 @@
 
 # *.excludes=(pattern) - comma-separated list of path patterns to not validate
 # e.g.
-#forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml
+forrest.validate.xdocs.excludes=netui/references/taglib/**,samples/subdir/**,samples/faq.xml
 #forrest.validate.xdocs.excludes=
 
 

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/annotations/control_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/annotations/control_annotations.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/annotations/control_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/annotations/control_annotations.xml Thu Jan 26 10:06:32 2006
@@ -7,45 +7,45 @@
 	<body>
 		<section>
 			<title>Controls Annotations</title>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationConstraints.AllowExternalOverride.html">@AnnotationConstraints.AllowExternalOverride</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationConstraints.MembershipRule.html">@AnnotationConstraints.MembershipRule</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationConstraints.MembershipRuleValues.html">@AnnotationConstraints.MembershipRuleValues</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationConstraints.RequiredRuntimeVersion.html">@AnnotationConstraints.RequiredRuntimeVersion</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Date.html">@AnnotationMemberTypes.Date</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Decimal.html">@AnnotationMemberTypes.Decimal</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.FilePath.html">@AnnotationMemberTypes.FilePath</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Int.html">@AnnotationMemberTypes.Int</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.JndiName.html">@AnnotationMemberTypes.JndiName</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.JndiName.ResourceType.html">@AnnotationMemberTypes.JndiName.ResourceType</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Optional.html">@AnnotationMemberTypes.Optional</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.QName.html">@AnnotationMemberTypes.QName</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Text.html">@AnnotationMemberTypes.Text</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.URI.html">@AnnotationMemberTypes.URI</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.URL.html">@AnnotationMemberTypes.URL</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.XML.html">@AnnotationMemberTypes.XML</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/properties/BaseProperties.html">@BaseProperties</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/BeanInfo.html">@BeanInfo</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/events/Client.html">@Client</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/context/Context.html">@Context</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/Control.html">@Control</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlExtension.html">@ControlExtension</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlImplementation.html">@ControlImplementation</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlInterface.html">@ControlInterface</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlReferences.html">@ControlReferences</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/events/EventHandler.html">@EventHandler</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/events/EventSet.html">@EventSet</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/EventSetInfo.html">@EventSetInfo</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ExternalPropertySets.html">@ExternalPropertySets</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/FeatureAttribute.html">@FeatureAttribute</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/FeatureInfo.html">@FeatureInfo</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/ManifestAttribute.html">@ManifestAttribute</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/ManifestAttributes.html">@ManifestAttributes</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/packaging/PropertyInfo.html">@PropertyInfo</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/properties/PropertySet.html">@PropertySet</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/bean/Threading.html">@Threading</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/versioning/Version.html">@Version</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/versioning/VersionRequired.html">@VersionRequired</a></p>
-			<p><a href="../../apidocs/classref_controls/org/apache/beehive/controls/api/versioning/VersionSupported.html">@VersionSupported</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationConstraints.AllowExternalOverride.html">@AnnotationConstraints.AllowExternalOverride</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationConstraints.MembershipRule.html">@AnnotationConstraints.MembershipRule</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationConstraints.MembershipRuleValues.html">@AnnotationConstraints.MembershipRuleValues</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationConstraints.RequiredRuntimeVersion.html">@AnnotationConstraints.RequiredRuntimeVersion</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Date.html">@AnnotationMemberTypes.Date</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Decimal.html">@AnnotationMemberTypes.Decimal</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.FilePath.html">@AnnotationMemberTypes.FilePath</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Int.html">@AnnotationMemberTypes.Int</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.JndiName.html">@AnnotationMemberTypes.JndiName</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.JndiName.ResourceType.html">@AnnotationMemberTypes.JndiName.ResourceType</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Optional.html">@AnnotationMemberTypes.Optional</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.QName.html">@AnnotationMemberTypes.QName</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.Text.html">@AnnotationMemberTypes.Text</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.URI.html">@AnnotationMemberTypes.URI</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.URL.html">@AnnotationMemberTypes.URL</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.XML.html">@AnnotationMemberTypes.XML</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/properties/BaseProperties.html">@BaseProperties</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/BeanInfo.html">@BeanInfo</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/events/Client.html">@Client</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/context/Context.html">@Context</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/Control.html">@Control</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlExtension.html">@ControlExtension</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlImplementation.html">@ControlImplementation</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlInterface.html">@ControlInterface</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlReferences.html">@ControlReferences</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/events/EventHandler.html">@EventHandler</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/events/EventSet.html">@EventSet</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/EventSetInfo.html">@EventSetInfo</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/ExternalPropertySets.html">@ExternalPropertySets</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/FeatureAttribute.html">@FeatureAttribute</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/FeatureInfo.html">@FeatureInfo</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/ManifestAttribute.html">@ManifestAttribute</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/ManifestAttributes.html">@ManifestAttributes</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/packaging/PropertyInfo.html">@PropertyInfo</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/properties/PropertySet.html">@PropertySet</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/bean/Threading.html">@Threading</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/versioning/Version.html">@Version</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/versioning/VersionRequired.html">@VersionRequired</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/controls/api/versioning/VersionSupported.html">@VersionSupported</a></p>
 		</section>
 			</body>
 			<footer>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml Thu Jan 26 10:06:32 2006
@@ -104,7 +104,7 @@
 
      <section><title>ControlBeanContext</title>
 
-      <p>The <a href="../apidocs/classref_controls/org/apache/beehive/controls/api/context/ControlBeanContext.html">org.apache.beehive.controls.api.context.ControlBeanContext</a> interface extends the base java.bean.BeanContextServices interface to add the unique services available to JavaBeans that are Beehive Controls.  These include access to control property values bound by annotations, external configuration, or client invocation of property accessors, as well as a unique set of lifecycle events.
+      <p>The <a href="apidocs/javadoc/org/apache/beehive/controls/api/context/ControlBeanContext.html">org.apache.beehive.controls.api.context.ControlBeanContext</a> interface extends the base java.bean.BeanContextServices interface to add the unique services available to JavaBeans that are Beehive Controls.  These include access to control property values bound by annotations, external configuration, or client invocation of property accessors, as well as a unique set of lifecycle events.
       </p>
 
       <p>Every Control is guaranteed to have an associated peer ControlBeanContext that can be used to query Control properties, nest other controls (either declaratively or programmatically), and to receive lifecycle events.  This is true even if the Control is not itself nested within a parent context.  
@@ -116,7 +116,7 @@
       @Context ControlBeanContext myContext;
       </source>
 
-      <p>within the Control Implementation class, or by calling the <a href="../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlBean.html#getControlBeanContext()">org.apache.beehive.controls.api.bean.ControlBean.getControlBeanContext()</a> API on a Control bean instance.
+      <p>within the Control Implementation class, or by calling the <a href="apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlBean.html#getControlBeanContext()">org.apache.beehive.controls.api.bean.ControlBean.getControlBeanContext()</a> API on a Control bean instance.
       </p>
  
       <section><title>Control Identifiers</title>
@@ -148,7 +148,7 @@
 
       </section><!-- Control Identity -->
 
-      <p>The <a href="../apidocs/classref_controls/org/apache/beehive/controls/runtime/bean/ControlBeanContext.html">org.apache.beehive.controls.runtime.bean.ControlBeanContext</a> class provides a concrete implementation of the ControlBeanContext interface for the Controls runtime.  
+      <p>The <a href="apidocs/javadoc/org/apache/beehive/controls/runtime/bean/ControlBeanContext.html">org.apache.beehive.controls.runtime.bean.ControlBeanContext</a> class provides a concrete implementation of the ControlBeanContext interface for the Controls runtime.  
       </p>
       <p>This class is used:</p>
       <ul>
@@ -160,7 +160,7 @@
 
      <section><title>ControlBean</title>
 
-      <p>The <a href="../apidocs/classref_controls/org/apache/beehive/controls/api/bean/ControlBean.html">org.apache.beehive.controls.api.bean.ControlBean</a> interface defines a base interface implemented by all Controls.  It provides accessors for:
+      <p>The <a href="apidocs/javadoc/org/apache/beehive/controls/api/bean/ControlBean.html">org.apache.beehive.controls.api.bean.ControlBean</a> interface defines a base interface implemented by all Controls.  It provides accessors for:
       </p>
     
       <ul>
@@ -170,7 +170,7 @@
        <li>The public interface (@ControlInterface or @ControlExtension) implemented by the Control.</li>
       </ul>
 
-      <p>The <a href="../apidocs/classref_controls/org/apache/beehive/controls/runtime/bean/ControlBean.html">org.apache.beehive.controls.runtime.bean.ControlBean</a> class provides a concrete implementation of the ControlBean interface, and is used as the base class for all code-generated Control JavaBeans.
+      <p>The <a href="apidocs/javadoc/org/apache/beehive/controls/runtime/bean/ControlBean.html">org.apache.beehive.controls.runtime.bean.ControlBean</a> class provides a concrete implementation of the ControlBean interface, and is used as the base class for all code-generated Control JavaBeans.
       </p>
 
      </section><!-- ControlBean -->
@@ -178,14 +178,14 @@
      <section><title>ControlContainerContext</title>
 
       <p>The 
-		<a href="../apidocs/classref_controls/org/apache/beehive/controls/runtime/bean/ControlContainerContext.html">org.apache.beehive.controls.runtime.bean.ControlContainerContext</a> class extends the base ControlBeanContext class to define a base integration model (and default implementation, where appropriate) of containment and services to integrate an external container type with the Controls runtime.  Examples of existing external containers for controls are the Servlet container, 
+		<a href="apidocs/javadoc/org/apache/beehive/controls/runtime/bean/ControlContainerContext.html">org.apache.beehive.controls.runtime.bean.ControlContainerContext</a> class extends the base ControlBeanContext class to define a base integration model (and default implementation, where appropriate) of containment and services to integrate an external container type with the Controls runtime.  Examples of existing external containers for controls are the Servlet container, 
 		the EJB container, the Spring bean container, ...
       </p>
 
       <p>An external container can provide additional services to Controls that are running within its scope, such as a definition of how long it is OK for Controls to acquire and hold resources, the integration of a native container configuration model, or contextual services that are unique and specific to the container.   
       </p>
     
-      <p>For any given container, a custom subclass of the ControlContainerContext class can be provided that defines the unique attributes and semantics of the container for controls executing within it.  For example, the <a href="../apidocs/classref_controls/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.html">ServletBeanContext</a> class provided as part of the Controls runtime provides control containment for the web tier.  The ServletBeanContext defines the resource scope for Controls such that any control instance can hold a resource (connection, session, ...) for the lifetime of a single http request (but no longer).  Additionally, it exposes web-tier-specific contextual services, such as access to the current ServletContext or active HttpServletRequest instance.
+      <p>For any given container, a custom subclass of the ControlContainerContext class can be provided that defines the unique attributes and semantics of the container for controls executing within it.  For example, the <a href="apidocs/javadoc/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.html">ServletBeanContext</a> class provided as part of the Controls runtime provides control containment for the web tier.  The ServletBeanContext defines the resource scope for Controls such that any control instance can hold a resource (connection, session, ...) for the lifetime of a single http request (but no longer).  Additionally, it exposes web-tier-specific contextual services, such as access to the current ServletContext or active HttpServletRequest instance.
       </p>
 
       <p>The following section on Control Container Services describes many of the services and behaviors that can be customized by a ControlContainerContext subclass.

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/programming.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/programming.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/programming.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/programming.xml Thu Jan 26 10:06:32 2006
@@ -1237,7 +1237,7 @@
     @BookControl.Intro( title="title", subject="subject of the book" )
     BookControlBean myBook</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/javadoc/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.html">Interface AnnotationMemberTypes</a>.</p>
             </section>
         </section>
         <section id="extensibility">

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/projects.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/projects.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/projects.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/projects.xml Thu Jan 26 10:06:32 2006
@@ -43,7 +43,7 @@
             It is often useful to build Beehive Controls into a standalone JAR that can be copied into or shared among many 
             Java projects.  This can be done by first building the controls and then JAR-ing them into a standard <code>.jar</code>
             file.  The Controls runtime also provides an Ant 
-            <a href="../apidocs/classref_controls/org/apache/beehive/controls/runtime/packaging/ControlJarTask.html">task</a> that 
+            <a href="apidocs/javadoc/org/apache/beehive/controls/runtime/packaging/ControlJarTask.html">task</a> that 
             is used to perform additional processing for JARs that contain Controls.  The Control JAR task can be used like this
             example:
             </p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/actions.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/actions.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/actions.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/actions.xml Thu Jan 26 10:06:32 2006
@@ -29,7 +29,7 @@
                 <title>Creating an action through an annotation</title>
                 <p>
                     The simplest way to create an action is through the
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
                         <code>@Jpf.SimpleAction</code>
                     </a>
                     annotation at the class level of a Page Flow or Shared Flow controller:
@@ -85,11 +85,11 @@
                 <title>Creating an action through a method</title>
                 <p>
                     To create an action through a method, you make a method that returns
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/Forward.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/Forward.html">
                         <code>Forward</code>
                     </a>
                     and which is annotated with
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
                         <code>@Jpf.Action</code>
                     </a>, e.g.,
                 </p>
@@ -110,7 +110,7 @@
                 </p>
                 <note>
                     You do not <em>have</em> to return a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/Forward.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/Forward.html">
                         <code>Forward</code>
                     </a>
                     object. If your action returns <code>null</code>, then no navigation will occur.
@@ -161,42 +161,42 @@
                 </p>
                 <ul>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Anchor.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Anchor.html">
                             <code>Anchor</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.html">
                             <code>AnchorCell</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Area.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Area.html">
                             <code>Area</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Button.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Button.html">
                             <code>Button</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Form.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Form.html">
                             <code>Form</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/ImageAnchor.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/ImageAnchor.html">
                             <code>ImageAnchor</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.html">
                             <code>ImageAnchorCell</code>
                         </a>
                     </li>
                     <li>
-                        <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/tree/TreeItem.html">
+                        <a href="apidocs/javadoc/org/apache/beehive/netui/tags/tree/TreeItem.html">
                             <code>TreeItem</code>
                         </a>
                     </li>
@@ -253,11 +253,11 @@
                 <p>
                     To raise an action from another action in the <em>same</em> controller class ("action chaining"),
                     simply use the <code>action</code> attribute on a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">
                         <code>@Jpf.Forward</code>
                     </a>
                     or a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
                         <code>@Jpf.SimpleAction</code>
                     </a>
                     annotation, e.g.,

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_annotations.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_annotations.xml Thu Jan 26 10:06:32 2006
@@ -10,7 +10,7 @@
             <p>
                 These annotations configure elements of a NetUI web application: page flows, shared flows, etc.
                 All Page Flow annotations come from the annotation interface
-                <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.html">
+                <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.html">
                     org.apache.beehive.netui.pageflow.annotations.Jpf
                 </a>.  To use any of these annotations, include the following import statement in your source file:
             </p>
@@ -19,49 +19,49 @@
 
 		<section>
 			<title>Page Flow Annotations</title>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">@Jpf.Action</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ActionOutput.html">@Jpf.ActionOutput</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">@Jpf.Catch</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.CommandHandler.html">@Jpf.CommandHandler</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ConditionalForward.html">@Jpf.ConditionalForward</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">@Jpf.Controller</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">@Jpf.ExceptionHandler</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.FacesBacking.html">@Jpf.FacesBacking</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.FormBean.html">@Jpf.FormBean</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">@Jpf.Forward</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageArg.html">@Jpf.MessageArg</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">@Jpf.MessageBundle</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MultipartHandler.html">@Jpf.MultipartHandler</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.NavigateTo.html">@Jpf.NavigateTo</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.PageFlowField.html">@Jpf.PageFlowField</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.RaiseAction.html">@Jpf.RaiseAction</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowField.html">@Jpf.SharedFlowField</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowRef.html">@Jpf.SharedFlowRef</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">@Jpf.SimpleAction</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">@Jpf.ValidatableBean</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">@Jpf.ValidatableProperty</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">@Jpf.ValidateCreditCard</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomRule.html">@Jpf.ValidateCustomRule</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">@Jpf.ValidateCustomVariable</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">@Jpf.ValidateDate</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">@Jpf.ValidateEmail</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">@Jpf.ValidateMask</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">@Jpf.ValidateMaxLength</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">@Jpf.ValidateMinLength</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">@Jpf.ValidateRange</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">@Jpf.ValidateRequired</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">@Jpf.ValidateType</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">@Jpf.ValidateValidWhen</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">@Jpf.ValidationLocaleRules</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatorVersion.html">@Jpf.ValidatorVersion</a></p>
-			<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ViewProperties.html">@Jpf.ViewProperties</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">@Jpf.Action</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ActionOutput.html">@Jpf.ActionOutput</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">@Jpf.Catch</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.CommandHandler.html">@Jpf.CommandHandler</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ConditionalForward.html">@Jpf.ConditionalForward</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">@Jpf.Controller</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">@Jpf.ExceptionHandler</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.FacesBacking.html">@Jpf.FacesBacking</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.FormBean.html">@Jpf.FormBean</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">@Jpf.Forward</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageArg.html">@Jpf.MessageArg</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">@Jpf.MessageBundle</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MultipartHandler.html">@Jpf.MultipartHandler</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.NavigateTo.html">@Jpf.NavigateTo</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.PageFlowField.html">@Jpf.PageFlowField</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.RaiseAction.html">@Jpf.RaiseAction</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowField.html">@Jpf.SharedFlowField</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowRef.html">@Jpf.SharedFlowRef</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">@Jpf.SimpleAction</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">@Jpf.ValidatableBean</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">@Jpf.ValidatableProperty</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">@Jpf.ValidateCreditCard</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomRule.html">@Jpf.ValidateCustomRule</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">@Jpf.ValidateCustomVariable</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">@Jpf.ValidateDate</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">@Jpf.ValidateEmail</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">@Jpf.ValidateMask</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">@Jpf.ValidateMaxLength</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">@Jpf.ValidateMinLength</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">@Jpf.ValidateRange</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">@Jpf.ValidateRequired</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">@Jpf.ValidateType</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">@Jpf.ValidateValidWhen</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">@Jpf.ValidationLocaleRules</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatorVersion.html">@Jpf.ValidatorVersion</a></p>
+			<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ViewProperties.html">@Jpf.ViewProperties</a></p>
 		</section>
 		<!--<section id="Action">
 			<title>Jpf.Action</title>
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
 					 Jpf.Action</a>
 			</p>
 			<p>
@@ -177,7 +177,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">
 					 Jpf.ValidatableBean</a>
 			</p>
 			<p>
@@ -296,7 +296,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">
 					 Jpf.ValidatableProperty</a>
 			</p>
 			<p>
@@ -487,7 +487,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">
 					 Jpf.ValidateCreditCard</a>
 			</p>
 			<p>
@@ -639,7 +639,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustom.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustom.html">
 					 Jpf.ValidateCustom</a>
 			</p>
 			<p>
@@ -783,7 +783,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">
 					 Jpf.ValidateCustomVariable</a>
 			</p>
 			<p>
@@ -829,7 +829,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">
 					 Jpf.ValidateDate</a>
 			</p>
 			<p>
@@ -989,7 +989,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">
 					 Jpf.ValidateEmail</a>
 			</p>
 			<p>
@@ -1132,7 +1132,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">
 					 Jpf.ValidateMask</a>
 			</p>
 			<p>
@@ -1283,7 +1283,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">
 					 Jpf.ValidateMaxLength</a>
 			</p>
 			<p>
@@ -1434,7 +1434,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">
 					 Jpf.ValidateMinLength</a>
 			</p>
 			<p>
@@ -1585,7 +1585,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">
 					 Jpf.ValidateRange</a>
 			</p>
 			<p>
@@ -1763,7 +1763,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">
 					 Jpf.ValidateRequired</a>
 			</p>
 			<p>
@@ -1905,7 +1905,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">
 					 Jpf.ValidateType</a>
 			</p>
 			<p>
@@ -2056,7 +2056,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">
 					 Jpf.ValidateValidWhen</a>
 			</p>
 			<p>
@@ -2207,7 +2207,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">
 					 Jpf.ValidationLocaleRules</a>
 			</p>
 			<p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_class_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_class_annotations.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_class_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_class_annotations.xml Thu Jan 26 10:06:32 2006
@@ -34,7 +34,7 @@
 			<ul>
 				<li>
 					<a 
-						href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
+						href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
 						Jpf.Controller Javadoc</a>
 				</li>
 			</ul>
@@ -62,7 +62,7 @@
 						<code>boolean</code>
 					</td>
 					<td>Checks user authentication and possibly throws <a 
-						href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
+						href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
 				</tr>
 				<tr>
 					<td>
@@ -113,7 +113,7 @@
 				<ul>
 					<li>
 						<a 
-							href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
+							href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
 							Jpf.SimpleAction Javadoc</a>
 					</li>
 				</ul>
@@ -172,7 +172,7 @@
 				<ul>
 					<li>
 						<a 
-							href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">
+							href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">
 							Jpf.Forward Javadoc</a>
 					</li>
 				</ul>
@@ -203,12 +203,12 @@
 				<ul>
 					<li>
 						<a 
-							href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
+							href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
 							Jpf.Catch Javadoc</a>
 					</li>
 					<li>
 						<a 
-							href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
+							href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
 							Jpf.ExceptionHandler Javadoc</a>
 					</li>
 				</ul>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_method_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_method_annotations.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_method_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_method_annotations.xml Thu Jan 26 10:06:32 2006
@@ -22,12 +22,12 @@
     <title>Jpf.Action</title>
 
     <ul>
-      <li><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">Jpf.Action Javadoc</a></li>
+      <li><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">Jpf.Action Javadoc</a></li>
     </ul>
 
     <p>
     The
-    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
+    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
         <code>@Jpf.Action</code>
     </a>
     annotation adorns action methods of the <code>Controller</code>
@@ -43,7 +43,7 @@
       <tr>
         <td><code>loginRequired</code></td>
         <td><code>boolean</code></td>
-        <td>Checks user authentication and possibly throws <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
+        <td>Checks user authentication and possibly throws <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
       </tr>
       <tr>
         <td><code>readOnly</code></td>
@@ -96,7 +96,7 @@
       <title>Jpf.Action with Jpf.Forward</title>
 
       <ul>
-        <li><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">Jpf.Forward Javadoc</a></li>
+        <li><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">Jpf.Forward Javadoc</a></li>
       </ul>
 
 <source>
@@ -122,8 +122,8 @@
       <title>Jpf.Action with Jpf.Catch and Jpf.ExceptionHandler</title>
 
       <ul>
-        <li><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">Jpf.Catch Javadoc</a></li>
-        <li><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">Jpf.ExceptionHandler Javadoc</a></li>
+        <li><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">Jpf.Catch Javadoc</a></li>
+        <li><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">Jpf.ExceptionHandler Javadoc</a></li>
       </ul>
 
 <source>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_validation_annotations.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_validation_annotations.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_validation_annotations.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/annotations/pageflow_validation_annotations.xml Thu Jan 26 10:06:32 2006
@@ -10,7 +10,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">
 					 Jpf.ValidatableBean</a>
 			</p>
 			<p>
@@ -129,7 +129,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">
 					 Jpf.ValidatableProperty</a>
 			</p>
 			<p>
@@ -320,7 +320,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">
 					 Jpf.ValidateCreditCard</a>
 			</p>
 			<p>
@@ -472,7 +472,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustom.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustom.html">
 					 Jpf.ValidateCustom</a>
 			</p>
 			<p>
@@ -616,7 +616,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">
 					 Jpf.ValidateCustomVariable</a>
 			</p>
 			<p>
@@ -662,7 +662,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">
 					 Jpf.ValidateDate</a>
 			</p>
 			<p>
@@ -822,7 +822,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">
 					 Jpf.ValidateEmail</a>
 			</p>
 			<p>
@@ -965,7 +965,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">
 					 Jpf.ValidateMask</a>
 			</p>
 			<p>
@@ -1116,7 +1116,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">
 					 Jpf.ValidateMaxLength</a>
 			</p>
 			<p>
@@ -1267,7 +1267,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">
 					 Jpf.ValidateMinLength</a>
 			</p>
 			<p>
@@ -1418,7 +1418,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">
 					 Jpf.ValidateRange</a>
 			</p>
 			<p>
@@ -1596,7 +1596,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">
 					 Jpf.ValidateRequired</a>
 			</p>
 			<p>
@@ -1738,7 +1738,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">
 					 Jpf.ValidateType</a>
 			</p>
 			<p>
@@ -1889,7 +1889,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">
 					 Jpf.ValidateValidWhen</a>
 			</p>
 			<p>
@@ -2040,7 +2040,7 @@
 			<p>
 				<strong>Javadoc: </strong>
 				<a class="fork" 
-					href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">
+					href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">
 					 Jpf.ValidationLocaleRules</a>
 			</p>
 			<p>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/config/beehive-netui-config.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/config/beehive-netui-config.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/config/beehive-netui-config.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/config/beehive-netui-config.xml Thu Jan 26 10:06:32 2006
@@ -376,7 +376,7 @@
         <p>
             This setting configures a factory for creating "backing beans" for
             JavaServer Faces pages.  The referenced class must extend
-            <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.html">
+            <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.html">
                 org.apache.beehive.netui.pageflow.FacesBackingBeanFactory
             </a>
         </p>
@@ -431,7 +431,7 @@
         <p>
             This setting configures a factory for creating page flows and shared flows.
             The referenced class must extend
-            <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/FlowControllerFactory.html">
+            <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/FlowControllerFactory.html">
                 org.apache.beehive.netui.pageflow.FlowControllerFactory
             </a>
         </p>
@@ -713,7 +713,7 @@
 					controller-by-controller basis.</p>
                 <p><strong>Also see:</strong></p>
                     <p>
-                        <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html#multipartHandler()">
+                        <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html#multipartHandler()">
                             Attribute multipartHandler on annotation interface org.apache.beehive.netui.pageflow.annotations.Jpf
                         </a>
                     </p>
@@ -805,7 +805,7 @@
           <li>set the destination URI to <code>null</code> (no forwarding).</li>
       </ul>
  <p><strong>Also see:</strong></p>
- <p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.html">Interface org.apache.beehive.netui.pageflow.interceptor.ActionInterceptor</a></p>
+ <p><a href="../apidocs/javadoc/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> [occurrences: 0-1]
@@ -1133,7 +1133,7 @@
                 </p>
                 <p><strong>Also see:</strong></p>
                     <p>
-                        <a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/SessionExpiredException.html">
+                        <a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/SessionExpiredException.html">
                             Class org.apache.beehive.netui.pageflow.SessionExpiredException
                         </a>
                     </p>
@@ -1295,8 +1295,8 @@
         </section>
         <section id="related_topics">
         	<title>Related Topics</title>
-<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/util/config/ConfigUtil.html">Class org.apache.beehive.netui.util.config.ConfigUtil</a></p>
-<p><a href="../../apidocs/classref_netui/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.html">Interface org.apache.beehive.netui.pageflow.interceptor.ActionInterceptor</a></p>
+<p><a href="../apidocs/javadoc/org/apache/beehive/netui/util/config/ConfigUtil.html">Class org.apache.beehive.netui.util.config.ConfigUtil</a></p>
+<p><a href="../apidocs/javadoc/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.html">Interface org.apache.beehive.netui.pageflow.interceptor.ActionInterceptor</a></p>
         </section>
         
     </body>

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/databinding.xml Thu Jan 26 10:06:32 2006
@@ -107,11 +107,11 @@
             <tr>
                 <td><code>bundle</code></td>
                 <td>Inside of a JSP where the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
                     <code>&lt;netui-data:declareBundle></code></a>
                     tag is used to refer to a resource bundle or where a JSP is part of a page flow that has 
                     resource bundles declared with the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
                         <code>@Jpf.MessageBundle</code>
                     </a>
                     annotation.</td>
@@ -121,21 +121,21 @@
                 <td><code>container</code></td>
                 <td>The <code>container</code> implicit object is available inside of several NetUI JSP tags that "repeat" over data sets 
                     including the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.html">
                     <code>&lt;netui-data:dataGrid</code></a>, 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/repeater/Repeater.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/repeater/Repeater.html">
                     <code>&lt;netui-data:repeater</code></a>, 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.html">
                     <code>&lt;netui-data:cellRepeater</code></a>,
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Select.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Select.html">
                     <code>&lt;netui:select</code></a>,
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/CheckBoxGroup.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/CheckBoxGroup.html">
                     <code>&lt;netui:checkBoxGroup</code></a>, and
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/RadioButtonGroup.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/RadioButtonGroup.html">
                     <code>&lt;netui:radioButtonGroup</code></a>,
                 </td>
                 <td>Provides access to the JavaBean properties exposed by the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/script/common/IDataAccessProvider.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/script/common/IDataAccessProvider.html">
                     <code>IDataAccessProvider</code></a> interface.  Implementations
                     of this interface are made available to the PageContext during rendering so that tag bodies can access information about 
                     the current data item, the item's index, and so on.
@@ -152,14 +152,14 @@
                 <td><code>pageInput</code></td>
                 <td>
                 Available to any JSP that was reached by a page flow 
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/Forward.html">Forward</a> 
+                <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/Forward.html">Forward</a> 
                 object that had <em>page inputs</em> attached to the Forward.
                 </td>
                 <td>
                 Page flows allow <em>action outputs</em> to be attached to Forward objects as a way to provide a data contract between a page flow action 
                 and a page.  This ensures that all actions that forward to JSPs provide the JSP with the appropriate data and that all JSPs receive
                 the correct data.  This data contract is validated at both the action and at the JSP when using the 
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.html">
+                <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.html">
                 <code>&lt;netui-data:declarePageInput></code></a>.
                 tag.
                 </td>
@@ -167,9 +167,9 @@
             <tr>
                 <td><code>sharedFlow</code></td>
                 <td>Available to any JSP that is part of a 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/PageFlowController.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/PageFlowController.html">
                     page flow</a> which references 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/SharedFlowController.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/SharedFlowController.html">
                     shared flows</a>.</td>
                 <td>The <code>sharedFlow</code> implicit object provides access to any JavaBean properties on Shared Flows associated 
                     with the current page flow.  This allows Shared Flows to expose properties to JSPs.
@@ -230,10 +230,10 @@
             </p>
             <ul>
                 <li>when declaring a resource bundle accessible to a JSP via the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.html">
                     <code>&lt;netui-data:declareBundle></code></a> tag.</li>
                 <li>when a page flow with which the JSP is associated exposes resource bundles via the
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
                         <code>@Jpf.MessageBundle</code>
                     </a>
                     annotation.</li>
@@ -269,7 +269,7 @@
             </p>
             <p>
             Resource bundles can also be registered with the <code>bundle</code> implicit object by using the
-            <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
+            <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.MessageBundle.html">
                 <code>@Jpf.MessageBundle</code>
             </a>
             class-level annotation.  This allows a page flow to also integrate with the implicit message resources object which is
@@ -323,27 +323,27 @@
             </p>
             <ul>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.html">
                     <code>&lt;netui-data:dataGrid></code></a>
                 </li>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/repeater/Repeater.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/repeater/Repeater.html">
                     <code>&lt;netui-data:repeater></code></a>
                 </li>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.html">
                     <code>&lt;netui-data:cellRepeater></code></a>
                 </li>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Select.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Select.html">
                     <code>&lt;netui:select></code></a>
                 </li>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/CheckBoxGroup.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/CheckBoxGroup.html">
                     <code>&lt;netui:checkBoxGroup></code></a>
                 </li>
                 <li>
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/RadioButtonGroup.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/RadioButtonGroup.html">
                     <code>&lt;netui:radioButtonGroup></code></a>.
                 </li>
             </ul>
@@ -540,7 +540,7 @@
             <p>
             In a JSP whose current page flow controller is the <code>Controller</code> class defined above, the JSP has access to 
             all of the shared flows associated to the page flow via its
-            <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowRef.html">
+            <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SharedFlowRef.html">
                 <code>@Jpf.SharedFlowRef</code>
             </a>
             annotation.  The shared flow can then be referenced by the <code>name</code> attribute of the <code>SharedFlowRef</code> annotation.  

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/exceptionHandling.xml Thu Jan 26 10:06:32 2006
@@ -63,7 +63,7 @@
             <title>Declaring Exceptions to Handle</title>
             <p>
                 The way to declare that a particular exception type should be handled is the
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
+                <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
                     <code>@Jpf.Catch</code>
                 </a>
                 annotation.  Using this annotation, you can specify one of two ways to handle the exception:
@@ -86,21 +86,21 @@
             <ul>
                 <li>
                     Inside a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
                         <code>@Jpf.Action</code>
                     </a>
                     annotation, which means that the exception is handled only for that action.
                 </li>
                 <li>
                     Inside a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
                         <code>@Jpf.SimpleAction</code>
                     </a>
                     annotation, which means that the exception is handled only for that action.
                 </li>
                 <li>
                     Inside a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
                         <code>@Jpf.Controller</code>
                     </a>
                     annotation, which means that the exception is handled for <em>any action</em> in the controller
@@ -108,7 +108,7 @@
                 </li>
                 <li>
                     Inside a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
                         <code>@Jpf.Controller</code>
                     </a>
                     annotation in a <em>base class controller</em>, which means that the exception is handled for any
@@ -117,7 +117,7 @@
                 </li>
                 <li>
                     Inside a
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
                         <code>@Jpf.Controller</code>
                     </a>
                     annotation in a <a href="site:pageflow_sharedFlow">shared flow controller</a> that is referenced by
@@ -169,7 +169,7 @@
             </p>
             <note>
                 If you have a set of
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
+                <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
                     <code>@Jpf.Catch</code>
                 </a>
                 annotations, and more than one of them applies to a thrown
@@ -190,12 +190,12 @@
             <title>Handling Exceptions with Methods</title>
             <p>
                 When you use the 
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html#method()">
+                <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html#method()">
                     <code>method</code>
                 </a>
                 attribute on <code>@Jpf.Catch</code>, you are signalling that you want an exception to be handled with
                 an <em>exception-handler</em> method. To make such a method, you use the
-                <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
+                <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
                     <code>@Jpf.ExceptionHandler</code>
                 </a>
                 annotation on a method with the following signature:
@@ -254,18 +254,18 @@
             <ul>
                 <li>
                     the
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Exceptions.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Exceptions.html">
                         <code>Exceptions</code>
                     </a>
                     tag
                 </li>
                 <li>
                     the
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Error.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Error.html">
                         <code>Error</code>
                     </a>
                     or
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Errors.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Errors.html">
                         <code>Errors</code>
                     </a>
                     tags
@@ -275,7 +275,7 @@
                 <title>The <code>Exceptions</code> tag</title>
                 <p>
                     The 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Exceptions.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Exceptions.html">
                         <code>Exceptions</code>
                     </a>
                     tag is a simple way to display raw exception information. You can use it to show the exception
@@ -290,11 +290,11 @@
                 <title>The <code>Error</code> and <code>Errors</code> tags</title>
                 <p>
                     The 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Error.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Error.html">
                         <code>Error</code>
                     </a>
                     or
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/tags/html/Errors.html">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/tags/html/Errors.html">
                         <code>Errors</code>
                     </a>
                     tags are used to display localizable messages for exceptions.  By default, you must have a
@@ -334,7 +334,7 @@
                 <p>
                     If you want to use your own message key (instead of <code>java.lang.IllegalStateException</code>),
                     you use the 
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html#messageKey()">
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html#messageKey()">
                         <code>messageKey</code>
                     </a>
                     attribute on <code>@Jpf.Catch</code>:

Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jsf.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jsf.xml?rev=372578&r1=372577&r2=372578&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jsf.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/jsf.xml Thu Jan 26 10:06:32 2006
@@ -36,7 +36,7 @@
                     "backing" context, e.g., <code>#{backing.someProperty}</code>.
                 </li>
                 <li>When returning to a JSF page through the
-                    <a href="../apidocs/classref_netui/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html#navigateTo%28%29">navigateTo</a>
+                    <a href="apidocs/javadoc/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html#navigateTo%28%29">navigateTo</a>
                     feature, the page's component tree and its backing bean are restored.
                 </li>
             </ul>