You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/20 17:34:39 UTC

[04/51] [partial] incubator-juneau-website git commit: Update javadocs.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Body.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Body.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Body.html
index e26c869..ade5789 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Body.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Body.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Body (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Body (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Body (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Body (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res, <ja>@Body</ja> Person person) {
       ...
    }
@@ -111,7 +111,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res) {
       Person person = req.getBody().asType(Person.<jk>class</jk>);
       ...
@@ -122,7 +122,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Readers</code></a> and <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStreams</code></a> can also be specified as content parameters.
  When specified, any registered parsers are bypassed.
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPostPerson(<ja>@Header</ja>(<js>"Content-Type"</js>) String mediaType, <ja>@Body</ja> InputStream input) {
       ...
    }

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html b/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
index 6de2462..651dfe3 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FormData (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>FormData (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FormData (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="FormData (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPost(RestRequest req, RestResponse res,
             <ja>@FormData</ja>(<js>"p1"</js>) <jk>int</jk> p1, <ja>@FormData</ja>(<js>"p2"</js>) String p2, <ja>@FormData</ja>(<js>"p3"</js>) UUID p3) {
       ...
@@ -112,7 +112,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPost(RestRequest req, RestResponse res) {
       <jk>int</jk> p1 = req.getFormData(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
       String p2 = req.getFormData(String.<jk>class</jk>, <js>"p2"</js>);

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/HasFormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/HasFormData.html b/content/site/apidocs/org/apache/juneau/rest/annotation/HasFormData.html
index dbaf568..149aa58 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/HasFormData.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/HasFormData.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HasFormData (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>HasFormData (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HasFormData (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="HasFormData (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -105,7 +105,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPost(<ja>@HasFormData</ja>(<js>"p1"</js>) <jk>boolean</jk> p1) {
       ...
    }
@@ -114,7 +114,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"POST"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
    <jk>public void</jk> doPost(RestRequest req) {
       <jk>boolean</jk> p1 = req.hasFormData(<js>"p1"</js>);
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/HasQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/HasQuery.html b/content/site/apidocs/org/apache/juneau/rest/annotation/HasQuery.html
index 005f856..b405ca9 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/HasQuery.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/HasQuery.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HasQuery (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>HasQuery (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HasQuery (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="HasQuery (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -108,7 +108,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doPost(<ja>@HasQuery</ja>(<js>"p1"</js>) <jk>boolean</jk> p1, <ja>@Body</ja> Bean myBean) {
       ...
    }
@@ -117,7 +117,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doGet(RestRequest req) {
       <jk>boolean</jk> p1 = req.hasQueryParameter(<js>"p1"</js>);
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Header.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Header.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Header.html
index 7cba982..93b95a6 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Header.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Header.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Header (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Header (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Header (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Header (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res, <ja>@Header</ja>(<js>"ETag"</js>) UUID etag) {
       ...
    }
@@ -111,7 +111,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res) {
       UUID etag = req.getHeader(UUID.<jk>class</jk>, "ETag");
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/HookEvent.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/HookEvent.html b/content/site/apidocs/org/apache/juneau/rest/annotation/HookEvent.html
index 38b851d..d11f15d 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/HookEvent.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/HookEvent.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HookEvent (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>HookEvent (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HookEvent (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="HookEvent (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/HtmlDoc.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/HtmlDoc.html b/content/site/apidocs/org/apache/juneau/rest/annotation/HtmlDoc.html
index 4353862..bf0e03c 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/HtmlDoc.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/HtmlDoc.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HtmlDoc (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>HtmlDoc (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HtmlDoc (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="HtmlDoc (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -180,14 +180,14 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#header--">header</a></span></code>
-<div class="block">Sets the HTML header section contents.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#head--">head</a></span></code>
+<div class="block">Adds arbitrary content to the HTML <xt>&lt;head&gt;</xt> element on the page.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#links--">links</a></span></code>
-<div class="block">Sets the links in the HTML nav section.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#header--">header</a></span></code>
+<div class="block">Sets the HTML header section contents.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -197,42 +197,48 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#navlinks--">navlinks</a></span></code>
+<div class="block">Sets the links in the HTML nav section.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#noResultsMessage--">noResultsMessage</a></span></code>
 <div class="block">Specifies the text to display when serializing an empty array or collection.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#nowrap--">nowrap</a></span></code>
 <div class="block">Shorthand method for forcing the rendered HTML content to be no-wrap.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#script--">script</a></span></code>
 <div class="block">Sets the HTML script section contents.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#style--">style</a></span></code>
 <div class="block">Sets the HTML CSS style section contents.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#stylesheet--">stylesheet</a></span></code>
 <div class="block">Sets the CSS URL in the HTML CSS style section.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#template--">template</a></span></code>
 <div class="block">Specifies the template class to use for rendering the HTML page.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>&gt;[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#widgets--">widgets</a></span></code>
 <div class="block">Defines widgets that can be used in conjunction with string variables of the form <js>"$W{name}"</js>to quickly
@@ -260,7 +266,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>header</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.121">header</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.120">header</a></pre>
 <div class="block">Sets the HTML header section contents.
 
  <p>
@@ -291,8 +297,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlHeader-java.lang.String-"><code>RestConfig.setHtmlHeader(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlHeader-java.lang.Object-"><code>RestResponse.setHtmlHeader(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#header-java.lang.Object...-"><code>HtmlDocBuilder.header(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -310,13 +315,13 @@
 </li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="links--">
+<li class="blockList"><a name="navlinks--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>links</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.172">links</a></pre>
+<h4>navlinks</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.170">navlinks</a></pre>
 <div class="block">Sets the links in the HTML nav section.
 
  <p>
@@ -334,7 +339,7 @@
  <p class='bcode'>
    <ja>@RestResource</ja>(
       htmldoc=<ja>@HtmlDoc</ja>(
-         links={
+         navlinks={
             <js>"up: request:/.."</js>,
             <js>"options: servlet:/?method=OPTIONS"</js>
          }
@@ -352,8 +357,7 @@
    <li>
       This field can also use URIs of any support type in <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a>.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlLinks-java.lang.String:A-"><code>RestConfig.setHtmlLinks(String[])</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlLinks-java.lang.String:A-"><code>RestResponse.setHtmlLinks(String[])</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#navlinks-java.lang.Object...-"><code>HtmlDocBuilder.navlinks(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -379,7 +383,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>nav</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.220">nav</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.217">nav</a></pre>
 <div class="block">Sets the HTML nav section contents.
 
  <p>
@@ -405,7 +409,7 @@
  <h6 class='topic'>Other Notes</h6>
  <ul class='spaced-list'>
    <li>
-      When a value is specified, the <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#links--"><code>links()</code></a> value will be ignored.
+      When a value is specified, the <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#navlinks--"><code>navlinks()</code></a> value will be ignored.
    <li>
       This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
       <br>See <a href="../../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.
@@ -414,8 +418,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlNav-java.lang.String-"><code>RestConfig.setHtmlNav(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlNav-java.lang.Object-"><code>RestResponse.setHtmlNav(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#nav-java.lang.Object...-"><code>HtmlDocBuilder.nav(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -439,7 +442,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>aside</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.263">aside</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.259">aside</a></pre>
 <div class="block">Sets the HTML aside section contents.
 
  <p>
@@ -469,8 +472,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlAside-java.lang.String-"><code>RestConfig.setHtmlAside(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlAside-java.lang.Object-"><code>RestResponse.setHtmlAside(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#aside-java.lang.Object...-"><code>HtmlDocBuilder.aside(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -494,7 +496,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>footer</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.306">footer</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.301">footer</a></pre>
 <div class="block">Sets the HTML footer section contents.
 
  <p>
@@ -524,8 +526,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlFooter-java.lang.String-"><code>RestConfig.setHtmlFooter(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlFooter-java.lang.Object-"><code>RestResponse.setHtmlFooter(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#footer-java.lang.Object...-"><code>HtmlDocBuilder.footer(Object[])</code></a> methods.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -549,7 +550,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>style</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.347">style</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.341">style</a></pre>
 <div class="block">Sets the HTML CSS style section contents.
 
  <p>
@@ -577,8 +578,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlStyle-java.lang.String-"><code>RestConfig.setHtmlStyle(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlStyle-java.lang.Object-"><code>RestResponse.setHtmlStyle(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#style-java.lang.Object...-"><code>HtmlDocBuilder.style(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -602,7 +602,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>stylesheet</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.386">stylesheet</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.379">stylesheet</a></pre>
 <div class="block">Sets the CSS URL in the HTML CSS style section.
 
  <p>
@@ -630,8 +630,7 @@
       defined by <a href="../../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a>.
       <br>See <a href="../../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlStylesheet-java.lang.String-"><code>RestConfig.setHtmlStylesheet(String)</code></a>/<a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlStylesheet-java.lang.Object-"><code>RestResponse.setHtmlStylesheet(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#stylesheet-java.lang.Object...-"><code>HtmlDocBuilder.stylesheet(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -640,7 +639,7 @@
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>""</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
@@ -653,7 +652,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>script</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.426">script</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.418">script</a></pre>
 <div class="block">Sets the HTML script section contents.
 
  <p>
@@ -680,8 +679,7 @@
    <li>
       Multiple values are combined with newlines into a single string.
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlScript-java.lang.String-"><code>RestConfig.setHtmlScript(String)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlScript-java.lang.Object-"><code>RestResponse.setHtmlScript(Object)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#script-java.lang.Object...-"><code>HtmlDocBuilder.script(Object[])</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -699,13 +697,66 @@
 </li>
 </ul>
 <ul class="blockList">
+<li class="blockList"><a name="head--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>head</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.459">head</a></pre>
+<div class="block">Adds arbitrary content to the HTML <xt>&lt;head&gt;</xt> element on the page.
+
+ <p>
+ The format of this value is HTML.
+
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <ja>@RestResource</ja>(
+      htmldoc=<ja>@HtmlDoc</ja>(
+         head={
+            <jc>// Add a shortcut link in the browser tab</jc>
+            <js>"<link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>,
+
+            <jc>// Reload the page every 5 seconds </jc>
+            <js>"<meta http-equiv='refresh' content='5'>"</js>
+         }
+      )
+   )
+ </p>
+
+ <h6 class='topic'>Other Notes</h6>
+ <ul class='spaced-list'>
+   <li>
+      This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
+      <br>See <a href="../../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.
+   <li>
+      A value of <js>"NONE"</js> can be used to force no value.
+   <li>
+      The head content from the parent can be included by adding the literal <js>"INHERIT"</js> as a value.
+   <li>
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#head-java.lang.Object...-"><code>HtmlDocBuilder.head(Object[])</code></a> method.
+   <li>
+      On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
+   <li>
+      On servlet/resource classes, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the
+      parent class.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>{}</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="nowrap--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>nowrap</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.434">nowrap</a></pre>
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.467">nowrap</a></pre>
 <div class="block">Shorthand method for forcing the rendered HTML content to be no-wrap.
 
  <p>
@@ -725,7 +776,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>noResultsMessage</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.439">noResultsMessage</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.472">noResultsMessage</a></pre>
 <div class="block">Specifies the text to display when serializing an empty array or collection.</div>
 <dl>
 <dt>Default:</dt>
@@ -742,7 +793,7 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>template</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.460">template</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/html/HtmlDocTemplate.html" title="interface in org.apache.juneau.html">HtmlDocTemplate</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.492">template</a></pre>
 <div class="block">Specifies the template class to use for rendering the HTML page.
 
  <p>
@@ -752,8 +803,7 @@
  <h6 class='topic'>Other Notes</h6>
  <ul class='spaced-list'>
    <li>
-      The programmatic equivalent to this annotation are the
-      <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setHtmlTemplate-java.lang.Class-"><code>RestConfig.setHtmlTemplate(Class)</code></a> and <a href="../../../../../org/apache/juneau/rest/RestResponse.html#setHtmlTemplate-java.lang.Class-"><code>RestResponse.setHtmlTemplate(Class)</code></a> methods.
+      The programmatic equivalent to this annotation is the <a href="../../../../../org/apache/juneau/rest/HtmlDocBuilder.html#template-java.lang.Class-"><code>HtmlDocBuilder.template(Class)</code></a> method.
    <li>
       On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class.
    <li>
@@ -775,7 +825,7 @@
 <ul class="blockListLast">
 <li class="blockList">
 <h4>widgets</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>&gt;[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.472">widgets</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>&gt;[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/HtmlDoc.html#line.504">widgets</a></pre>
 <div class="block">Defines widgets that can be used in conjunction with string variables of the form <js>"$W{name}"</js>to quickly
  generate arbitrary replacement HTML.
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Inherit.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Inherit.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Inherit.html
index b224e11..7e91bb0 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Inherit.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Inherit.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Inherit (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Inherit (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Inherit (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Inherit (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Messages.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Messages.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Messages.html
index 6cc39f3..267b1f7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Messages.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Messages.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Messages (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Messages (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Messages (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Messages (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -105,7 +105,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public</jk> String doGet(<ja>@Messages</ja> ResourceBundle messages) {
       <jk>return</jk> messages.getString(<js>"myLocalizedMessage"</js>);
    }
@@ -114,7 +114,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public</jk> String doGet(RestRequest req) {
       <jk>return</jk> req.getMessage(<js>"myLocalizedMessage"</js>);
    }

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
index 6e9ac19..8ba4320 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Method (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Method (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Method (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Method (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html b/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
index 9b835b9..5769a07 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MethodSwagger (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>MethodSwagger (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MethodSwagger (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="MethodSwagger (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -310,7 +310,7 @@
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <ja>@RestMethod</ja>(
-      name=<js>"POST"</js>, path=<js>"/{a}"</js>,
+      name=<jsf>POST</jsf>, path=<js>"/{a}"</js>,
       description=<js>"This is my method."</js>,
       swagger=<ja>@MethodSwagger</ja>(
          parameters={
@@ -369,7 +369,7 @@
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <ja>@RestMethod</ja>(
-      name=<js>"GET"</js>, path=<js>"/"</js>,
+      name=<jsf>GET</jsf>, path=<js>"/"</js>,
       swagger=<ja>@MethodSwagger</ja>(
          responses={
             <ja>@Response</ja>(200),

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
index 793c5c0..372f65f 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Parameter (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Parameter (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Parameter (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Parameter (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
index d740ccb..867e8b7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Path (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Path (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Path (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Path (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res,
          <ja>@Path</ja> String foo, <ja>@Path</ja> <jk>int</jk> bar, <ja>@Path</ja> UUID baz) {
       ...
@@ -115,7 +115,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  variables in the URL path pattern.
  The following example is equivalent to the previous example.
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res,
          String foo, <jk>int</jk> bar, UUID baz) {
       ...
@@ -128,7 +128,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  The following example is equivalent to the previous example, except the parameter order has been switched, requiring
  the use of the <ja>@Path</ja> annotations.
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res,
          <ja>@Path</ja>(<js>"baz"</js>) UUID baz, <ja>@Path</ja>(<js>"foo"</js>) String foo, <ja>@Path</ja>(<js>"bar"</js>) <jk>int</jk> bar) {
       ...
@@ -138,7 +138,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  You can also use <code>{#}</code> notation to specify path parameters without specifying names.
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res,
          <ja>@Path</ja> String foo, <ja>@Path</ja> <jk>int</jk> bar, <ja>@Path</ja> UUID baz) {
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/PathRemainder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/PathRemainder.html b/content/site/apidocs/org/apache/juneau/rest/annotation/PathRemainder.html
index 2fe558c..754ea0c 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/PathRemainder.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/PathRemainder.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PathRemainder (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>PathRemainder (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PathRemainder (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="PathRemainder (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res, <ja>@PathRemainder</ja> String remainder) {
       ...
    }
@@ -111,7 +111,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo/*"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res) {
       String remainder = req.getPathRemainder();
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Properties.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Properties.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Properties.html
index 345460a..872278e 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Properties.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Properties.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Properties (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Properties (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Properties (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Properties (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public Person</jk> doGetPerson(<ja>@Properties</ja> ObjectMap properties) {
       properties.put(<jsf>HTMLDOC_title</jsf>, <js>"This is a person"</js>);
       ...
@@ -112,7 +112,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public Person</jk> doGetPerson(RestResponse res) {
       ObjectMap properties = res.getProperties();
       properties.put(<jsf>HTMLDOC_title</jsf>, <js>"This is a person"</js>);
@@ -123,7 +123,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  ...or this...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public Person</jk> doGetPerson(RestResponse res) {
       res.setProperty(<jsf>HTMLDOC_title</jsf>, <js>"This is a person"</js>);
       ...

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
index e938e72..48c5bc1 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Property.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Property (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Property (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Property (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Property (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
index 5d3e339..aa3a95f 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Query (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Query (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Query (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Query (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -108,7 +108,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res,
             <ja>@Query</ja>(<js>"p1"</js>) <jk>int</jk> p1, <ja>@Query</ja>(<js>"p2"</js>) String p2, <ja>@Query</ja>(<js>"p3"</js>) UUID p3) {
       ...
@@ -118,7 +118,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  <p>
  This is functionally equivalent to the following code...
  <p class='bcode'>
-   <ja>@RestMethod</ja>(name=<js>"GET"</js>)
+   <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
    <jk>public void</jk> doGet(RestRequest req, RestResponse res) {
       <jk>int</jk> p1 = req.getQueryParameter(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
       String p2 = req.getQueryParameter(String.<jk>class</jk>, <js>"p2"</js>);

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html b/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
index a9e1a12..59f89c1 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceSwagger (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>ResourceSwagger (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResourceSwagger (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="ResourceSwagger (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
index 2b335fd..bf210cf 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Response (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>Response (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Response (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="Response (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/db550d07/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
index 09e5f68..f15d2c7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RestHook (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)</title>
+<title>RestHook (Apache Juneau 7.0.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RestHook (Apache Juneau (incubating) 6.4.1-incubating-SNAPSHOT)";
+            parent.document.title="RestHook (Apache Juneau 7.0.0-SNAPSHOT)";
         }
     }
     catch(err) {