You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2005/03/08 18:36:38 UTC

svn commit: r156552 - in incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs: docs/index.xml downloads.xml index.xml pageflow/jpf-annotations/pageflow_annotations.xml pageflow/jpf-annotations/pageflow_class_annotations.xml site.xml tabs.xml

Author: steveh
Date: Tue Mar  8 09:36:36 2005
New Revision: 156552

URL: http://svn.apache.org/viewcvs?view=rev&rev=156552
Log:
Removing the 'beta' branding from the /trunk docs.
Other misc. updates.

Modified:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/downloads.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml Tue Mar  8 09:36:36 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
     <header>
-        <title>Beehive 1.0 Beta Documentation</title>
+        <title>Beehive Documentation</title>
     </header>
     <body>
         <p>Beehive documetation contains documentation for all three Beehive sub-projects: Controls, 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/downloads.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/downloads.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/downloads.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/downloads.xml Tue Mar  8 09:36:36 2005
@@ -1,58 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+	"http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
-
-<header>
-    <title>Apache Beehive - Downloads</title>
-</header>
-
-<body>
-
-<section>
-    <title>Beehive V1 Beta Binary Distribution</title>
-    <p>The Beehive 1.0 Beta binary distribution is available for download at
-    [todo].  
-    This distribution is an <em>beta</em> release and is <em>not</em> intended for creating 
-	production-level applications.</p>
-</section>
-
-<section>
-
-
-<title>Daily Drops</title>
-      <p>Beehive is still rather new, so we don't have daily drops yet.  We are currently working
-      on getting some form of daily builds.  When that happens, there will be a place to download 
-	  both the source and binary distributions for
-      the most recent daily build.
-	  </p>
-	  
-	  <p>For now, if you want the source, you can either download a 
-	  recent snapshot
-      of source or get it from the Subversion repository (directions below).  Once you've obtained a 
-	  copy
-      of the source from an archive or from SVN, simply follow the instructions in BUILDING.txt.  
-	  You can also roll your own distributions 
-      using the build.dist target and then create archives using the build.dist.jar target.
-      <br /><br /></p>
-      </section>
-
-<section>
-      <title>Getting Source from SVN</title>
-	<ol>
-	    <li>Download Subversion from <a href="http://subversion.tigris.org/">http://subversion.tigris.org/ </a></li>
-	    <li>In the specified directory say "beehive" run the svn client <br />
-	        <code>svn checkout http://svn.apache.org/repos/asf/incubator/beehive/trunk/</code><br />
-		Note:  If you're a user who has issues with proxies or firewalls, https can be used instead of http for Subversion checkout.</li>
-	</ol>
-</section>
-
-</body>
-    
-<footer>
-    	<legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br />
-	&copy; 2004, Apache Software Foundation
-	</legal>
-</footer>
-
-</document>
+	<header>
+		<title>Apache Beehive - Downloads</title>
+	</header>
+	<body>
+		<section>
+			<title>Beehive V1 Alpha Binary Distribution</title>
+			<p>The Beehive 1.0 Alpha binary distribution is available for 
+				download at <a 
+				href="http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/">http://cvs.apache.org/dist/incubator/beehive/v1.0-alpha/bin/</a>. 
+				This distribution is an <em>alpha</em> release and is 
+				<em>not</em> intended for creating production-level 
+				applications.</p>
+		</section>
+		<section>
+			<title>Daily Binary Distributions</title>
+			<p>Beehive doesn't have automated daily drops yet. But we do 
+				periodically post manually built drops. We currently have one 
+				daily drop, dated March 2nd, 2005, available at <a 
+				href="http://cvs.apache.org/dist/incubator/beehive/nightlies/">http://cvs.apache.org/dist/incubator/beehive/nightlies/</a> 
+				</p>
+		</section>
+		<section>
+			<title>Making Your Own Distribution</title>
+			<p>If you want the Beehive source, follow the instructions at 
+				<a href="http://svn.apache.org/repos/asf/incubator/beehive/trunk/BUILDING.txt">http://svn.apache.org/repos/asf/incubator/beehive/trunk/BUILDING.txt</a>.
+				You will need to install the Subversion source control client (a.k.a. "SVN"),
+				downloadable from <a href="http://subversion.tigris.org/">http://subversion.tigris.org/</a>.
+				</p>
+             <p>Once you've obtained 
+				a copy of the source, you can roll your own 
+				distributions using the <code>build.dist</code> target and then 
+				create archives using the <code>build.dist.jar</code> 
+				target. (These targets are located in the Ant build file <code>beehive/trunk/distribtion.xml</code>.)</p>
+		</section>
+	</body>
+	<footer>
+		<legal>Java, J2EE, and JCP are trademarks or registered trademarks of 
+			Sun Microsystems, Inc. in the United States and other countries.<br/> &copy; 2004, Apache Software Foundation </legal>
+	</footer>
+</document>
\ No newline at end of file

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/index.xml Tue Mar  8 09:36:36 2005
@@ -31,10 +31,9 @@
 		</section>
 		<section id="news">
 			<title>News</title>
-			<p>The Beehive team has released a V1 Beta. Please give it a try: 
-				<a href="downloads.html">Download Page</a>!</p>
-			<ul>
-				<li>Beehive now has a <a class="fork" 
+			<p><strong>Daily builds</strong> are now available.  To get a daily snapshot, visit the <a href="downloads.html">Download Page</a>!</p>
+				<ul>
+				<li>Beehive has a <a class="fork" 
 					href="http://wiki.apache.org/beehive">wiki</a>.</li>
 				<li>Bugs or feature requests can be filed in our issue tracking system: <a class="fork" 
 					href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10570">jira</a></li>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_annotations.xml Tue Mar  8 09:36:36 2005
@@ -2,39 +2,2318 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>JPF Annotations</title>
+    <title>JPF Validation Annotations</title>
   </header>
-  <body>
+	<body>
+		<section id="Action">
+			<title>Jpf.Action</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Action.html">
+					 Jpf.Action</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.Action</code> annotation is an attribute of the @Jpf.Controller
+				annotation.  It refers to a JavaBean class that is to be subject to validation. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>catches</code>
+					</td>
+					<td>
+						<code>Jpf.Catch[]</code>
+					</td>
+					<td>Optional. Exception catches.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>doValidation</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>Optional. Turn form validation on or off for this action.</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<p> In this example, three bean properties are validated: three Strings representing the date, 
+				a credit card, and an email address.</p>
+			<source>@Jpf.Controller(
+    validatableBeans={
+        <strong>@Jpf.ValidatableBean</strong>(
+            type=Controller.MyForm.class,
+            validatableProperties={
+                @Jpf.ValidatableProperty(
+                    propertyName="date",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateDate=@Jpf.ValidateDate(pattern="M-d-y")
+                ),
+                @Jpf.ValidatableProperty(
+                    propertyName="creditCard",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateCreditCard=@Jpf.ValidateCreditCard()
+                ),
+                @Jpf.ValidatableProperty(
+                    propertyName="email",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateEmail=@Jpf.ValidateEmail()
+                )
+            }
+        )
+    }
+)
+public class Controller extends PageFlowController
+{
+   ...
+   
+    public static class MyForm implements Serializable
+    {
+        private String _date;
 
+        public String getDate()
+        {
+            return _date;
+        }
 
-  <section id="overview">
-    <title>Overview</title>
-    <p>
-    Pageflows use Java annotations to richly express the semantics of
-    a web-application entirely in Java sources.  Annotations allow 
-    configuration informatin to reside proximately near to the code
-    that uses it.
-    </p>
-
-    <p>
-    All JPF annotations reside within the 
-    <a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.html">Jpf</a> 
-    interface.
-    </p>
-
-    <ul>
-      <li><a href="pageflow_class_annotations.html">Controller Class Annotations</a></li>
-      <li><a href="pageflow_method_annotations.html">Controller Method Annotations</a></li>
-      <li><a href="pageflow_validation_annotations.html">Validation Annotations</a></li>
-    </ul>
-  </section>
-
-
-  </body>
-  <footer>
-    <legal>
-      Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
-      &copy; 2004, Apache Software Foundation 
-    </legal>
-  </footer>
-</document>
+        public void setDate( String str )
+        {
+            _date = str;
+        }
+
+        private String _creditCard;
+
+        public String getCreditCard()
+        {
+            return _creditCard;
+        }
+
+        public void setCreditCard( String str )
+        {
+            _creditCard = str;
+        }
+
+        private String _email;
+
+        public String getEmail()
+        {
+            return _email;
+        }
+
+        public void setEmail( String str )
+        {
+            _email = str;
+        }
+    }
+}</source>
+		</section>
+		<section id="ValidatableBean">
+			<title>Jpf.ValidatableBean</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableBean.html">
+					 Jpf.ValidatableBean</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidatableBean</code> annotation is an attribute of the @Jpf.Controller
+				annotation.  It refers to a JavaBean class that is to be subject to validation. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>type</code>
+					</td>
+					<td>
+						<code>Class</code>
+					</td>
+					<td>Required. The type of the JavaBean decorated by this 
+						annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validatableProperties</code>
+					</td>
+					<td>
+						<a href="#ValidatableProperty">
+							<code>@Jpf.ValidatableProperty[]</code>
+						</a>
+					</td>
+					<td>Required. Comma-separated list of @Jpf.ValidatableProperty 
+						elements.</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<p> In this example, three bean properties are validated: three Strings representing the date, 
+				a credit card, and an email address.</p>
+			<source>@Jpf.Controller(
+    validatableBeans={
+        <strong>@Jpf.ValidatableBean</strong>(
+            type=Controller.MyForm.class,
+            validatableProperties={
+                @Jpf.ValidatableProperty(
+                    propertyName="date",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateDate=@Jpf.ValidateDate(pattern="M-d-y")
+                ),
+                @Jpf.ValidatableProperty(
+                    propertyName="creditCard",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateCreditCard=@Jpf.ValidateCreditCard()
+                ),
+                @Jpf.ValidatableProperty(
+                    propertyName="email",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateEmail=@Jpf.ValidateEmail()
+                )
+            }
+        )
+    }
+)
+public class Controller extends PageFlowController
+{
+   ...
+   
+    public static class MyForm implements Serializable
+    {
+        private String _date;
+
+        public String getDate()
+        {
+            return _date;
+        }
+
+        public void setDate( String str )
+        {
+            _date = str;
+        }
+
+        private String _creditCard;
+
+        public String getCreditCard()
+        {
+            return _creditCard;
+        }
+
+        public void setCreditCard( String str )
+        {
+            _creditCard = str;
+        }
+
+        private String _email;
+
+        public String getEmail()
+        {
+            return _email;
+        }
+
+        public void setEmail( String str )
+        {
+            _email = str;
+        }
+    }
+}</source>
+		</section>
+		<section id="ValidatableProperty">
+			<title>Jpf.ValidatableProperty</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidatableProperty.html">
+					 Jpf.ValidatableProperty</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidatableProperty</code> annotation is an attribute of the @Jpf.Controller or 
+				@Jpf.Action annotations, or it can decorate a method in a form bean. It refers to a form field (or bean property) 
+				that is to be subject to validation. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>displayName</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>displayNameKey</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>localeRules</code>
+					</td>
+					<td>
+						<a href="#ValidationLocaleRules"><code>@Jpf.ValidationLocaleRules[]</code></a>
+					</td>
+					<td>A comma-separated list of @Jpf.ValidationLocaleRules annotations.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>propertyName</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateCreditCard</code>
+					</td>
+					<td>
+						<a href="#ValidateCreditCard"><code>@Jpf.ValidateCreditCard</code></a>
+					</td>
+					<td>A @Jpf.ValidateCreditCard annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateCustom</code>
+					</td>
+					<td>
+						<a href="#ValidateCustom"><code>@Jpf.ValidateCustom</code></a>
+					</td>
+					<td>A @Jpf.ValidateCustom annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateDate</code>
+					</td>
+					<td>
+						<a href="#ValidateDate"><code>@Jpf.ValidateDate</code></a>
+					</td>
+					<td>A @Jpf.ValidateDate annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateEmail</code>
+					</td>
+					<td>
+						<a href="#ValidateEmail"><code>@Jpf.ValidateEmail</code></a>
+					</td>
+					<td>A @Jpf.ValidateEmail annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMask</code>
+					</td>
+					<td>
+						<a href="#ValidateMask"><code>@Jpf.ValidateMask</code></a>
+					</td>
+					<td>A @Jpf.ValidateMask annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMaxLength</code>
+					</td>
+					<td>
+						<a href="#ValidateMaxLength"><code>@Jpf.ValidateMaxLength</code></a>
+					</td>
+					<td>A @Jpf.ValidateMaxLength annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMinLength</code>
+					</td>
+					<td>
+						<a href="#ValidateMinLength"><code>@Jpf.ValidateMinLength</code></a>
+					</td>
+					<td>A @Jpf.ValidateMinLength annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateRange</code>
+					</td>
+					<td>
+						<a href="#ValidateRange"><code>@Jpf.ValidateRange</code></a>
+					</td>
+					<td>A @Jpf.ValidateRange annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateRequired</code>
+					</td>
+					<td>
+						<a href="#ValidateRequired"><code>@Jpf.ValidateRequired</code></a>
+					</td>
+					<td>A @Jpf.ValidateRequired annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateType</code>
+					</td>
+					<td>
+						<a href="#ValidateType"><code>@Jpf.ValidateType</code></a>
+					</td>
+					<td>A @Jpf.ValidateType annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateValidWhen</code>
+					</td>
+					<td>
+						<a href="#ValidateValidWhen"><code>@Jpf.ValidateValidWhen</code></a>
+					</td>
+					<td>A @Jpf.ValidateValidWhen annotation.</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<p> In this example, a date String is validated.</p>
+			<source>@Jpf.Controller(
+    validatableBeans={
+        @Jpf.ValidatableBean(
+            type=Controller.MyForm.class,
+            validatableProperties={
+                <strong>@Jpf.ValidatableProperty</strong>(
+                    propertyName="date",
+                    displayName="This field",
+                    validateRequired=@Jpf.ValidateRequired(),
+                    validateDate=@Jpf.ValidateDate(pattern="M-d-y")
+                )
+            }
+        )
+    }
+)
+public class Controller extends PageFlowController
+{
+   ...
+   
+    public static class MyForm implements Serializable
+    {
+        private String _date;
+
+        public String getDate()
+        {
+            return _date;
+        }
+    }
+}</source>
+		</section>
+		<section id="ValidateCreditCard">
+			<title>Jpf.ValidateCreditCard</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCreditCard.html">
+					 Jpf.ValidateCreditCard</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateCreditCard</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>variables</code>
+					</td>
+					<td>
+						<a href="#ValidateCustomVariable"><code>@Jpf.ValidateCustomVariable[]</code></a>
+					</td>
+					<td>A comma-separated list of @Jpf.ValidateCustomVariable annotations.</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _creditCard;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateCreditCard=<strong>@Jpf.ValidateCreditCard()</strong>
+        )
+        public String getCreditCard()
+        {
+            return _creditCard;
+        }
+
+        public void setCreditCard( String str )
+        {
+            _creditCard = str;
+        }
+    }
+</source>
+		</section>
+		<section id="ValidateCustom">
+			<title>Jpf.ValidateCustom</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustom.html">
+					 Jpf.ValidateCustom</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateCustom</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>rule</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>variables</code>
+					</td>
+					<td>
+						<a href="#ValidateCustomVariable"><code>@Jpf.ValidateCustomVariable[]</code></a>
+					</td>
+					<td>A comma-separated list of @Jpf.ValidateCustomVariable annotations.</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>
+            [todo]
+			</source>
+		</section>
+		<section id="ValidateCustomVariable">
+			<title>Jpf.ValidateCustomVariable</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateCustomVariable.html">
+					 Jpf.ValidateCustomVariable</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateCustomVariable</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>name</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>value</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>
+            [todo]
+			</source>
+		</section>		
+			
+		<section id="ValidateDate">
+			<title>Jpf.ValidateDate</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateDate.html">
+					 Jpf.ValidateDate</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateDate</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>pattern</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>strict</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _date;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateDate=<strong>@Jpf.ValidateDate(pattern="M-d-y")</strong>
+        )
+        public String getDate()
+        {
+            return _date;
+        }
+
+        public void setDate( String str )
+        {
+            _date = str;
+        }
+    }</source>
+		</section>
+		<section id="ValidateEmail">
+			<title>Jpf.ValidateEmail</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateEmail.html">
+					 Jpf.ValidateEmail</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateEmail</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _email;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateEmail=<strong>@Jpf.ValidateEmail()</strong>
+        )
+        public String getEmail()
+        {
+            return _email;
+        }
+
+        public void setEmail( String str )
+        {
+            _email = str;
+        }
+    }
+</source>
+		</section>
+		<section id="ValidateMask">
+			<title>Jpf.ValidateMask</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMask.html">
+					 Jpf.ValidateMask</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateMask</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>regex</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _mask;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateMask=@Jpf.ValidateMask(regex="a*b")
+        )
+        public String getMask()
+        {
+            return _mask;
+        }
+
+        public void setMask( String str )
+        {
+            _mask = str;
+        }
+    }</source>
+		</section>
+		<section id="ValidateMaxLength">
+			<title>Jpf.ValidateMaxLength</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMaxLength.html">
+					 Jpf.ValidateMaxLength</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateMaxLength</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>chars</code>
+					</td>
+					<td>
+						<code>int</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _maxLength;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateMaxLength=@Jpf.ValidateMaxLength(chars=2)
+        )
+        public String getMaxLength()
+        {
+            return _maxLength;
+        }
+
+        public void setMaxLength( String str )
+        {
+            _maxLength = str;
+        }
+    }</source>
+		</section>		
+		<section id="ValidateMinLength">
+			<title>Jpf.ValidateMinLength</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateMinLength.html">
+					 Jpf.ValidateMinLength</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateMinLength</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>chars</code>
+					</td>
+					<td>
+						<code>int</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _minLength;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            ValidateMinLength=@Jpf.ValidateMinLength(chars=2)
+        )
+        public String getMinLength()
+        {
+            return _minLength;
+        }
+
+        public void setMinLength( String str )
+        {
+            _minLength = str;
+        }
+    }</source>
+		</section>		
+		<section id="ValidateRange">
+			<title>Jpf.ValidateRange</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRange.html">
+					 Jpf.ValidateRange</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateRange</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>maxFloat</code>
+					</td>
+					<td>
+						double
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>maxInt</code>
+					</td>
+					<td>
+						int
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>minFloat</code>
+					</td>
+					<td>
+						double
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>minInt</code>
+					</td>
+					<td>
+						int
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _range;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateRange=@Jpf.ValidateRange(minInt=1, maxInt=10)
+        )
+        public String getRange()
+        {
+            return _range;
+        }
+
+        public void setRange( String str )
+        {
+            _range = str;
+        }
+    }</source>
+		</section>		
+		<section id="ValidateRequired">
+			<title>Jpf.ValidateRequired</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateRequired.html">
+					 Jpf.ValidateRequired</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateRequired</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _range;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateRange=@Jpf.ValidateRange(minInt=1, maxInt=10)
+        )
+        public String getRange()
+        {
+            return _range;
+        }
+
+        public void setRange( String str )
+        {
+            _range = str;
+        }
+    }</source>
+		</section>		
+		<section id="ValidateType">
+			<title>Jpf.ValidateType</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateType.html">
+					 Jpf.ValidateType</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateType</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>type</code>
+					</td>
+					<td>
+						<code>Class</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _typeInt;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateType=@Jpf.ValidateType(type=int.class)
+        )
+        public String getTypeInt()
+        {
+            return _typeInt;
+        }
+
+        public void setTypeInt( String str )
+        {
+            _typeInt = str;
+        }
+	}</source>
+		</section>		
+		<section id="ValidateValidWhen">
+			<title>Jpf.ValidateValidWhen</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidateValidWhen.html">
+					 Jpf.ValidateValidWhen</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidateValidWhen</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>condtion</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>Required. [todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg0Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg1Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg2Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3</code>
+					</td>
+					<td>
+						<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>arg3Key</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>enabled</code>
+					</td>
+					<td>
+						boolean
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>message</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>messageKey</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>    public static class ValidatedForm implements Serializable
+    {
+        private String _validWhenPageFlowProp;
+
+        @Jpf.ValidatableProperty(
+            displayName="This field",
+            validateRequired=@Jpf.ValidateRequired(),
+            validateValidWhen=@Jpf.ValidateValidWhen(condition="${pageFlow.str==actionForm.validWhenPageFlowProp}", message="pageFlow.str must be the same as this")
+        )
+        public String getValidWhenPageFlowProp()
+        {
+            return _validWhenPageFlowProp;
+        }
+
+        public void setValidWhenPageFlowProp( String str )
+        {
+            _validWhenPageFlowProp = str;
+        }
+	}</source>
+		</section>		
+		<section id="ValidationLocaleRules">
+			<title>Jpf.ValidationLocaleRules</title>
+			<p>
+				<strong>Javadoc: </strong>
+				<a class="fork" 
+					href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ValidationLocaleRules.html">
+					 Jpf.ValidationLocaleRules</a>
+			</p>
+			<p>
+				<strong>Description</strong>
+			</p>
+			<p> The <code>@Jpf.ValidationLocaleRules</code> annotation... [todo]. </p>
+			<p>
+				<strong>Attributes</strong>
+			</p>
+			<table>
+				<tr>
+					<th>Attribute</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>applyToUnhandledLocales</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>country</code>
+					</td>
+					<td>
+							<code>String</code>
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>language</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateCreditCard</code>
+					</td>
+					<td>
+						<a href="#ValidateCreditCard"><code>@Jpf.ValidateCreditCard</code></a>
+					</td>
+					<td>A @Jpf.ValidateCreditCard annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateCustom</code>
+					</td>
+					<td>
+						<a href="#ValidateCustom"><code>@Jpf.ValidateCustom</code></a>
+					</td>
+					<td>A @Jpf.ValidateCustom annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateDate</code>
+					</td>
+					<td>
+						<a href="#ValidateDate"><code>@Jpf.ValidateDate</code></a>
+					</td>
+					<td>A @Jpf.ValidateDate annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateEmail</code>
+					</td>
+					<td>
+						<a href="#ValidateEmail"><code>@Jpf.ValidateEmail</code></a>
+					</td>
+					<td>A @Jpf.ValidateEmail annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMask</code>
+					</td>
+					<td>
+						<a href="#ValidateMask"><code>@Jpf.ValidateMask</code></a>
+					</td>
+					<td>A @Jpf.ValidateMask annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMaxLength</code>
+					</td>
+					<td>
+						<a href="#ValidateMaxLength"><code>@Jpf.ValidateMaxLength</code></a>
+					</td>
+					<td>A @Jpf.ValidateMaxLength annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateMinLength</code>
+					</td>
+					<td>
+						<a href="#ValidateMinLength"><code>@Jpf.ValidateMinLength</code></a>
+					</td>
+					<td>A @Jpf.ValidateMinLength annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateRange</code>
+					</td>
+					<td>
+						<a href="#ValidateRange"><code>@Jpf.ValidateRange</code></a>
+					</td>
+					<td>A @Jpf.ValidateRange annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateRequired</code>
+					</td>
+					<td>
+						<a href="#ValidateRequired"><code>@Jpf.ValidateRequired</code></a>
+					</td>
+					<td>A @Jpf.ValidateRequired annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateType</code>
+					</td>
+					<td>
+						<a href="#ValidateType"><code>@Jpf.ValidateType</code></a>
+					</td>
+					<td>A @Jpf.ValidateType annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>validateValidWhen</code>
+					</td>
+					<td>
+						<a href="#ValidateValidWhen"><code>@Jpf.ValidateValidWhen</code></a>
+					</td>
+					<td>A @Jpf.ValidateValidWhen annotation.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>variant</code>
+					</td>
+					<td>
+						String
+					</td>
+					<td>[todo]</td>
+				</tr>
+			</table>
+			<p><strong>Example</strong></p>
+			<source>[todo]</source>
+		</section>		
+			</body>
+			<footer>
+        <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
+	&copy; 2004, Apache Software Foundation
+	</legal>
+    </footer>
+</document>
\ No newline at end of file

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/jpf-annotations/pageflow_class_annotations.xml Tue Mar  8 09:36:36 2005
@@ -4,113 +4,123 @@
   <header>
     <title>JPF Class Annotations</title>
   </header>
-  <body>
-
-  <section id="toc">
-    <title>Table of Contents</title>
-    <ul>
-      <li><a href="#jpf_controller">Jpf.Controller</a>
-        <ul>
-          <li><a href="#jpf_simpleaction">Jpf.Controller with Jpf.SimpleAction</a></li>
-          <li><a href="#jpf_forward">Jpf.Controller with Jpf.Forward</a></li>
-          <li><a href="#jpf_catch">Jpf.Controller with Jpf.Catch and Jpf.ExceptionHandler</a></li>
-        </ul>
-      </li>
-    </ul>
-  </section>
-
-
-  <section id="jpf_controller">
-    <title><code>Jpf.Controller</code></title>
-
-    <ul>
-      <li><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">Jpf.Controller Javadoc</a></li>
-    </ul>
-
-    <p>
-    <code>Jpf.Controller</code> is the annotation used to both <strong>mark</strong> a class as a page-flow controller
-    and may additionally <strong>contain</strong> other annotations which participate in the configuration.
-    </p>
-
-    <p>
-    When used simply as a marker, it must simply be placed directly in front of the class definition.
-    </p>
-
-<source>
-<strong>@Jpf.Controller</strong>
-public class Controller
-    extends PageFlowController
-{
-    ...
-    ...
-}
-</source>
-
-    <p>
-    The <code>Jpf.Controller</code> annotation also has several configuration properties.
-    </p>
-
-    <table>
-      <tr>
-        <th>Property</th>
-        <th>Type</th>
-        <th>Description</th>
-      </tr>
-      <tr>
-        <td><code>loginRequired</code></td>
-        <td><code>boolean</code></td>
-        <td>Checks user authentication and possibly throws <a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
-      </tr>
-      <tr>
-        <td><code>readOnly</code></td>
-        <td><code>boolean</code></td>
-        <td>Flag to indicate this action does not modify state</td>
-      </tr>
-      <tr>
-        <td><code>rolesAllowed</code></td>
-        <td><code>String[]</code></td>
-        <td>List of roles allowed to invoke this action.  Implies <code>loginRequired=true</code>.</td>
-      </tr>
-      <tr>
-        <td><code>nested</code></td>
-        <td><code>boolean</code></td>
-        <td>Flag the pageflow as nested</td>
-      </tr>
-      <tr>
-        <td><code>singleton</code></td>
-        <td><code>boolean</code></td>
-        <td>Flag the pageflow as singleton</td>
-      </tr>
-    </table>
-
-<source>
-<strong>@Jpf.Controller {
-    rolesAllowed = { "admin" };
-    nested = true;
-}</strong>
-public class AddNewUserController 
-{
-    ...
-}
-</source>
-
-    <p>
-    The above controller, notably not named <code>Controller</code>, is a nested pageflow
-    that requires the <code>admin</code> role to be invoked.
-    </p>
-
-    <section id="jpf_simpleaction">  
-      <title>Jpf.Controller with Jpf.SimpleAction</title>
-  
-      <ul>
-        <li><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">Jpf.SimpleAction Javadoc</a></li>
-      </ul>
-
-      <p>
-      In addition to being a marker, simple configuration can occur using the <code>Jpf.SimpleAction</code> annotation.
-      </p>
-
-<source>
+	<body>
+		<section id="toc">
+			<title>Table of Contents</title>
+			<ul>
+				<li>
+					<a href="#jpf_controller">Jpf.Controller</a>
+					<ul>
+						<li>
+							<a href="#jpf_simpleaction">Jpf.Controller with 
+								Jpf.SimpleAction</a>
+						</li>
+						<li>
+							<a href="#jpf_forward">Jpf.Controller with 
+								Jpf.Forward</a>
+						</li>
+						<li>
+							<a href="#jpf_catch">Jpf.Controller with Jpf.Catch 
+								and Jpf.ExceptionHandler</a>
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</section>
+		<section id="jpf_controller">
+			<title>
+				<code>Jpf.Controller</code>
+			</title>
+			<ul>
+				<li>
+					<a 
+						href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Controller.html">
+						Jpf.Controller Javadoc</a>
+				</li>
+			</ul>
+			<p> <code>Jpf.Controller</code> is the annotation used to both 
+				<strong>mark</strong> a class as a page-flow controller and may 
+				additionally <strong>contain</strong> other annotations which 
+				participate in the configuration. </p>
+			<p> When used simply as a marker, it must simply be placed directly 
+				in front of the class definition. </p>
+			<source> <strong>@Jpf.Controller</strong> public class Controller 
+				extends PageFlowController { ... ... } </source>
+			<p> The <code>Jpf.Controller</code> annotation also has several 
+				configuration properties. </p>
+			<table>
+				<tr>
+					<th>Property</th>
+					<th>Type</th>
+					<th>Description</th>
+				</tr>
+				<tr>
+					<td>
+						<code>loginRequired</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>Checks user authentication and possibly throws <a 
+						href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/NotLoggedInException.html">NotLoggedInException</a></td>
+				</tr>
+				<tr>
+					<td>
+						<code>readOnly</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>Flag to indicate this action does not modify state</td>
+				</tr>
+				<tr>
+					<td>
+						<code>rolesAllowed</code>
+					</td>
+					<td>
+						<code>String[]</code>
+					</td>
+					<td>List of roles allowed to invoke this action. Implies 
+						<code>loginRequired=true</code>.</td>
+				</tr>
+				<tr>
+					<td>
+						<code>nested</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>Flag the pageflow as nested</td>
+				</tr>
+				<tr>
+					<td>
+						<code>singleton</code>
+					</td>
+					<td>
+						<code>boolean</code>
+					</td>
+					<td>Flag the pageflow as singleton</td>
+				</tr>
+			</table>
+			<source> <strong>@Jpf.Controller { rolesAllowed = { "admin" }; 
+				nested = true; }</strong> public class AddNewUserController { 
+				... } </source>
+			<p> The above controller, notably not named 
+				<code>Controller</code>, is a nested pageflow that requires the 
+				<code>admin</code> role to be invoked. </p>
+			<section id="jpf_simpleaction">
+				<title>Jpf.Controller with Jpf.SimpleAction</title>
+				<ul>
+					<li>
+						<a 
+							href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.SimpleAction.html">
+							Jpf.SimpleAction Javadoc</a>
+					</li>
+				</ul>
+				<p> In addition to being a marker, simple configuration can 
+					occur using the <code>Jpf.SimpleAction</code> annotation. 
+					</p>
+				<source>
 @Jpf.Controller {
     simpleActions = {
       <strong>@Jpf.SimpleAction( name="mypage", path="mypage.jsp" )</strong>,
@@ -124,14 +134,13 @@
     ...
 }
 </source>
-
-      <p>
-      The combination of <code>Jpf.Controller</code> and <code>Jpf.SimpleAction</code> operates as short-hand 
-      for the more verbose equivelent class using <code>Jpf.Controller</code> as a marker with explicitly
-      defined <em>controller methods</em> with <code>Jpf.Action</code> and <code>Jpf.Forward</code>.
-      </p>
-
-<source>
+				<p> The combination of <code>Jpf.Controller</code> and 
+					<code>Jpf.SimpleAction</code> operates as short-hand for 
+					the more verbose equivelent class using 
+					<code>Jpf.Controller</code> as a marker with explicitly 
+					defined <em>controller methods</em> with 
+					<code>Jpf.Action</code> and <code>Jpf.Forward</code>. </p>
+				<source>
 @Jpf.Controller
 public class Controller
     extends PageFlowController
@@ -157,21 +166,19 @@
     }</strong>
 }
 </source>
-
-    </section>
-
-    <section id="jpf_forward">
-      <title>Jpf.Controller with Jpf.Forward</title>
-
-      <ul>
-        <li><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">Jpf.Forward Javadoc</a></li>
-      </ul>
-
-      <p>
-      Global named forwards can be defined within the <code>Controller</code> class annotations.
-      </p>
-
-<source>
+			</section>
+			<section id="jpf_forward">
+				<title>Jpf.Controller with Jpf.Forward</title>
+				<ul>
+					<li>
+						<a 
+							href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Forward.html">
+							Jpf.Forward Javadoc</a>
+					</li>
+				</ul>
+				<p> Global named forwards can be defined within the 
+					<code>Controller</code> class annotations. </p>
+				<source>
 @Jpf.Controller {
     forwards = {
       <strong>@Jpf.Forward( name="error", path="/error.jsp" )</strong>
@@ -189,20 +196,25 @@
     }
 }
 </source>
-    </section>
-
-    <section id="jpf_catch">
-      <title>Jpf.Controller with Jpf.Catch and Jpf.ExceptionHandler</title>
-
-      <ul>
-        <li><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">Jpf.Catch Javadoc</a></li>
-        <li><a href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">Jpf.ExceptionHandler Javadoc</a></li>
-      </ul>
-
-      <p>
-      Global exception-handlers can be configured within the <code>Controller</code> class annotations.
-      </p>
-<source>
+			</section>
+			<section id="jpf_catch">
+				<title>Jpf.Controller with Jpf.Catch and 
+					Jpf.ExceptionHandler</title>
+				<ul>
+					<li>
+						<a 
+							href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.Catch.html">
+							Jpf.Catch Javadoc</a>
+					</li>
+					<li>
+						<a 
+							href="../../apidocs/classref_pageflows/org/apache/beehive/netui/pageflow/annotations/Jpf.ExceptionHandler.html">
+							Jpf.ExceptionHandler Javadoc</a>
+					</li>
+				</ul>
+				<p> Global exception-handlers can be configured within the 
+					<code>Controller</code> class annotations. </p>
+				<source>
 @Jpf.Controller {
     catches = {
         <strong>@Jpf.Catch { type=com.myco.FailedLoginException.class, method="failedLoginHandler" }</strong>
@@ -225,12 +237,9 @@
     }
 }
 </source>
-
-    </section>
-
-  </section>
-
-  </body>
+			</section>
+		</section>
+	</body>
   <footer>
     <legal>
       Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml Tue Mar  8 09:36:36 2005
@@ -10,7 +10,7 @@
         <faq label="FAQ" href="faq.html"/>
     </about>
     <docs label="Documentation" tab="welcome">
-        <docs label="Beehive 1.0 Beta Docs" href="docs/index.html"/>
+        <docs label="Beehive Docs" href="docs/index.html"/>
         <setup label="Installation and Setup" href="setup.html" />
         <pageflow label="Page Flows">        
             <tutorial_pageflow label="Tutorial" href="pageflow/tutorial_pageflow.html"/>
@@ -50,12 +50,8 @@
             <netui label="Page Flows">
                 <netui_api label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
                 <netui_taglib label="&lt;netui> Tags" href="apidocs/taglib/index.html"/>
-                <netui_meta label="@Jpf Annotations">
-                    <netui_meta_class label="Class Annotations" href="pageflow/jpf-annotations/pageflow_class_annotations.html"/>
-                    <netui_meta_method label="Method Annotations" href="pageflow/jpf-annotations/pageflow_method_annotations.html"/>
-                    <netui_meta_validation label="Validation Annotations" href="pageflow/jpf-annotations/pageflow_validation_annotations.html"/>
-                </netui_meta>
-                <netui label="netui-config.xml" href="pageflow/config/netui-config.html"/>
+                <netui_annotations label="@Jpf Annotations" href="pageflow/jpf-annotations/pageflow_annotations.html"/>
+                <netui_config label="netui-config.xml" href="pageflow/config/netui-config.html"/>
             </netui>
             <ws label="Web Services">
                 <ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml?view=diff&r1=156551&r2=156552
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/tabs.xml Tue Mar  8 09:36:36 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "tab-cocoon-v11.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
 
 <tabs software="Apache Beehive"
   title="Apache Beehive"