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/03/17 02:13:43 UTC

[08/51] [partial] incubator-juneau-website git commit: Update javadocs for changes to RestServlet API.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
index 33ddd9e..03d47b2 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/PlainTextSerializer.html
@@ -48,8 +48,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/plaintext/PlainTextParserBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/PlainTextSerializer.html" target="_top">Frames</a></li>
@@ -74,13 +74,13 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -99,10 +99,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/Lockable.html" title="class in org.apache.juneau">org.apache.juneau.Lockable</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/CoreApi.html" title="class in org.apache.juneau">org.apache.juneau.CoreApi</a></li>
+<li><a href="../../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau">org.apache.juneau.CoreObject</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">org.apache.juneau.serializer.Serializer</a></li>
@@ -121,15 +118,9 @@ var activeTableTab = "activeTableTab";
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></dd>
-</dl>
 <hr>
 <br>
 <pre><a href="../../../../org/apache/juneau/annotation/Produces.html" title="annotation in org.apache.juneau.annotation">@Produces</a>(<a href="../../../../org/apache/juneau/annotation/Produces.html#value--">value</a>="text/plain")
@@ -162,6 +153,34 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html#DEFAULT">DEFAULT</a></span></code>
+<div class="block">Default serializer, all default settings.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.CoreObject">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau">CoreObject</a></h3>
+<code><a href="../../../../org/apache/juneau/CoreObject.html#propertyStore">propertyStore</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -174,7 +193,9 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html#PlainTextSerializer--">PlainTextSerializer</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html#PlainTextSerializer-org.apache.juneau.PropertyStore-">PlainTextSerializer</a></span>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a>&nbsp;propertyStore)</code>
+<div class="block">Constructor.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -192,9 +213,10 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html#clone--">clone</a></span>()</code>
-<div class="block">Creates an unlocked clone of this object.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext">PlainTextSerializerBuilder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html#builder--">builder</a></span>()</code>
+<div class="block">Creates a new builder class for this object so that a new object can be created
+ that expands upon the current object's settings.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -217,28 +239,21 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></h3>
-<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#addBeanFilters-java.lang.Class...-">addBeanFilters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addBeanFilters-java.util.Collection-">addBeanFilters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addImplClass-java.lang.Class-java.lang.Class-">addImplClass</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addNotBeanClasses-java.lang.Class...-">addNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addNotBeanClasses-java.util.Collection-">addNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addNotBeanPackages-java.util.Collection-">addNotBeanPackages</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addNotBeanPackages-java.lang.String...-">addNotBeanPackages</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addPojoSwaps-java.lang.Clas
 s...-">addPojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addPojoSwaps-java.util.Collection-">addPojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addToBeanDictionary-java.lang.Class...-">addToBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addToBeanDictionary-java.util.Collection-">addToBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#addToProperty-java.lang.String-java.lang.Object-">addToProperty</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</
 a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#lock--">lock</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#putToProperty-java.lang.String-java.lang.Object-">putToProperty</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#putToProperty-java.lang.String-java.lang.Object-java.lang.Object-">putToProperty</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeBeanFilters-java.lang.Class...-">removeBeanFilters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeBeanFilters-java.util.Collection-">removeBeanFilt
 ers</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeFromBeanDictionary-java.lang.Class...-">removeFromBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeFromBeanDictionary-java.util.Collection-">removeFromBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeFromProperty-java.lang.String-java.lang.Object-">removeFromProperty</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeNotBeanClasses-java.lang.Class...-">removeNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeNotBeanClasses-java.util.Collection-">removeNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeNotBeanPackages-java.util.Collection-">removeNotBeanPackages</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removeNotBeanPackages-java.lang.String...-">removeNotBeanPackages</a>, <a href="../
 ../../../org/apache/juneau/serializer/Serializer.html#removePojoSwaps-java.lang.Class...-">removePojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#removePojoSwaps-java.util.Collection-">removePojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setAbsolutePathUriBase-java.lang.String-">setAbsolutePathUriBase</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setAddBeanTypeProperties-boolean-">setAddBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanClassVisibility-org.apache.juneau.Visibility-">setBeanClassVisibility</a>, <a href="../../../../org/apache/juneau/serializer/Serializer
 .html#setBeanConstructorVisibility-org.apache.juneau.Visibility-">setBeanConstructorVisibility</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanDictionary-java.lang.Class...-">setBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanDictionary-java.util.Collection-">setBeanDictionary</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanFieldVisibility-org.apache.juneau.Visibility-">setBeanFieldVisibility</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanFilters-java.lang.Class...-">setBeanFilters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanFilters-java.util.Collection-">setBeanFilters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanMapPutReturnsOldValue-boolean-">setBeanMapPutReturnsOldValue</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeansRequireDefaultConstructor-boolea
 n-">setBeansRequireDefaultConstructor</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeansRequireSerializable-boolean-">setBeansRequireSerializable</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeansRequireSettersForGetters-boolean-">setBeansRequireSettersForGetters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeansRequireSomeProperties-boolean-">setBeansRequireSomeProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setBeanTypePropertyName-java.lang.String-">setBeanTypePropertyName</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setClassLoader-java.lang.ClassLoader-">setClassLoader</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setDebug-boolean-">setDebug</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setDefaultParser-java.lang.Class-">setDefaultParser</a>, <a href="../../../../org/apache/juneau/seria
 lizer/Serializer.html#setDetectRecursions-boolean-">setDetectRecursions</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnoreInvocationExceptionsOnGetters-boolean-">setIgnoreInvocationExceptionsOnGetters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnoreInvocationExceptionsOnSetters-boolean-">setIgnoreInvocationExceptionsOnSetters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnorePropertiesWithoutSetters-boolean-">setIgnorePropertiesWithoutSetters</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnoreRecursions-boolean-">setIgnoreRecursions</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnoreUnknownBeanProperties-boolean-">setIgnoreUnknownBeanProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setIgnoreUnknownNullBeanProperties-boolean-">setIgnoreUnknownNullBeanProperties</a>, <a href="../../../../org/apache/juneau
 /serializer/Serializer.html#setImplClasses-java.util.Map-">setImplClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setInitialDepth-int-">setInitialDepth</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setLocale-java.util.Locale-">setLocale</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setMaxDepth-int-">setMaxDepth</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setMediaType-org.apache.juneau.MediaType-">setMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setMethodVisibility-org.apache.juneau.Visibility-">setMethodVisibility</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setNotBeanClasses-java.lang.Class...-">setNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setNotBeanClasses-java.util.Collection-">setNotBeanClasses</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setNo
 tBeanPackages-java.util.Collection-">setNotBeanPackages</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setNotBeanPackages-java.lang.String...-">setNotBeanPackages</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setPojoSwaps-java.lang.Class...-">setPojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setPojoSwaps-java.util.Collection-">setPojoSwaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setProperties-org.apache.juneau.ObjectMap-">setProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setProperty-java.lang.String-java.lang.Object-">setProperty</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setQuoteChar-char-">setQuoteChar</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setRelativeUriBase-java.lang.String-">setRelativeUriBase</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setSortCo
 llections-boolean-">setSortCollections</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setSortMaps-boolean-">setSortMaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setSortProperties-boolean-">setSortProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setTimeZone-java.util.TimeZone-">setTimeZone</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setTrimEmptyCollections-boolean-">setTrimEmptyCollections</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setTrimEmptyMaps-boolean-">setTrimEmptyMaps</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setTrimNullProperties-boolean-">setTrimNullProperties</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setTrimStrings-boolean-">setTrimStrings</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setUseInterfaceProxies-boolean-">setUseInterfaceProxies</a>, <a href=
 "../../../../org/apache/juneau/serializer/Serializer.html#setUseJavaBeanIntrospector-boolean-">setUseJavaBeanIntrospector</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#setUseWhitespace-boolean-">setUseWhitespace</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
+<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/june
 au/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>, <a href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreApi">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.CoreObject">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/CoreApi.html" title="class in org.apache.juneau">CoreApi</a></h3>
-<code><a href="../../../../org/apache/juneau/CoreApi.html#checkLock--">checkLock</a>, <a href="../../../../org/apache/juneau/CoreApi.html#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/CoreApi.html#getContext-java.lang.Class-">getContext</a>, <a href="../../../../org/apache/juneau/CoreApi.html#getContextFactory--">getContextFactory</a>, <a href="../../../../org/apache/juneau/CoreApi.html#object--">object</a>, <a href="../../../../org/apache/juneau/CoreApi.html#string--">string</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.Lockable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/Lockable.html" title="class in org.apache.juneau">Lockable</a></h3>
-<code><a href="../../../../org/apache/juneau/Lockable.html#isLocked--">isLocked</a>, <a href="../../../../org/apache/juneau/Lockable.html#onUnclone--">onUnclone</a></code></li>
+<h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau">CoreObject</a></h3>
+<code><a href="../../../../org/apache/juneau/CoreObject.html#createContext-java.lang.Class-">createContext</a>, <a href="../../../../org/apache/juneau/CoreObject.html#createPropertyStore--">createPropertyStore</a>, <a href="../../../../org/apache/juneau/CoreObject.html#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/CoreObject.html#getOverrideProperties--">getOverrideProperties</a>, <a href="../../../../org/apache/juneau/CoreObject.html#object--">object</a>, <a href="../../../../org/apache/juneau/CoreObject.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/j
 ava/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
 </ul>
 </li>
 </ul>
@@ -248,19 +263,42 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="DEFAULT">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DEFAULT</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer</a> <a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.47">DEFAULT</a></pre>
+<div class="block">Default serializer, all default settings.</div>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="PlainTextSerializer--">
+<a name="PlainTextSerializer-org.apache.juneau.PropertyStore-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextSerializer</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.44">PlainTextSerializer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.54">PlainTextSerializer</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a>&nbsp;propertyStore)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>propertyStore</code> - The property store containing all the settings for this object.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -271,13 +309,31 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">
+<a name="builder--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
+<h4>builder</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext">PlainTextSerializerBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.59">builder</a>()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/CoreObject.html#builder--">CoreObject</a></code></span></div>
+<div class="block">Creates a new builder class for this object so that a new object can be created
+ that expands upon the current object's settings.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#builder--">builder</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new builder.</dd>
+</dl>
+</li>
+</ul>
+<a name="doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
 <h4>doSerialize</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.51">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.69">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>
@@ -296,21 +352,6 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </dl>
 </li>
 </ul>
-<a name="clone--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>clone</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/plaintext/PlainTextSerializer.html#line.56">clone</a>()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/Lockable.html#clone--">Lockable</a></code></span></div>
-<div class="block">Creates an unlocked clone of this object.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/Serializer.html#clone--">clone</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></dd>
-</dl>
-</li>
-</ul>
 </li>
 </ul>
 </li>
@@ -338,8 +379,8 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/plaintext/PlainTextParserBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/PlainTextSerializer.html" target="_top">Frames</a></li>
@@ -364,13 +405,13 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/plaintext/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/package-frame.html b/content/site/apidocs/org/apache/juneau/plaintext/package-frame.html
index 17e8b70..4fde24e 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/package-frame.html
@@ -14,7 +14,9 @@
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="PlainTextParser.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextParser</a></li>
+<li><a href="PlainTextParserBuilder.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextParserBuilder</a></li>
 <li><a href="PlainTextSerializer.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextSerializer</a></li>
+<li><a href="PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext" target="classFrame">PlainTextSerializerBuilder</a></li>
 </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/plaintext/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/package-summary.html b/content/site/apidocs/org/apache/juneau/plaintext/package-summary.html
index 0b8874a..8ff84ba 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/package-summary.html
@@ -92,11 +92,23 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/plaintext/PlainTextParserBuilder.html" title="class in org.apache.juneau.plaintext">PlainTextParserBuilder</a></td>
+<td class="colLast">
+<div class="block">Builder class for building instances of plain-text parsers.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJOs to plain text using just the <code>toString()</code> method on the serialized object.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext">PlainTextSerializerBuilder</a></td>
+<td class="colLast">
+<div class="block">Builder class for building instances of plain-text serializers.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/plaintext/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/plaintext/package-tree.html b/content/site/apidocs/org/apache/juneau/plaintext/package-tree.html
index 58534ee..6359a21 100644
--- a/content/site/apidocs/org/apache/juneau/plaintext/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/plaintext/package-tree.html
@@ -80,9 +80,7 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/Lockable.html" title="class in org.apache.juneau"><span class="typeNameLink">Lockable</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>)
-<ul>
-<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/CoreApi.html" title="class in org.apache.juneau"><span class="typeNameLink">CoreApi</span></a>
+<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau"><span class="typeNameLink">CoreObject</span></a>
 <ul>
 <li type="circle">org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">Parser</span></a>
 <ul>
@@ -104,6 +102,18 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/CoreObjectBuilder.html" title="class in org.apache.juneau"><span class="typeNameLink">CoreObjectBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/ParserBuilder.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParserBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.plaintext.<a href="../../../../org/apache/juneau/plaintext/PlainTextParserBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">PlainTextParserBuilder</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerBuilder.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">SerializerBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.plaintext.<a href="../../../../org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">PlainTextSerializerBuilder</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/ClientVersionMatcher.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/ClientVersionMatcher.html b/content/site/apidocs/org/apache/juneau/rest/ClientVersionMatcher.html
index 9613aec..018bee5 100644
--- a/content/site/apidocs/org/apache/juneau/rest/ClientVersionMatcher.html
+++ b/content/site/apidocs/org/apache/juneau/rest/ClientVersionMatcher.html
@@ -102,24 +102,19 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestMatcher</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestMatcherReflecting</a></li>
-<li>
-<ul class="inheritance">
 <li>org.apache.juneau.rest.ClientVersionMatcher</li>
 </ul>
 </li>
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
 <hr>
 <br>
 <pre>public class <a href="../../../../src-html/org/apache/juneau/rest/ClientVersionMatcher.html#line.23">ClientVersionMatcher</a>
-extends <a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest">RestMatcherReflecting</a></pre>
+extends <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest">RestMatcher</a></pre>
 <div class="block">Specialized matcher for matching client versions.
  <p>
  See <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#clientVersionHeader--"><code>RestResource.clientVersionHeader()</code></a> and <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#clientVersion--"><code>RestMethod.clientVersion()</code></a> for more info.</div>
@@ -143,7 +138,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html"
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/ClientVersionMatcher.html#ClientVersionMatcher-org.apache.juneau.rest.RestServlet-java.lang.reflect.Method-">ClientVersionMatcher</a></span>(<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a>&nbsp;servlet,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/ClientVersionMatcher.html#ClientVersionMatcher-java.lang.String-java.lang.reflect.Method-">ClientVersionMatcher</a></span>(<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;clientVersionHeader,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;javaMethod)</code>
 <div class="block">Constructor.</div>
 </td>
@@ -197,18 +192,19 @@ extends <a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html"
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ClientVersionMatcher-org.apache.juneau.rest.RestServlet-java.lang.reflect.Method-">
+<a name="ClientVersionMatcher-java.lang.String-java.lang.reflect.Method-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ClientVersionMatcher</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/ClientVersionMatcher.html#line.34">ClientVersionMatcher</a>(<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a>&nbsp;servlet,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/ClientVersionMatcher.html#line.35">ClientVersionMatcher</a>(<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;clientVersionHeader,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;javaMethod)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>servlet</code> - The servlet.</dd>
+<dd><code>clientVersionHeader</code> - The HTTP request header name containing the client version.
+ If <jk>null</jk> or an empty string, uses <js>"X-Client-Version"</js></dd>
 <dd><code>javaMethod</code> - The version string that the client version must match.</dd>
 </dl>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/Redirect.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/Redirect.html b/content/site/apidocs/org/apache/juneau/rest/Redirect.html
index 2cbc50c..b4c0375 100644
--- a/content/site/apidocs/org/apache/juneau/rest/Redirect.html
+++ b/content/site/apidocs/org/apache/juneau/rest/Redirect.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.67">Redirect</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.66">Redirect</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">REST methods can return this object as a shortcut for performing <code>HTTP 302</code> redirects.
  <p>
@@ -153,7 +153,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
  </p>
  <p>
  This class is handled by <a href="../../../../org/apache/juneau/rest/response/RedirectHandler.html" title="class in org.apache.juneau.rest.response"><code>RedirectHandler</code></a>, a built-in default
-   response handler created by <a href="../../../../org/apache/juneau/rest/RestServlet.html#createResponseHandlers-org.apache.juneau.ObjectMap-"><code>RestServlet.createResponseHandlers(ObjectMap)</code></a>.</div>
+   response handler created in <a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest"><code>RestConfig</code></a>.</div>
 </li>
 </ul>
 </div>
@@ -249,7 +249,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>Redirect</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.86">Redirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;url,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.85">Redirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;url,
                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Redirect to the specified URL.
  Relative paths are interpreted as relative to the servlet path.</div>
@@ -272,7 +272,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>Redirect</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.102">Redirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;url)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.101">Redirect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;url)</pre>
 <div class="block">Convenience method for redirecting to instance of <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a> and <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a>.
  Same as calling <code>toString()</code> on the object and using the other constructor.</div>
 <dl>
@@ -293,7 +293,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>Redirect</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.120">Redirect</a>(int&nbsp;httpResponseCode,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.119">Redirect</a>(int&nbsp;httpResponseCode,
                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;url,
                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Redirect to the specified URL.
@@ -318,7 +318,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Redirect</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.129">Redirect</a>()</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.128">Redirect</a>()</pre>
 <div class="block">Shortcut for redirecting to the servlet root.</div>
 </li>
 </ul>
@@ -336,7 +336,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toUrl</h4>
-<pre>public&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/Redirect.html#line.139">toUrl</a>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a>&nbsp;s)</pre>
+<pre>public&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/Redirect.html#line.138">toUrl</a>(<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a>&nbsp;s)</pre>
 <div class="block">Calculates the URL to redirect to.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -352,7 +352,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getHttpResponseCode</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.153">getHttpResponseCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/Redirect.html#line.152">getHttpResponseCode</a>()</pre>
 <div class="block">Returns the response code passed in through the constructor.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/ResponseHandler.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/ResponseHandler.html b/content/site/apidocs/org/apache/juneau/rest/ResponseHandler.html
index 2e975cd..e2f6f25 100644
--- a/content/site/apidocs/org/apache/juneau/rest/ResponseHandler.html
+++ b/content/site/apidocs/org/apache/juneau/rest/ResponseHandler.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/rest/Redirect.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/rest/ResponseHandler.html" target="_top">Frames</a></li>
@@ -104,7 +104,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public interface <a href="../../../../src-html/org/apache/juneau/rest/ResponseHandler.html#line.78">ResponseHandler</a></pre>
+<pre>public interface <a href="../../../../src-html/org/apache/juneau/rest/ResponseHandler.html#line.80">ResponseHandler</a></pre>
 <div class="block">Defines the interface for handlers that convert POJOs to appropriate HTTP responses.
  <p>
  The <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> API uses the concept of registered response handlers for
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
  Response handlers can be associated with <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlets</code></a> through the following ways:
  <ul class='spaced-list'>
    <li>Through the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#responseHandlers--"><code>@RestResource.responseHandlers</code></a> annotation.
-   <li>By overriding <a href="../../../../org/apache/juneau/rest/RestServlet.html#createResponseHandlers-org.apache.juneau.ObjectMap-"><code>RestServlet.createResponseHandlers(ObjectMap)</code></a> and augmenting or creating your
+   <li>By calling the <a href="../../../../org/apache/juneau/rest/RestConfig.html#addResponseHandlers-java.lang.Class...-"><code>RestConfig.addResponseHandlers(Class...)</code></a> and augmenting or creating your
       own list of handlers.
  </ul>
  <p>
@@ -124,6 +124,8 @@ var activeTableTab = "activeTableTab";
    <li><a href="../../../../org/apache/juneau/rest/response/ReaderHandler.html" title="class in org.apache.juneau.rest.response"><code>ReaderHandler</code></a> - Pipes the output of <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> to the response writer (<a href="../../../../org/apache/juneau/rest/RestResponse.html#getWriter--"><code>RestResponse.getWriter()</code></a>).
    <li><a href="../../../../org/apache/juneau/rest/response/InputStreamHandler.html" title="class in org.apache.juneau.rest.response"><code>InputStreamHandler</code></a> - Pipes the output of <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> to the response output stream (<a href="../../../../org/apache/juneau/rest/RestResponse.html#getOutputStream--"><code>RestResponse.getOutputStream()</code></a>).
    <li><a href="../../../../org/apache/juneau/rest/response/RedirectHandler.html" title="class in org.apache.juneau.rest.response"><code>RedirectHandler</code></a> - Handles <a href="../../../../org/apache/juneau/rest/Redirect.html" title="class in org.apache.juneau.rest"><code>Redirect</code></a> objects.
+   <li><a href="../../../../org/apache/juneau/rest/response/WritableHandler.html" title="class in org.apache.juneau.rest.response"><code>WritableHandler</code></a> - Handles <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> objects.
+   <li><a href="../../../../org/apache/juneau/rest/response/StreamableHandler.html" title="class in org.apache.juneau.rest.response"><code>StreamableHandler</code></a> - Handles <a href="../../../../org/apache/juneau/Streamable.html" title="interface in org.apache.juneau"><code>Streamable</code></a> objects.
  </ul>
  <p>
  Response handlers can be used to process POJOs that cannot normally be handled through Juneau serializers, or
@@ -205,7 +207,7 @@ var activeTableTab = "activeTableTab";
 <ul class="blockListLast">
 <li class="blockList">
 <h4>handle</h4>
-<pre>boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/ResponseHandler.html#line.91">handle</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+<pre>boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/ResponseHandler.html#line.93">handle</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
                <a href="../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output)
         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -253,7 +255,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/rest/Redirect.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/rest/ResponseHandler.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/RestConverter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestConverter.html b/content/site/apidocs/org/apache/juneau/rest/RestConverter.html
index 67f9293..6b6a552 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestConverter.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestConverter.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -237,7 +237,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/RestException.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestException.html b/content/site/apidocs/org/apache/juneau/rest/RestException.html
index 75b3ae7..e11d2e8 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestException.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestException.html
@@ -341,10 +341,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/RuntimeExcep
 <pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.123">getOccurrence</a>()</pre>
 <div class="block">Returns the number of times this exception occurred on this servlet.
  <p>
- This only gets set if <a href="../../../../org/apache/juneau/rest/RestServletContext.html#REST_useStackTraceHashes"><code>RestServletContext.REST_useStackTraceHashes</code></a> is enabled on the servlet.</div>
+ This only gets set if <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_useStackTraceHashes"><code>RestContext.REST_useStackTraceHashes</code></a> is enabled on the servlet.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The occurrence number if <a href="../../../../org/apache/juneau/rest/RestServletContext.html#REST_useStackTraceHashes"><code>RestServletContext.REST_useStackTraceHashes</code></a> is enabled, or <code>0</code> otherwise.</dd>
+<dd>The occurrence number if <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_useStackTraceHashes"><code>RestContext.REST_useStackTraceHashes</code></a> is enabled, or <code>0</code> otherwise.</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/RestGuard.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestGuard.html b/content/site/apidocs/org/apache/juneau/rest/RestGuard.html
index c75a48d..e6bf4d1 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestGuard.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestGuard.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/rest/RestGuard.html" target="_top">Frames</a></li>
@@ -314,7 +314,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/rest/RestGuard.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/RestMatcher.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestMatcher.html b/content/site/apidocs/org/apache/juneau/rest/RestMatcher.html
index fa7cf30..cc23f37 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestMatcher.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestMatcher.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestLogger.Normal.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html" title="class in org.apache.juneau.rest.matchers">MultipartFormDataMatcher</a>, <a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest">RestMatcherReflecting</a>, <a href="../../../../org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" title="class in org.apache.juneau.rest.matchers">UrlEncodedFormMatcher</a></dd>
+<dd><a href="../../../../org/apache/juneau/rest/ClientVersionMatcher.html" title="class in org.apache.juneau.rest">ClientVersionMatcher</a>, <a href="../../../../org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html" title="class in org.apache.juneau.rest.matchers">MultipartFormDataMatcher</a>, <a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest">RestMatcherReflecting</a>, <a href="../../../../org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" title="class in org.apache.juneau.rest.matchers">UrlEncodedFormMatcher</a></dd>
 </dl>
 <hr>
 <br>
@@ -296,7 +296,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestLogger.Normal.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/rest/RestMatcherReflecting.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestMatcherReflecting.html b/content/site/apidocs/org/apache/juneau/rest/RestMatcherReflecting.html
index 198c5fe..e4c9549 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestMatcherReflecting.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestMatcherReflecting.html
@@ -105,15 +105,11 @@
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/ClientVersionMatcher.html" title="class in org.apache.juneau.rest">ClientVersionMatcher</a></dd>
-</dl>
 <hr>
 <br>
 <pre>public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestMatcherReflecting.html#line.24">RestMatcherReflecting</a>
 extends <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest">RestMatcher</a></pre>
-<div class="block">Subclass of <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><code>RestMatcher</code></a> that gives access to the servlet and Java method it's applied to.
+<div class="block">Subclass of <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><code>RestMatcher</code></a> that gives access to the servlet/resource and Java method it's applied to.
  <p>
  Essentially the same as <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest"><code>RestMatcher</code></a> except has a constructor where the
    Java method is passed in so that you can access annotations defined on it to tailor
@@ -138,7 +134,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="cla
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html#RestMatcherReflecting-org.apache.juneau.rest.RestServlet-java.lang.reflect.Method-">RestMatcherReflecting</a></span>(<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a>&nbsp;servlet,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestMatcherReflecting.html#RestMatcherReflecting-java.lang.Object-java.lang.reflect.Method-">RestMatcherReflecting</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;resource,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;javaMethod)</code>
 <div class="block">Constructor.</div>
 </td>
@@ -180,18 +176,18 @@ extends <a href="../../../../org/apache/juneau/rest/RestMatcher.html" title="cla
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RestMatcherReflecting-org.apache.juneau.rest.RestServlet-java.lang.reflect.Method-">
+<a name="RestMatcherReflecting-java.lang.Object-java.lang.reflect.Method-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RestMatcherReflecting</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestMatcherReflecting.html#line.32">RestMatcherReflecting</a>(<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a>&nbsp;servlet,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestMatcherReflecting.html#line.32">RestMatcherReflecting</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;resource,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;javaMethod)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>servlet</code> - The REST servlet.</dd>
+<dd><code>resource</code> - The REST servlet.</dd>
 <dd><code>javaMethod</code> - The Java method that this rest matcher is defined on.</dd>
 </dl>
 </li>