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 2019/03/11 00:38:24 UTC

[juneau-website] branch asf-site updated: Javadocs.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/juneau-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new a07eb61  Javadocs.
a07eb61 is described below

commit a07eb61f299c4f793e9ab501ccec073583c766d3
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Mar 10 20:37:56 2019 -0400

    Javadocs.
---
 content/site/apidocs-8.0.1/allclasses-frame.html   |   31 +-
 content/site/apidocs-8.0.1/allclasses-noframe.html |   31 +-
 content/site/apidocs-8.0.1/constant-values.html    |   20 +-
 content/site/apidocs-8.0.1/index-all.html          | 1198 ++-
 .../apache/juneau/FormattedRuntimeException.html   |    2 +-
 .../rest/petstore/rest/AddOrderMenuItem.html       |   45 +-
 .../rest/petstore/rest/AddPetMenuItem.html         |   30 +-
 .../rest/petstore/rest/UploadPhotoMenuItem.html    |   30 +-
 .../org/apache/juneau/http/HttpMethodName.html     |   30 +-
 .../apache/juneau/internal/DelegateBeanMap.html    |   14 +-
 .../org/apache/juneau/internal/DelegateMap.html    |   27 +-
 .../org/apache/juneau/internal/ObjectUtils.html    |   55 +-
 .../org/apache/juneau/internal/SimpleMap.html      |    4 +-
 .../apache/juneau/internal/StateMachineState.html  |  557 ++
 .../juneau/internal/StringBuilderWriter.html       |    4 +-
 .../org/apache/juneau/internal/StringUtils.html    |  313 +-
 .../org/apache/juneau/internal/package-frame.html  |    1 +
 .../apache/juneau/internal/package-summary.html    |    8 +-
 .../org/apache/juneau/internal/package-tree.html   |    1 +
 .../org/apache/juneau/jena/RdfCommon.html          |   16 +-
 .../org/apache/juneau/jena/RdfParserBuilder.html   |    2 +-
 .../org/apache/juneau/jena/RdfParserSession.html   |   20 +-
 .../apache/juneau/jena/RdfSerializerBuilder.html   |    2 +-
 .../apache/juneau/jena/RdfSerializerSession.html   |   28 +-
 .../org/apache/juneau/marshall/CharMarshall.html   |    2 +-
 .../org/apache/juneau/marshall/Html.html           |    2 +-
 .../org/apache/juneau/marshall/Jso.html            |    2 +-
 .../org/apache/juneau/marshall/Json.html           |    2 +-
 .../org/apache/juneau/marshall/Marshall.html       |   64 +-
 .../org/apache/juneau/marshall/MsgPack.html        |    2 +-
 .../org/apache/juneau/marshall/N3.html             |    2 +-
 .../org/apache/juneau/marshall/NTriple.html        |    2 +-
 .../org/apache/juneau/marshall/OpenApi.html        |    2 +-
 .../org/apache/juneau/marshall/PlainText.html      |    2 +-
 .../org/apache/juneau/marshall/RdfXml.html         |    2 +-
 .../org/apache/juneau/marshall/RdfXmlAbbrev.html   |    2 +-
 .../org/apache/juneau/marshall/SimpleJson.html     |    2 +-
 .../org/apache/juneau/marshall/StreamMarshall.html |    2 +-
 .../org/apache/juneau/marshall/Turtle.html         |    2 +-
 .../org/apache/juneau/marshall/Uon.html            |    2 +-
 .../org/apache/juneau/marshall/UrlEncoding.html    |    2 +-
 .../org/apache/juneau/marshall/Xml.html            |    2 +-
 .../microservice/jetty/JettyMicroservice.html      |   46 +-
 .../apache/juneau/plaintext/package-summary.html   |    4 +-
 .../org/apache/juneau/plaintext/package-tree.html  |    4 +-
 .../org/apache/juneau/pojotools/Equality.html      |  377 +
 .../Matcher.html}                                  |  101 +-
 .../MatcherFactory.html}                           |  126 +-
 .../NumberMatcherFactory.html}                     |  178 +-
 .../apache/juneau/pojotools/PatternException.html  |  289 +
 .../PojoPaginator.html}                            |  111 +-
 .../WidgetVar.html => pojotools/PojoSearcher.html} |  184 +-
 .../PojoSorter.html}                               |  110 +-
 .../PojoTool.html}                                 |   73 +-
 .../PojoViewer.html}                               |  111 +-
 .../SearchArgs.html}                               |  147 +-
 .../SortArgs.html}                                 |  130 +-
 .../StringMatcherFactory.html}                     |  178 +-
 .../TimeMatcherFactory.html}                       |  219 +-
 .../ViewArgs.html}                                 |  120 +-
 .../org/apache/juneau/pojotools/package-frame.html |   43 +
 .../apache/juneau/pojotools/package-summary.html   |  260 +
 .../org/apache/juneau/pojotools/package-tree.html  |  183 +
 .../org/apache/juneau/remote/package-summary.html  |    4 +-
 .../org/apache/juneau/remote/package-tree.html     |    4 +-
 .../apache/juneau/rest/BasicRestCallHandler.html   |   11 +-
 .../apache/juneau/rest/BasicRestInfoProvider.html  |   16 +-
 .../apache/juneau/rest/RestCallHandler.Null.html   |    2 +-
 .../org/apache/juneau/rest/RestCallHandler.html    |    9 +-
 .../apache/juneau/rest/RestContext.StaticFile.html |    4 +-
 .../org/apache/juneau/rest/RestContext.html        |  218 +-
 .../org/apache/juneau/rest/RestJavaMethod.html     |   16 +-
 .../org/apache/juneau/rest/RestRequest.html        |  140 +-
 .../org/apache/juneau/rest/annotation/HtmlDoc.html |    6 +-
 .../org/apache/juneau/rest/client/RestClient.html  |  211 +-
 .../juneau/rest/client/RestClientBuilder.html      |  898 +-
 .../juneau/rest/client/mock/package-frame.html     |   21 -
 .../juneau/rest/client/mock/package-summary.html   |  158 -
 .../juneau/rest/client/mock/package-tree.html      |  137 -
 .../apache/juneau/rest/client/package-summary.html |    4 +-
 .../apache/juneau/rest/client/package-tree.html    |    4 +-
 .../juneau/rest/client/remote/package-summary.html |    4 +-
 .../juneau/rest/client/remote/package-tree.html    |    4 +-
 .../juneau/rest/matchers/package-summary.html      |    4 +-
 .../apache/juneau/rest/matchers/package-tree.html  |    4 +-
 .../org/apache/juneau/rest/mock/MockRest.html      |  509 --
 .../org/apache/juneau/rest/mock/package-frame.html |   23 -
 .../mock => mock2}/MockHttpClientConnection.html   |   96 +-
 .../MockHttpClientConnectionManager.html           |   80 +-
 .../rest/{mock => mock2}/MockHttpSession.html      |   98 +-
 .../juneau/rest/mock2/MockRemoteResource.html      |  882 ++
 .../apache/juneau/rest/mock2/MockRest.Builder.html |  631 ++
 .../org/apache/juneau/rest/mock2/MockRest.html     |  868 ++
 .../apache/juneau/rest/mock2/MockRestClient.html   |  816 ++
 .../rest/{mock => mock2}/MockServletRequest.html   | 1180 +--
 .../rest/{mock => mock2}/MockServletResponse.html  |  242 +-
 .../apache/juneau/rest/mock2/package-frame.html    |   28 +
 .../rest/{mock => mock2}/package-summary.html      |   52 +-
 .../juneau/rest/{mock => mock2}/package-tree.html  |   35 +-
 .../apache/juneau/rest/remote/package-summary.html |    4 +-
 .../apache/juneau/rest/remote/package-tree.html    |    4 +-
 .../org/apache/juneau/rest/util/RestUtils.html     |   89 +-
 .../org/apache/juneau/rest/vars/RequestVar.html    |   30 +-
 .../org/apache/juneau/rest/vars/WidgetVar.html     |    6 +-
 .../juneau/rest/widget/ContentTypeMenuItem.html    |   30 +-
 .../apache/juneau/rest/widget/MenuItemWidget.html  |   83 +-
 .../apache/juneau/rest/widget/PoweredByApache.html |   13 +-
 .../apache/juneau/rest/widget/PoweredByJuneau.html |   13 +-
 .../apache/juneau/rest/widget/QueryMenuItem.html   |   41 +-
 .../apache/juneau/rest/widget/ThemeMenuItem.html   |   30 +-
 .../org/apache/juneau/rest/widget/Widget.html      |   64 +-
 .../org/apache/juneau/utils/ASet.html              |    9 +-
 .../apache/juneau/utils/MockHttpConnection.html    |   13 +-
 .../org/apache/juneau/utils/MockHttpRequest.html   |    2 +-
 .../org/apache/juneau/utils/MockHttpResponse.html  |    2 +-
 content/site/apidocs-8.0.1/overview-frame.html     |    4 +-
 content/site/apidocs-8.0.1/overview-summary.html   | 1007 +-
 content/site/apidocs-8.0.1/overview-tree.html      |   43 +-
 content/site/apidocs-8.0.1/package-list            |    4 +-
 content/site/apidocs-8.0.1/resources/docs.txt      |    7 +-
 .../apidocs-8.0.1/resources/fragments/toc.html     |    7 +-
 content/site/apidocs-8.0.1/serialized-form.html    |  159 +-
 .../rest/petstore/rest/AddOrderMenuItem.html       |    6 +-
 .../rest/petstore/rest/AddPetMenuItem.html         |    4 +-
 .../rest/petstore/rest/UploadPhotoMenuItem.html    |    4 +-
 .../org/apache/juneau/http/HttpMethodName.html     |   13 +-
 .../apache/juneau/internal/DelegateBeanMap.html    |  126 +-
 .../org/apache/juneau/internal/DelegateMap.html    |   77 +-
 .../org/apache/juneau/internal/ObjectUtils.html    |   30 +-
 .../StateMachineState.html}                        |   27 +-
 .../org/apache/juneau/internal/StringUtils.html    | 3652 ++++----
 .../src-html/org/apache/juneau/jena/RdfCommon.html |    2 +-
 .../org/apache/juneau/jena/RdfParserBuilder.html   |    2 +-
 .../org/apache/juneau/jena/RdfParserSession.html   |  967 +-
 .../apache/juneau/jena/RdfSerializerBuilder.html   |    2 +-
 .../apache/juneau/jena/RdfSerializerSession.html   | 1005 +-
 .../org/apache/juneau/marshall/Marshall.html       |  394 +-
 .../microservice/jetty/JettyMicroservice.html      |  929 +-
 .../Equality.html}                                 |   27 +-
 .../Matcher.html}                                  |   38 +-
 .../MatcherFactory.html}                           |   45 +-
 .../juneau/pojotools/NumberMatcherFactory.html     |  363 +
 .../PatternException.html}                         |   35 +-
 .../org/apache/juneau/pojotools/PojoPaginator.html |  143 +
 .../org/apache/juneau/pojotools/PojoSearcher.html  |  257 +
 .../org/apache/juneau/pojotools/PojoSorter.html    |  182 +
 .../PojoTool.html}                                 |   33 +-
 .../org/apache/juneau/pojotools/PojoViewer.html    |  152 +
 .../org/apache/juneau/pojotools/SearchArgs.html    |  149 +
 .../org/apache/juneau/pojotools/SortArgs.html      |  152 +
 .../juneau/pojotools/StringMatcherFactory.html     |  217 +
 .../juneau/pojotools/TimeMatcherFactory.html       |  532 ++
 .../org/apache/juneau/pojotools/ViewArgs.html      |  132 +
 .../apache/juneau/rest/BasicRestCallHandler.html   |    9 +-
 .../apache/juneau/rest/BasicRestInfoProvider.html  |  795 +-
 .../apache/juneau/rest/RestCallHandler.Null.html   |    9 +-
 .../org/apache/juneau/rest/RestCallHandler.html    |    9 +-
 .../apache/juneau/rest/RestContext.StaticFile.html | 9609 ++++++++++----------
 .../org/apache/juneau/rest/RestContext.html        | 9609 ++++++++++----------
 .../org/apache/juneau/rest/RestJavaMethod.html     | 1001 +-
 .../org/apache/juneau/rest/RestRequest.html        | 3217 +++----
 .../org/apache/juneau/rest/annotation/HtmlDoc.html |    6 +-
 .../org/apache/juneau/rest/client/RestClient.html  | 2643 +++---
 .../juneau/rest/client/RestClientBuilder.html      | 5560 +++++------
 .../org/apache/juneau/rest/mock/MockRest.html      |  263 -
 .../juneau/rest/mock/MockServletRequest.html       | 1438 ---
 .../mock => mock2}/MockHttpClientConnection.html   |    8 +-
 .../MockHttpClientConnectionManager.html           |    4 +-
 .../rest/{mock => mock2}/MockHttpSession.html      |    4 +-
 .../juneau/rest/mock2/MockRemoteResource.html      |  477 +
 .../apache/juneau/rest/mock2/MockRest.Builder.html |  657 ++
 .../org/apache/juneau/rest/mock2/MockRest.html     |  657 ++
 .../apache/juneau/rest/mock2/MockRestClient.html   |  345 +
 .../juneau/rest/mock2/MockServletRequest.html      | 1514 +++
 .../rest/{mock => mock2}/MockServletResponse.html  |    6 +-
 .../org/apache/juneau/rest/util/RestUtils.html     |  818 +-
 .../org/apache/juneau/rest/vars/RequestVar.html    |  127 +-
 .../org/apache/juneau/rest/vars/WidgetVar.html     |   80 +-
 .../juneau/rest/widget/ContentTypeMenuItem.html    |    4 +-
 .../apache/juneau/rest/widget/MenuItemWidget.html  |  240 +-
 .../apache/juneau/rest/widget/PoweredByApache.html |    2 +-
 .../apache/juneau/rest/widget/PoweredByJuneau.html |    2 +-
 .../apache/juneau/rest/widget/QueryMenuItem.html   |    8 +-
 .../apache/juneau/rest/widget/ThemeMenuItem.html   |    4 +-
 .../org/apache/juneau/rest/widget/Widget.html      |  372 +-
 .../src-html/org/apache/juneau/utils/ASet.html     |   79 +-
 .../apache/juneau/utils/MockHttpConnection.html    |   43 +-
 .../org/apache/juneau/utils/PojoQuery.html         |    2 +-
 188 files changed, 36932 insertions(+), 27030 deletions(-)

diff --git a/content/site/apidocs-8.0.1/allclasses-frame.html b/content/site/apidocs-8.0.1/allclasses-frame.html
index c610bc3..9dd5943 100644
--- a/content/site/apidocs-8.0.1/allclasses-frame.html
+++ b/content/site/apidocs-8.0.1/allclasses-frame.html
@@ -313,6 +313,7 @@
 <li><a href="org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Entry</a></li>
 <li><a href="org/apache/juneau/transforms/EnumerationSwap.html" title="class in org.apache.juneau.transforms" target="classFrame">EnumerationSwap</a></li>
 <li><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">EnvVariablesVar</a></li>
+<li><a href="org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools" target="classFrame">Equality</a></li>
 <li><a href="org/apache/juneau/http/ETag.html" title="class in org.apache.juneau.http" target="classFrame">ETag</a></li>
 <li><a href="org/apache/juneau/annotation/Example.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Example</a></li>
 <li><a href="org/apache/juneau/microservice/console/ExitCommand.html" title="class in org.apache.juneau.microservice.console" target="classFrame">ExitCommand</a></li>
@@ -578,6 +579,8 @@
 <li><a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl" target="classFrame">MapVar</a></li>
 <li><a href="org/apache/juneau/dto/html5/Mark.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Mark</a></li>
 <li><a href="org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall" target="classFrame">Marshall</a></li>
+<li><a href="org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools" target="classFrame">Matcher</a></li>
+<li><a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools" target="classFrame">MatcherFactory</a></li>
 <li><a href="org/apache/juneau/http/MaxForwards.html" title="class in org.apache.juneau.http" target="classFrame">MaxForwards</a></li>
 <li><a href="org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http" target="classFrame">MediaType</a></li>
 <li><a href="org/apache/juneau/http/MediaTypeRange.html" title="class in org.apache.juneau.http" target="classFrame">MediaTypeRange</a></li>
@@ -594,15 +597,18 @@
 <li><a href="org/apache/juneau/microservice/MicroserviceBuilder.html" title="class in org.apache.juneau.microservice" target="classFrame">MicroserviceBuilder</a></li>
 <li><a href="org/apache/juneau/microservice/MicroserviceListener.html" title="interface in org.apache.juneau.microservice" target="classFrame"><span class="interfaceName">MicroserviceListener</span></a></li>
 <li><a href="org/apache/juneau/rest/exception/MisdirectedRequest.html" title="class in org.apache.juneau.rest.exception" target="classFrame">MisdirectedRequest</a></li>
-<li><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock" target="classFrame">MockHttpClientConnection</a></li>
-<li><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock" target="classFrame">MockHttpClientConnectionManager</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockHttpClientConnection</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockHttpClientConnectionManager</a></li>
 <li><a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils" target="classFrame"><span class="interfaceName">MockHttpConnection</span></a></li>
 <li><a href="org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils" target="classFrame"><span class="interfaceName">MockHttpRequest</span></a></li>
 <li><a href="org/apache/juneau/utils/MockHttpResponse.html" title="interface in org.apache.juneau.utils" target="classFrame"><span class="interfaceName">MockHttpResponse</span></a></li>
-<li><a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock" target="classFrame">MockHttpSession</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock" target="classFrame">MockRest</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock" target="classFrame">MockServletRequest</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock" target="classFrame">MockServletResponse</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockHttpSession</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockRemoteResource</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockRest</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockRest.Builder</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockRestClient</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockServletRequest</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2" target="classFrame">MockServletResponse</a></li>
 <li><a href="org/apache/juneau/rest/response/MovedPermanently.html" title="class in org.apache.juneau.rest.response" target="classFrame">MovedPermanently</a></li>
 <li><a href="org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall" target="classFrame">MsgPack</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack" target="classFrame">MsgPackInputStream</a></li>
@@ -649,6 +655,7 @@
 <li><a href="org/apache/juneau/jena/NTripleParser.html" title="class in org.apache.juneau.jena" target="classFrame">NTripleParser</a></li>
 <li><a href="org/apache/juneau/jena/NTripleSerializer.html" title="class in org.apache.juneau.jena" target="classFrame">NTripleSerializer</a></li>
 <li><a href="org/apache/juneau/annotation/Null.html" title="class in org.apache.juneau.annotation" target="classFrame">Null</a></li>
+<li><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools" target="classFrame">NumberMatcherFactory</a></li>
 <li><a href="org/apache/juneau/examples/core/oapi/OapiExample.html" title="class in org.apache.juneau.examples.core.oapi" target="classFrame">OapiExample</a></li>
 <li><a href="org/apache/juneau/dto/html5/Object2.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Object2</a></li>
 <li><a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau" target="classFrame">ObjectList</a></li>
@@ -696,6 +703,7 @@
 <li><a href="org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser" target="classFrame">ParserSessionArgs</a></li>
 <li><a href="org/apache/juneau/rest/response/PartialContent.html" title="class in org.apache.juneau.rest.response" target="classFrame">PartialContent</a></li>
 <li><a href="org/apache/juneau/http/annotation/Path.html" title="annotation in org.apache.juneau.http.annotation" target="classFrame">Path</a></li>
+<li><a href="org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools" target="classFrame">PatternException</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternExtractVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">PatternExtractVar</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternMatchVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">PatternMatchVar</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternReplaceVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">PatternReplaceVar</a></li>
@@ -726,10 +734,15 @@
 <li><a href="org/apache/juneau/examples/core/pojo/PojoComplex.html" title="class in org.apache.juneau.examples.core.pojo" target="classFrame">PojoComplex</a></li>
 <li><a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils" target="classFrame">PojoIntrospector</a></li>
 <li><a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils" target="classFrame">PojoMerge</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools" target="classFrame">PojoPaginator</a></li>
 <li><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils" target="classFrame">PojoQuery</a></li>
 <li><a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRest</a></li>
 <li><a href="org/apache/juneau/utils/PojoRestException.html" title="class in org.apache.juneau.utils" target="classFrame">PojoRestException</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools" target="classFrame">PojoSearcher</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools" target="classFrame">PojoSorter</a></li>
 <li><a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform" target="classFrame">PojoSwap</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools" target="classFrame"><span class="interfaceName">PojoTool</span></a></li>
+<li><a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools" target="classFrame">PojoViewer</a></li>
 <li><a href="org/apache/juneau/parser/Position.html" title="class in org.apache.juneau.parser" target="classFrame">Position</a></li>
 <li><a href="org/apache/juneau/parser/Positionable.html" title="interface in org.apache.juneau.parser" target="classFrame"><span class="interfaceName">Positionable</span></a></li>
 <li><a href="org/apache/juneau/rest/widget/PoweredByApache.html" title="class in org.apache.juneau.rest.widget" target="classFrame">PoweredByApache</a></li>
@@ -903,6 +916,7 @@
 <li><a href="org/apache/juneau/jsonschema/SchemaUtils.html" title="class in org.apache.juneau.jsonschema" target="classFrame">SchemaUtils</a></li>
 <li><a href="org/apache/juneau/httppart/SchemaValidationException.html" title="class in org.apache.juneau.httppart" target="classFrame">SchemaValidationException</a></li>
 <li><a href="org/apache/juneau/dto/html5/Script.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Script</a></li>
+<li><a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools" target="classFrame">SearchArgs</a></li>
 <li><a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils" target="classFrame">SearchArgs</a></li>
 <li><a href="org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils" target="classFrame">SearchArgs.Builder</a></li>
 <li><a href="org/apache/juneau/dto/html5/Section.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Section</a></li>
@@ -948,6 +962,7 @@
 <li><a href="org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap" target="classFrame">SoapXmlSerializer</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html" title="class in org.apache.juneau.soap" target="classFrame">SoapXmlSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializerSession.html" title="class in org.apache.juneau.soap" target="classFrame">SoapXmlSerializerSession</a></li>
+<li><a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools" target="classFrame">SortArgs</a></li>
 <li><a href="org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom" target="classFrame">Source</a></li>
 <li><a href="org/apache/juneau/dto/html5/Source.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Source</a></li>
 <li><a href="org/apache/juneau/dto/html5/Span.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Span</a></li>
@@ -956,6 +971,7 @@
 <li><a href="org/apache/juneau/rest/springboot/SpringRestResourceResolver.html" title="class in org.apache.juneau.rest.springboot" target="classFrame">SpringRestResourceResolver</a></li>
 <li><a href="org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.html" title="class in org.apache.juneau.examples.rest.petstore.rest" target="classFrame">SqlQueryResource</a></li>
 <li><a href="org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.PostInput.html" title="class in org.apache.juneau.examples.rest.petstore.rest" target="classFrame">SqlQueryResource.PostInput</a></li>
+<li><a href="org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal" target="classFrame">StateMachineState</a></li>
 <li><a href="org/apache/juneau/rest/StaticFileMapping.html" title="class in org.apache.juneau.rest" target="classFrame">StaticFileMapping</a></li>
 <li><a href="org/apache/juneau/Streamable.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">Streamable</span></a></li>
 <li><a href="org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl" target="classFrame">StreamedVar</a></li>
@@ -965,6 +981,7 @@
 <li><a href="org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal" target="classFrame">StringBuilderWriter</a></li>
 <li><a href="org/apache/juneau/transforms/StringFormatSwap.html" title="class in org.apache.juneau.transforms" target="classFrame">StringFormatSwap</a></li>
 <li><a href="org/apache/juneau/utils/StringInputStream.html" title="class in org.apache.juneau.utils" target="classFrame">StringInputStream</a></li>
+<li><a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools" target="classFrame">StringMatcherFactory</a></li>
 <li><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils" target="classFrame">StringMessage</a></li>
 <li><a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils" target="classFrame">StringObject</a></li>
 <li><a href="org/apache/juneau/http/StringRange.html" title="class in org.apache.juneau.http" target="classFrame">StringRange</a></li>
@@ -1008,6 +1025,7 @@
 <li><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget" target="classFrame">ThemeMenuItem</a></li>
 <li><a href="org/apache/juneau/internal/ThrowableUtils.html" title="class in org.apache.juneau.internal" target="classFrame">ThrowableUtils</a></li>
 <li><a href="org/apache/juneau/dto/html5/Time.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Time</a></li>
+<li><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools" target="classFrame">TimeMatcherFactory</a></li>
 <li><a href="org/apache/juneau/dto/html5/Title.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Title</a></li>
 <li><a href="org/apache/juneau/rest/widget/Tooltip.html" title="class in org.apache.juneau.rest.widget" target="classFrame">Tooltip</a></li>
 <li><a href="org/apache/juneau/rest/exception/TooManyRequests.html" title="class in org.apache.juneau.rest.exception" target="classFrame">TooManyRequests</a></li>
@@ -1091,6 +1109,7 @@
 <li><a href="org/apache/juneau/internal/VersionRange.html" title="class in org.apache.juneau.internal" target="classFrame">VersionRange</a></li>
 <li><a href="org/apache/juneau/http/Via.html" title="class in org.apache.juneau.http" target="classFrame">Via</a></li>
 <li><a href="org/apache/juneau/dto/html5/Video.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Video</a></li>
+<li><a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools" target="classFrame">ViewArgs</a></li>
 <li><a href="org/apache/juneau/Visibility.html" title="enum in org.apache.juneau" target="classFrame">Visibility</a></li>
 <li><a href="org/apache/juneau/http/Warning.html" title="class in org.apache.juneau.http" target="classFrame">Warning</a></li>
 <li><a href="org/apache/juneau/config/store/WatcherSensitivity.html" title="enum in org.apache.juneau.config.store" target="classFrame">WatcherSensitivity</a></li>
diff --git a/content/site/apidocs-8.0.1/allclasses-noframe.html b/content/site/apidocs-8.0.1/allclasses-noframe.html
index acf0b1d..1bd1d5d 100644
--- a/content/site/apidocs-8.0.1/allclasses-noframe.html
+++ b/content/site/apidocs-8.0.1/allclasses-noframe.html
@@ -313,6 +313,7 @@
 <li><a href="org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a></li>
 <li><a href="org/apache/juneau/transforms/EnumerationSwap.html" title="class in org.apache.juneau.transforms">EnumerationSwap</a></li>
 <li><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></li>
+<li><a href="org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a></li>
 <li><a href="org/apache/juneau/http/ETag.html" title="class in org.apache.juneau.http">ETag</a></li>
 <li><a href="org/apache/juneau/annotation/Example.html" title="annotation in org.apache.juneau.annotation">Example</a></li>
 <li><a href="org/apache/juneau/microservice/console/ExitCommand.html" title="class in org.apache.juneau.microservice.console">ExitCommand</a></li>
@@ -578,6 +579,8 @@
 <li><a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl">MapVar</a></li>
 <li><a href="org/apache/juneau/dto/html5/Mark.html" title="class in org.apache.juneau.dto.html5">Mark</a></li>
 <li><a href="org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></li>
+<li><a href="org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a></li>
+<li><a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></li>
 <li><a href="org/apache/juneau/http/MaxForwards.html" title="class in org.apache.juneau.http">MaxForwards</a></li>
 <li><a href="org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a></li>
 <li><a href="org/apache/juneau/http/MediaTypeRange.html" title="class in org.apache.juneau.http">MediaTypeRange</a></li>
@@ -594,15 +597,18 @@
 <li><a href="org/apache/juneau/microservice/MicroserviceBuilder.html" title="class in org.apache.juneau.microservice">MicroserviceBuilder</a></li>
 <li><a href="org/apache/juneau/microservice/MicroserviceListener.html" title="interface in org.apache.juneau.microservice"><span class="interfaceName">MicroserviceListener</span></a></li>
 <li><a href="org/apache/juneau/rest/exception/MisdirectedRequest.html" title="class in org.apache.juneau.rest.exception">MisdirectedRequest</a></li>
-<li><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></li>
-<li><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></li>
 <li><a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils"><span class="interfaceName">MockHttpConnection</span></a></li>
 <li><a href="org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils"><span class="interfaceName">MockHttpRequest</span></a></li>
 <li><a href="org/apache/juneau/utils/MockHttpResponse.html" title="interface in org.apache.juneau.utils"><span class="interfaceName">MockHttpResponse</span></a></li>
-<li><a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></li>
-<li><a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></li>
+<li><a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></li>
 <li><a href="org/apache/juneau/rest/response/MovedPermanently.html" title="class in org.apache.juneau.rest.response">MovedPermanently</a></li>
 <li><a href="org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack">MsgPackInputStream</a></li>
@@ -649,6 +655,7 @@
 <li><a href="org/apache/juneau/jena/NTripleParser.html" title="class in org.apache.juneau.jena">NTripleParser</a></li>
 <li><a href="org/apache/juneau/jena/NTripleSerializer.html" title="class in org.apache.juneau.jena">NTripleSerializer</a></li>
 <li><a href="org/apache/juneau/annotation/Null.html" title="class in org.apache.juneau.annotation">Null</a></li>
+<li><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></li>
 <li><a href="org/apache/juneau/examples/core/oapi/OapiExample.html" title="class in org.apache.juneau.examples.core.oapi">OapiExample</a></li>
 <li><a href="org/apache/juneau/dto/html5/Object2.html" title="class in org.apache.juneau.dto.html5">Object2</a></li>
 <li><a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a></li>
@@ -696,6 +703,7 @@
 <li><a href="org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser">ParserSessionArgs</a></li>
 <li><a href="org/apache/juneau/rest/response/PartialContent.html" title="class in org.apache.juneau.rest.response">PartialContent</a></li>
 <li><a href="org/apache/juneau/http/annotation/Path.html" title="annotation in org.apache.juneau.http.annotation">Path</a></li>
+<li><a href="org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools">PatternException</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternExtractVar.html" title="class in org.apache.juneau.svl.vars">PatternExtractVar</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternMatchVar.html" title="class in org.apache.juneau.svl.vars">PatternMatchVar</a></li>
 <li><a href="org/apache/juneau/svl/vars/PatternReplaceVar.html" title="class in org.apache.juneau.svl.vars">PatternReplaceVar</a></li>
@@ -726,10 +734,15 @@
 <li><a href="org/apache/juneau/examples/core/pojo/PojoComplex.html" title="class in org.apache.juneau.examples.core.pojo">PojoComplex</a></li>
 <li><a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils">PojoIntrospector</a></li>
 <li><a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools">PojoPaginator</a></li>
 <li><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils">PojoQuery</a></li>
 <li><a href="org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils">PojoRest</a></li>
 <li><a href="org/apache/juneau/utils/PojoRestException.html" title="class in org.apache.juneau.utils">PojoRestException</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools">PojoSorter</a></li>
 <li><a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a></li>
+<li><a href="org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="interfaceName">PojoTool</span></a></li>
+<li><a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools">PojoViewer</a></li>
 <li><a href="org/apache/juneau/parser/Position.html" title="class in org.apache.juneau.parser">Position</a></li>
 <li><a href="org/apache/juneau/parser/Positionable.html" title="interface in org.apache.juneau.parser"><span class="interfaceName">Positionable</span></a></li>
 <li><a href="org/apache/juneau/rest/widget/PoweredByApache.html" title="class in org.apache.juneau.rest.widget">PoweredByApache</a></li>
@@ -903,6 +916,7 @@
 <li><a href="org/apache/juneau/jsonschema/SchemaUtils.html" title="class in org.apache.juneau.jsonschema">SchemaUtils</a></li>
 <li><a href="org/apache/juneau/httppart/SchemaValidationException.html" title="class in org.apache.juneau.httppart">SchemaValidationException</a></li>
 <li><a href="org/apache/juneau/dto/html5/Script.html" title="class in org.apache.juneau.dto.html5">Script</a></li>
+<li><a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></li>
 <li><a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></li>
 <li><a href="org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils">SearchArgs.Builder</a></li>
 <li><a href="org/apache/juneau/dto/html5/Section.html" title="class in org.apache.juneau.dto.html5">Section</a></li>
@@ -948,6 +962,7 @@
 <li><a href="org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap">SoapXmlSerializer</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializerBuilder.html" title="class in org.apache.juneau.soap">SoapXmlSerializerBuilder</a></li>
 <li><a href="org/apache/juneau/soap/SoapXmlSerializerSession.html" title="class in org.apache.juneau.soap">SoapXmlSerializerSession</a></li>
+<li><a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a></li>
 <li><a href="org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a></li>
 <li><a href="org/apache/juneau/dto/html5/Source.html" title="class in org.apache.juneau.dto.html5">Source</a></li>
 <li><a href="org/apache/juneau/dto/html5/Span.html" title="class in org.apache.juneau.dto.html5">Span</a></li>
@@ -956,6 +971,7 @@
 <li><a href="org/apache/juneau/rest/springboot/SpringRestResourceResolver.html" title="class in org.apache.juneau.rest.springboot">SpringRestResourceResolver</a></li>
 <li><a href="org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.html" title="class in org.apache.juneau.examples.rest.petstore.rest">SqlQueryResource</a></li>
 <li><a href="org/apache/juneau/examples/rest/petstore/rest/SqlQueryResource.PostInput.html" title="class in org.apache.juneau.examples.rest.petstore.rest">SqlQueryResource.PostInput</a></li>
+<li><a href="org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a></li>
 <li><a href="org/apache/juneau/rest/StaticFileMapping.html" title="class in org.apache.juneau.rest">StaticFileMapping</a></li>
 <li><a href="org/apache/juneau/Streamable.html" title="interface in org.apache.juneau"><span class="interfaceName">Streamable</span></a></li>
 <li><a href="org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl">StreamedVar</a></li>
@@ -965,6 +981,7 @@
 <li><a href="org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal">StringBuilderWriter</a></li>
 <li><a href="org/apache/juneau/transforms/StringFormatSwap.html" title="class in org.apache.juneau.transforms">StringFormatSwap</a></li>
 <li><a href="org/apache/juneau/utils/StringInputStream.html" title="class in org.apache.juneau.utils">StringInputStream</a></li>
+<li><a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a></li>
 <li><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></li>
 <li><a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></li>
 <li><a href="org/apache/juneau/http/StringRange.html" title="class in org.apache.juneau.http">StringRange</a></li>
@@ -1008,6 +1025,7 @@
 <li><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget">ThemeMenuItem</a></li>
 <li><a href="org/apache/juneau/internal/ThrowableUtils.html" title="class in org.apache.juneau.internal">ThrowableUtils</a></li>
 <li><a href="org/apache/juneau/dto/html5/Time.html" title="class in org.apache.juneau.dto.html5">Time</a></li>
+<li><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></li>
 <li><a href="org/apache/juneau/dto/html5/Title.html" title="class in org.apache.juneau.dto.html5">Title</a></li>
 <li><a href="org/apache/juneau/rest/widget/Tooltip.html" title="class in org.apache.juneau.rest.widget">Tooltip</a></li>
 <li><a href="org/apache/juneau/rest/exception/TooManyRequests.html" title="class in org.apache.juneau.rest.exception">TooManyRequests</a></li>
@@ -1091,6 +1109,7 @@
 <li><a href="org/apache/juneau/internal/VersionRange.html" title="class in org.apache.juneau.internal">VersionRange</a></li>
 <li><a href="org/apache/juneau/http/Via.html" title="class in org.apache.juneau.http">Via</a></li>
 <li><a href="org/apache/juneau/dto/html5/Video.html" title="class in org.apache.juneau.dto.html5">Video</a></li>
+<li><a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a></li>
 <li><a href="org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a></li>
 <li><a href="org/apache/juneau/http/Warning.html" title="class in org.apache.juneau.http">Warning</a></li>
 <li><a href="org/apache/juneau/config/store/WatcherSensitivity.html" title="enum in org.apache.juneau.config.store">WatcherSensitivity</a></li>
diff --git a/content/site/apidocs-8.0.1/constant-values.html b/content/site/apidocs-8.0.1/constant-values.html
index a34b412..a52f58f 100644
--- a/content/site/apidocs-8.0.1/constant-values.html
+++ b/content/site/apidocs-8.0.1/constant-values.html
@@ -863,27 +863,34 @@
 <td class="colLast"><code>"OTHER"</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.http.HttpMethodName.PATCH">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/http/HttpMethodName.html#PATCH">PATCH</a></code></td>
+<td class="colLast"><code>"PATCH"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.http.HttpMethodName.POST">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/juneau/http/HttpMethodName.html#POST">POST</a></code></td>
 <td class="colLast"><code>"POST"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.http.HttpMethodName.PUT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/juneau/http/HttpMethodName.html#PUT">PUT</a></code></td>
 <td class="colLast"><code>"PUT"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.apache.juneau.http.HttpMethodName.RRPC">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/juneau/http/HttpMethodName.html#RRPC">RRPC</a></code></td>
 <td class="colLast"><code>"RRPC"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.juneau.http.HttpMethodName.TRACE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -4124,6 +4131,13 @@
 <td><code><a href="org/apache/juneau/rest/vars/RequestVar.html#SESSION_req">SESSION_req</a></code></td>
 <td class="colLast"><code>"req"</code></td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.rest.vars.RequestVar.SESSION_res">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/rest/vars/RequestVar.html#SESSION_res">SESSION_res</a></code></td>
+<td class="colLast"><code>"res"</code></td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/content/site/apidocs-8.0.1/index-all.html b/content/site/apidocs-8.0.1/index-all.html
index c604b8b..ee1f392 100644
--- a/content/site/apidocs-8.0.1/index-all.html
+++ b/content/site/apidocs-8.0.1/index-all.html
@@ -131,7 +131,19 @@
 <dd>
 <div class="block">Sets the value for the <code>Accept</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#accept-java.lang.Object-">accept(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#accept-java.lang.String-">accept(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Adds an <code>Accept</code> header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#accept-java.lang.String-">accept(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Specifies the <code>Accept</code> header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#accept-java.lang.String-">accept(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Specifies the <code>Accept</code> header value.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#accept-java.lang.Object-">accept(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Accept</code> header value on the request.</div>
 </dd>
@@ -152,7 +164,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Accept-Charset</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#acceptCharset-java.lang.Object-">acceptCharset(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#acceptCharset-java.lang.Object-">acceptCharset(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Accept-Charset</code> header value on the request.</div>
 </dd>
@@ -180,7 +192,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Accept-Encoding</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#acceptEncoding-java.lang.Object-">acceptEncoding(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#acceptEncoding-java.lang.Object-">acceptEncoding(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Accept-Encoding</code> header value on the request.</div>
 </dd>
@@ -196,7 +208,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Accept-Language</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#acceptLanguage-java.lang.Object-">acceptLanguage(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#acceptLanguage-java.lang.Object-">acceptLanguage(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Accept-Language</code> header value on the request.</div>
 </dd>
@@ -481,9 +493,9 @@
 <dd>
 <div class="block">Adds one or more values to the <property>consumes</property> property.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#addCookie-javax.servlet.http.Cookie-">addCookie(Cookie)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#addCookie-javax.servlet.http.Cookie-">addCookie(Cookie)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#addDateHeader-java.lang.String-long-">addDateHeader(String, long)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#addDateHeader-java.lang.String-long-">addDateHeader(String, long)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestFormData.html#addDefault-java.util.Map-">addDefault(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a></dt>
 <dd>
@@ -577,7 +589,7 @@
 <dd>
 <div class="block">Adds the specified file to the specified output stream.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#addHeader-java.lang.String-java.lang.String-">addHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#addHeader-java.lang.String-java.lang.String-">addHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/ResponseInfo.html#addHeaders-java.util.Map-">addHeaders(Map&lt;String, HeaderInfo&gt;)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a></dt>
 <dd>
@@ -595,7 +607,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#addInterceptorLast-org.apache.http.HttpRequestInterceptor-">addInterceptorLast(HttpRequestInterceptor)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#addIntHeader-java.lang.String-int-">addIntHeader(String, int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#addIntHeader-java.lang.String-int-">addIntHeader(String, int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#addItems-org.apache.juneau.dto.jsonschema.JsonSchema...-">addItems(JsonSchema...)</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -1468,6 +1480,10 @@
 <dd>
 <div class="block">Registers the specified parsers with this group.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SearchArgs.html#append-java.lang.String-java.lang.String-">append(String, String)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></dt>
+<dd>
+<div class="block">Appends the specified search argument.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/NameValuePairs.html#append-org.apache.http.NameValuePair-">append(NameValuePair)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client">NameValuePairs</a></dt>
 <dd>
 <div class="block">Appends the specified pair to the end of this list.</div>
@@ -2077,23 +2093,23 @@
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang"><code>IllegalArgumentException</code></a> if the parameters on the method are not in the specified list provided.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertBody-java.lang.String-">assertBody(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertBody-java.lang.String-">assertBody(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response body does not contain the expected text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertBodyContains-java.lang.String...-">assertBodyContains(String...)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertBodyContains-java.lang.String...-">assertBodyContains(String...)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response body does not contain all of the expected substrings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertBodyMatches-java.lang.String-">assertBodyMatches(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertBodyMatches-java.lang.String-">assertBodyMatches(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response body does not match the specified pattern.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertBodyMatchesRE-java.lang.String-">assertBodyMatchesRE(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertBodyMatchesRE-java.lang.String-">assertBodyMatchesRE(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response body does not match the specified regular expression.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertCharset-java.lang.String-">assertCharset(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertCharset-java.lang.String-">assertCharset(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response does not contain the expected character encoding.</div>
 </dd>
@@ -2105,11 +2121,11 @@
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang"><code>IllegalArgumentException</code></a> if the specified field is <code>&lt;=0</code>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertHeader-java.lang.String-java.lang.String-">assertHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertHeader-java.lang.String-java.lang.String-">assertHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response does not contain the expected header value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertHeaderContains-java.lang.String-java.lang.String...-">assertHeaderContains(String, String...)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertHeaderContains-java.lang.String-java.lang.String...-">assertHeaderContains(String, String...)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response header does not contain all of the expected substrings.</div>
 </dd>
@@ -2121,7 +2137,7 @@
 <dd>
 <div class="block">Throws an exception if the specified thread ID is not the same as the current thread.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#assertStatus-int-">assertStatus(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#assertStatus-int-">assertStatus(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Throws an <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/AssertionError.html?is-external=true" title="class or interface in java.lang"><code>AssertionError</code></a> if the response status does not match the expected status.</div>
 </dd>
@@ -2295,7 +2311,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/dto/swagger/Xml.html#setAttribute-java.lang.Boolean-"><code>Xml.setAttribute(Boolean)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#attribute-java.lang.String-java.lang.Object-">attribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#attribute-java.lang.String-java.lang.Object-">attribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -2330,7 +2346,7 @@
 <dd>
 <div class="block">Creates an <a href="org/apache/juneau/dto/html5/Audio.html" title="class in org.apache.juneau.dto.html5"><code>Audio</code></a> element with the specified <a href="org/apache/juneau/dto/html5/Audio.html#src-java.lang.Object-"><code>Audio.src(Object)</code></a> attribute.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#authenticate-javax.servlet.http.HttpServletResponse-">authenticate(HttpServletResponse)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#authenticate-javax.servlet.http.HttpServletResponse-">authenticate(HttpServletResponse)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/UriContext.html#authority">authority</a></span> - Variable in class org.apache.juneau.<a href="org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></dt>
 <dd>&nbsp;</dd>
@@ -2346,7 +2362,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Authorization</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#authorization-java.lang.Object-">authorization(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#authorization-java.lang.Object-">authorization(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Authorization</code> header value on the request.</div>
 </dd>
@@ -2364,7 +2380,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/Source.html#authors-org.apache.juneau.dto.atom.Person...-">authors(Person...)</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#authType-java.lang.String-">authType(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#authType-java.lang.String-">authType(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -5157,7 +5173,7 @@
 <dd>
 <div class="block">Sets the input for this REST call.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#body-java.lang.Object-">body(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#body-java.lang.Object-">body(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -5324,6 +5340,48 @@
 <dd>
 <div class="block">Create a new <a href="org/apache/juneau/rest/helper/ResolvingReaderResource.html" title="class in org.apache.juneau.rest.helper"><code>ResolvingReaderResource</code></a> using values in this builder.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#build--">build()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Constructs a remote proxy interface based on the settings of this builder.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#build-java.lang.Class-java.lang.Object-">build(Class&lt;T&gt;, Object)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for getting a remote resource interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#build-java.lang.Class-java.lang.Object-org.apache.juneau.marshall.Marshall-">build(Class&lt;T&gt;, Object, Marshall)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for getting a remote resource interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#build-java.lang.Class-java.lang.Object-org.apache.juneau.serializer.Serializer-org.apache.juneau.parser.Parser-">build(Class&lt;T&gt;, Object, Serializer, Parser)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for getting a remote resource interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#build-java.lang.Object-">build(Object)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Convenience method for creating a MockRest over the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#build-java.lang.Object-org.apache.juneau.marshall.Marshall-">build(Object, Marshall)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Convenience method for creating a MockRest over the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#build-java.lang.Object-org.apache.juneau.serializer.Serializer-org.apache.juneau.parser.Parser-">build(Object, Serializer, Parser)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Convenience method for creating a MockRest over the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#build--">build()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Create a new <a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2"><code>MockRest</code></a> object based on the settings on this builder.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#build-java.lang.Object-org.apache.juneau.marshall.Marshall-">build(Object, Marshall)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for creating a Restclient over the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#build-java.lang.Object-org.apache.juneau.serializer.Serializer-org.apache.juneau.parser.Parser-">build(Object, Serializer, Parser)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for creating a Restclient over the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#build--">build()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContextBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/OutputStreamSerializerBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/OutputStreamSerializerBuilder.html" title="class in org.apache.juneau.serializer">OutputStreamSerializerBuilder</a></dt>
@@ -5588,7 +5646,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Cache-Control</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#cacheControl-java.lang.Object-">cacheControl(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#cacheControl-java.lang.Object-">cacheControl(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Cache-Control</code> header value on the request.</div>
 </dd>
@@ -5768,6 +5826,16 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified value should not be serialized.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/MatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch(ClassMeta&lt;?&gt;)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if this matcher can be used on the specified object.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch(ClassMeta&lt;?&gt;)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/StringMatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch(ClassMeta&lt;?&gt;)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch(ClassMeta&lt;?&gt;)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanPropertyMeta.html#canRead--">canRead()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a></dt>
 <dd>
 <div class="block">Returns <jk>true</jk> if this property can be read.</div>
@@ -5889,9 +5957,9 @@
 <dd>
 <div class="block"><a class='doclink' href='https://www.w3.org/TR/html5/forms.html#attr-keygen-challenge'>challenge</a> attribute.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#changeSessionId--">changeSessionId()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#changeSessionId--">changeSessionId()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#characterEncoding-java.lang.String-">characterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#characterEncoding-java.lang.String-">characterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -6536,7 +6604,7 @@
 <dd>
 <div class="block">Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#clientVersion-java.lang.Object-">clientVersion(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#clientVersion-java.lang.Object-">clientVersion(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>X-Client-Version</code> header value on the request.</div>
 </dd>
@@ -6590,8 +6658,6 @@
 <dd>
 <div class="block">No-op.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#close--">close()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#close--">close()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Cleans up this HTTP call.</div>
@@ -6600,6 +6666,8 @@
 <dd>
 <div class="block">Calls <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true#close--" title="class or interface in java.io"><code>Closeable.close()</code></a> on the underlying <code>CloseableHttpClient</code>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#close--">close()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/BoundedServletInputStream.html#close--">close()</a></span> - Method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/BoundedServletInputStream.html" title="class in org.apache.juneau.rest.util">BoundedServletInputStream</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/FinishableServletOutputStream.html#close--">close()</a></span> - Method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/FinishableServletOutputStream.html" title="class in org.apache.juneau.rest.util">FinishableServletOutputStream</a></dt>
@@ -6616,9 +6684,9 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#close--">close()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#closeExpiredConnections--">closeExpiredConnections()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#closeExpiredConnections--">closeExpiredConnections()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#closeIdleConnections-long-java.util.concurrent.TimeUnit-">closeIdleConnections(long, TimeUnit)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#closeIdleConnections-long-java.util.concurrent.TimeUnit-">closeIdleConnections(long, TimeUnit)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/IOPipe.html#closeOut--">closeOut()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/IOPipe.html" title="class in org.apache.juneau.utils">IOPipe</a></dt>
 <dd>
@@ -7047,6 +7115,10 @@
 <dd>
 <div class="block">Bean constructor.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ObjectUtils.html#compare-java.lang.Object-java.lang.Object-">compare(Object, Object)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ObjectUtils.html" title="class in org.apache.juneau.internal">ObjectUtils</a></dt>
+<dd>
+<div class="block">Compares two objects for equality.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#compare-java.lang.String-java.lang.String-">compare(String, String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
 <dd>
 <div class="block">Compares two strings, but gracefully handles <jk>nulls</jk>.</div>
@@ -7351,12 +7423,12 @@
 <dd>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.9'>CONNECT</a></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#connect-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-int-org.apache.http.protocol.HttpContext-">connect(HttpClientConnection, HttpRoute, int, HttpContext)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client. [...]
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#connect--">connect()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Connects to the REST resource.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#connect-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-int-org.apache.http.protocol.HttpContext-">connect(HttpClientConnection, HttpRoute, int, HttpContext)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConn [...]
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/http/Connection.html" title="class in org.apache.juneau.http"><span class="typeNameLink">Connection</span></a> - Class in <a href="org/apache/juneau/http/package-summary.html">org.apache.juneau.http</a></dt>
 <dd>
 <div class="block">Represents a parsed <l>Connection</l> HTTP request header.</div>
@@ -7369,7 +7441,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Connection</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#connection-java.lang.Object-">connection(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#connection-java.lang.Object-">connection(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Connection</code> header value on the request.</div>
 </dd>
@@ -7554,7 +7626,7 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the request contains any of the specified query parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#containsHeader-java.lang.String-">containsHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#containsHeader-java.lang.String-">containsHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/HeaderStringArray.html#containsIC-java.lang.String-">containsIC(String)</a></span> - Method in class org.apache.juneau.http.<a href="org/apache/juneau/http/HeaderStringArray.html" title="class in org.apache.juneau.http">HeaderStringArray</a></dt>
 <dd>
@@ -7620,7 +7692,7 @@
 <dd>
 <div class="block">Represents a parsed <l>Content-Encoding</l> HTTP response header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#contentEncoding-java.lang.Object-">contentEncoding(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#contentEncoding-java.lang.Object-">contentEncoding(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Content-Encoding</code> header value on the request.</div>
 </dd>
@@ -7652,7 +7724,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Content-Length</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#contentLength-java.lang.Object-">contentLength(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#contentLength-java.lang.Object-">contentLength(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Content-Length</code> header value on the request.</div>
 </dd>
@@ -7690,7 +7762,19 @@
 <dd>
 <div class="block">Sets the value for the <code>Content-Type</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#contentType-java.lang.Object-">contentType(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#contentType-java.lang.String-">contentType(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Adds a <code>Content-Type</code> header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#contentType-java.lang.String-">contentType(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Specifies the  <code>Content-Type</code> header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#contentType-java.lang.String-">contentType(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Specifies the <code>Content-Type</code> header value.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#contentType-java.lang.Object-">contentType(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Content-Type</code> header value on the request.</div>
 </dd>
@@ -7737,7 +7821,7 @@
 <dd>
 <div class="block">Associates multiple context objects with this resolver.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#contextPath-java.lang.String-">contextPath(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#contextPath-java.lang.String-">contextPath(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -7839,7 +7923,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/BeanSession.html#convertToType-java.lang.Object-java.lang.Class-"><code>BeanSession.convertToType(Object, Class)</code></a>, but allows for complex data types consisting of collections or maps.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#cookies-javax.servlet.http.Cookie:A-">cookies(Cookie[])</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#cookies-javax.servlet.http.Cookie:A-">cookies(Cookie[])</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -8235,6 +8319,16 @@
 <dd>
 <div class="block">Instantiates a new clean-slate <a href="org/apache/juneau/plaintext/PlainTextSerializerBuilder.html" title="class in org.apache.juneau.plaintext"><code>PlainTextSerializerBuilder</code></a> object.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/MatcherFactory.html#create-java.lang.String-">create(String)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></dt>
+<dd>
+<div class="block">Instantiates a matcher for the specified pattern.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html#create-java.lang.String-">create(String)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/StringMatcherFactory.html#create-java.lang.String-">create(String)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#create-java.lang.String-">create(String)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyStore.html#create--">create()</a></span> - Static method in class org.apache.juneau.<a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a></dt>
 <dd>
 <div class="block">Creates a new empty builder for a property store.</div>
@@ -8255,27 +8349,47 @@
 <dd>
 <div class="block">Creates a new instance of a <a href="org/apache/juneau/rest/helper/ResolvingReaderResource.Builder.html" title="class in org.apache.juneau.rest.helper"><code>ResolvingReaderResource.Builder</code></a> for this class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>
 <div class="block">Creates a new HTTP session.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#create-java.lang.Class-">create(Class&lt;?&gt;)</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#create-java.lang.Class-java.lang.Object-">create(Class&lt;T&gt;, Object)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Create a new builder using the specified remote resource interface and REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#create-java.lang.Class-java.lang.Object-org.apache.juneau.marshall.Marshall-">create(Class&lt;T&gt;, Object, Marshall)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Create a new builder using the specified remote resource interface and REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#create-java.lang.Class-java.lang.Object-org.apache.juneau.serializer.Serializer-org.apache.juneau.parser.Parser-">create(Class&lt;T&gt;, Object, Serializer, Parser)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Create a new builder using the specified remote resource interface and REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#create-java.lang.Object-">create(Object)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Creates a new builder with the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#create-java.lang.Object-">create(Object)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
 <dd>
-<div class="block">Create a new mock REST interface</div>
+<div class="block">Creates a new RestClient builder configured with the specified REST implementation bean or bean class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#create-java.lang.Class-boolean-">create(Class&lt;?&gt;, boolean)</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#create-java.lang.Object-org.apache.juneau.marshall.Marshall-">create(Object, Marshall)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
 <dd>
-<div class="block">Create a new mock REST interface</div>
+<div class="block">Creates a new RestClient builder configured with the specified REST implementation bean or bean class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#create-java.lang.Object-org.apache.juneau.serializer.Serializer-org.apache.juneau.parser.Parser-">create(Object, Serializer, Parser)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Creates a new RestClient builder configured with the specified REST implementation bean or bean class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Creates a new servlet request.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#create-java.lang.String-java.lang.String-java.lang.Object...-">create(String, String, Object...)</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#create-java.lang.String-java.lang.String-java.lang.Object...-">create(String, String, Object...)</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Creates a new servlet request with the specified method name and request path.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#create--">create()</a></span> - Static method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Creates a new servlet response.</div>
 </dd>
@@ -8899,7 +9013,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Date</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#date-java.lang.Object-">date(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#date-java.lang.Object-">date(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Date</code> header value on the request.</div>
 </dd>
@@ -9179,7 +9293,29 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#debug-boolean-">debug(boolean)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Enable debug mode.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Enable debug mode.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#debug">debug</a></span> - Variable in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Debug mode enabled.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Enable debug mode.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#debug--">debug()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Enabled debug mode on this request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#debug-boolean-">debug(boolean)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Enabled debug mode on this request.</div>
 </dd>
@@ -9519,6 +9655,22 @@
 <dd>
 <div class="block">Default serializer, all default settings.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></dt>
+<dd>
+<div class="block">Default reusable matcher.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSearcher.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></dt>
+<dd>
+<div class="block">Default reusable searcher.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/StringMatcherFactory.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a></dt>
+<dd>
+<div class="block">Default reusable matcher.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>
+<div class="block">Default reusable matcher.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyStore.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.<a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a></dt>
 <dd>
 <div class="block">A default empty property store.</div>
@@ -9856,11 +10008,11 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><a href="org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">DelegateMap</span></a>&lt;<a href="org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt; - Class in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></dt>
+<dt><a href="org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">DelegateMap</span></a>&lt;<a href="org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&gt; - Class in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.inter [...]
 <dd>
 <div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> where entries in the map can be removed without affecting the underlying map.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/DelegateMap.html#DelegateMap-org.apache.juneau.ClassMeta-">DelegateMap(ClassMeta&lt;T&gt;)</a></span> - Constructor for class org.apache.juneau.internal.<a href="org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/DelegateMap.html#DelegateMap-T-org.apache.juneau.BeanSession-">DelegateMap(T, BeanSession)</a></span> - Constructor for class org.apache.juneau.internal.<a href="org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -9880,7 +10032,7 @@
 <dd>
 <div class="block">Trims off the specified number of last characters in the marking buffer.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#delete-java.lang.String-">delete(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#delete-java.lang.String-">delete(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Perform a DELETE request.</div>
 </dd>
@@ -10189,7 +10341,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/dto/swagger/SchemaInfo.html#setDiscriminator-java.lang.String-"><code>SchemaInfo.setDiscriminator(String)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#dispatcherType-javax.servlet.DispatcherType-">dispatcherType(DispatcherType)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#dispatcherType-javax.servlet.DispatcherType-">dispatcherType(DispatcherType)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -10310,6 +10462,14 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParserSession.html#doParseIntoMap-org.apache.juneau.parser.ParserPipe-java.util.Map-java.lang.reflect.Type-java.lang.reflect.Type-">doParseIntoMap(ParserPipe, Map&lt;K, V&gt;, Type, Type)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClient.html#doPatch-java.lang.Object-java.lang.Object-">doPatch(Object, Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a></dt>
+<dd>
+<div class="block">Perform a <code>PATCH</code> request against the specified URL.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClient.html#doPatch-java.lang.Object-">doPatch(Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a></dt>
+<dd>
+<div class="block">Same as <a href="org/apache/juneau/rest/client/RestClient.html#doPatch-java.lang.Object-java.lang.Object-"><code>RestClient.doPatch(Object, Object)</code></a> but don't specify the input yet.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClient.html#doPost-java.lang.Object-java.lang.Object-">doPost(Object, Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a></dt>
 <dd>
 <div class="block">Perform a <code>POST</code> request against the specified URL.</div>
@@ -10634,9 +10794,9 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/encoders/Encoder.html#Encoder--">Encoder()</a></span> - Constructor for class org.apache.juneau.encoders.<a href="org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#encodeRedirectURL-java.lang.String-">encodeRedirectURL(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#encodeRedirectURL-java.lang.String-">encodeRedirectURL(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#encodeRedirectUrl-java.lang.String-">encodeRedirectUrl(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#encodeRedirectUrl-java.lang.String-">encodeRedirectUrl(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/encoders/EncoderGroup.html" title="class in org.apache.juneau.encoders"><span class="typeNameLink">EncoderGroup</span></a> - Class in <a href="org/apache/juneau/encoders/package-summary.html">org.apache.juneau.encoders</a></dt>
 <dd>
@@ -10674,9 +10834,9 @@
 <dd>
 <div class="block">Encodes the specified element text and sends the results to the specified writer.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#encodeURL-java.lang.String-">encodeURL(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#encodeURL-java.lang.String-">encodeURL(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#encodeUrl-java.lang.String-">encodeUrl(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#encodeUrl-java.lang.String-">encodeUrl(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.Encoding.html#Encoding-org.apache.juneau.PropertyStore-">Encoding(PropertyStore)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.Encoding.html" title="class in org.apache.juneau.uon">UonSerializer.Encoding</a></dt>
 <dd>
@@ -10792,6 +10952,10 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified value is the same using <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#equalsIgnoreCase-java.lang.String-" title="class or interface in java.lang"><code>String.equalsIgnoreCase(String)</code></a>.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools"><span class="typeNameLink">Equality</span></a> - Enum in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
 <dd>
 <div class="block">Checks to see if the specified class type is the same as this one.</div>
@@ -11140,7 +11304,7 @@
 <dd>
 <div class="block">Execute the specified request.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#execute--">execute()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#execute--">execute()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Executes this request and returns the response object.</div>
 </dd>
@@ -11220,7 +11384,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Expect</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#expect-java.lang.Object-">expect(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#expect-java.lang.Object-">expect(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Expect</code> header value on the request.</div>
 </dd>
@@ -11844,6 +12008,10 @@
 <dd>
 <div class="block">Returns the first non-zero value in the list of ints.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/RestUtils.html#fixMethodPath-java.lang.String-">fixMethodPath(String)</a></span> - Static method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/RestUtils.html" title="class in org.apache.juneau.rest.util">RestUtils</a></dt>
+<dd>
+<div class="block">Normalizes the <a href="org/apache/juneau/rest/annotation/RestMethod.html#path--"><code>RestMethod.path()</code></a> value.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/annotation/FormatType.html#FLOAT">FLOAT</a></span> - Static variable in class org.apache.juneau.http.annotation.<a href="org/apache/juneau/http/annotation/FormatType.html" title="class in org.apache.juneau.http.annotation">FormatType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/SecurityScheme.html#flow-java.lang.Object-">flow(Object)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/SecurityScheme.html" title="class in org.apache.juneau.dto.swagger">SecurityScheme</a></dt>
@@ -11880,13 +12048,13 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/TeeWriter.html#flush--">flush()</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/TeeWriter.html" title="class in org.apache.juneau.internal">TeeWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#flush--">flush()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#flush--">flush()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/FinishableServletOutputStream.html#flush--">flush()</a></span> - Method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/FinishableServletOutputStream.html" title="class in org.apache.juneau.rest.util">FinishableServletOutputStream</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerWriter.html#flush--">flush()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#flushBuffer--">flushBuffer()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#flushBuffer--">flushBuffer()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#flushBuffer--">flushBuffer()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>&nbsp;</dd>
@@ -12156,7 +12324,7 @@
 <dd>
 <div class="block">Adds form data pairs to this request to perform a URL-encoded form post.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#formData-java.lang.String-java.lang.Object-">formData(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#formData-java.lang.String-java.lang.Object-">formData(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Adds a form data entry to this request.</div>
 </dd>
@@ -12455,7 +12623,7 @@
 <dd>
 <div class="block">Sets the value for the <code>From</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#from-java.lang.Object-">from(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#from-java.lang.Object-">from(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>From</code> header value on the request.</div>
 </dd>
@@ -12639,7 +12807,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/ObjectMap.html#get-java.lang.String-java.lang.Class-"><code>ObjectMap.get(String,Class)</code></a>, but allows for complex data types consisting of collections or maps.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Perform a GET request.</div>
 </dd>
@@ -12863,7 +13031,7 @@
 <dd>
 <div class="block">Bean property getter:  <property>additionalProperties</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-">getAfterShowScript(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getAfterShowScript(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">Optional Javascript to execute immediately after a menu item is shown.</div>
 </dd>
@@ -13074,7 +13242,7 @@
 <dd>
 <div class="block">Configuration property:  Aside section contents.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getAsyncContext--">getAsyncContext()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getAsyncContext--">getAsyncContext()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectList.html#getAt-java.lang.String-java.lang.Class-">getAt(String, Class&lt;T&gt;)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a></dt>
 <dd>
@@ -13108,9 +13276,9 @@
 <dd>
 <div class="block">Bean property getter:  <property>attribute</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getAttribute-java.lang.String-">getAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getAttribute-java.lang.String-">getAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getAttribute-java.lang.String-">getAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getAttribute-java.lang.String-">getAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getAttribute-java.lang.String-java.lang.Object-">getAttribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>
@@ -13122,9 +13290,9 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#getAttributeName-int-">getAttributeName(int)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getAttributeNames--">getAttributeNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getAttributeNames--">getAttributeNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getAttributeNames--">getAttributeNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getAttributeNames--">getAttributeNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#getAttributeNamespace-int-">getAttributeNamespace(int)</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
@@ -13176,7 +13344,7 @@
 <dd>
 <div class="block">Returns the list of authors for this object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getAuthType--">getAuthType()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getAuthType--">getAuthType()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/Common.html#getBase--">getBase()</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a></dt>
 <dd>
@@ -13364,9 +13532,9 @@
 <dd>
 <div class="block">Returns the bean property marked as the URI for the bean (annotated with <a href="org/apache/juneau/jena/annotation/Rdf.html#beanUri--"><code>@Rdf(beanUri)</code></a> as <jk>true</jk>).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">Optional Javascript to execute immediately before a menu item is shown.</div>
 </dd>
@@ -13386,7 +13554,7 @@
 <dd>
 <div class="block">Configuration property:  Binary output format.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getBody--">getBody()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getBody--">getBody()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Returns the body of the request.</div>
 </dd>
@@ -13402,7 +13570,7 @@
 <dd>
 <div class="block">Returns the argument annotated with <a href="org/apache/juneau/http/annotation/Body.html" title="annotation in org.apache.juneau.http.annotation"><code>@Body</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getBodyAsString--">getBodyAsString()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getBodyAsString--">getBodyAsString()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Returns the body of the request as a string.</div>
 </dd>
@@ -13482,7 +13650,7 @@
 <dd>
 <div class="block">Given the specified <js>"Content-Length"</js> header value, return an appropriate buffer size.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getBufferSize--">getBufferSize()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getBufferSize--">getBufferSize()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transform/BuilderSwap.html#getBuilderClass--">getBuilderClass()</a></span> - Method in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/BuilderSwap.html" title="class in org.apache.juneau.transform">BuilderSwap</a></dt>
 <dd>
@@ -13540,9 +13708,9 @@
 <dd>
 <div class="block">Returns the list of categories of this object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getCharacterEncoding--">getCharacterEncoding()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getCharacterEncoding--">getCharacterEncoding()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getCharacterEncoding--">getCharacterEncoding()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getCharacterEncoding--">getCharacterEncoding()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getCharacterEncoding--">getCharacterEncoding()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>
@@ -14037,11 +14205,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/dto/Species.SpeciesRender.html#getContent-org.apache.juneau.serializer.SerializerSession-org.apache.juneau.examples.rest.petstore.dto.Species-">getContent(SerializerSession, Species)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.dto.<a href="org/apache/juneau/examples/rest/petstore/dto/Species.SpeciesRender.html" title="class in org.apache.juneau.examples.rest.petstore.dto">Species. [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddPetMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddPetMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">UploadPhotoMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">UploadPhotoMenuItem</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlRender.html#getContent-org.apache.juneau.serializer.SerializerSession-T-">getContent(SerializerSession, T)</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html">HtmlRender</a></dt>
 <dd>
@@ -14049,15 +14217,15 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestRequestEntity.html#getContent--">getContent()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestRequestEntity.html" title="class in org.apache.juneau.rest.client">RestRequestEntity</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in org.apache.juneau.rest.widget">ContentTypeMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in org.apache.juneau.rest.widget">ContentTypeMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">The content of the popup.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget">ThemeMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget">ThemeMenuItem</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ZipFileList.html#getContentDisposition--">getContentDisposition()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils">ZipFileList</a></dt>
 <dd>
@@ -14071,9 +14239,9 @@
 <dd>
 <div class="block">Returns the value of the <code>Content-Length</code> header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getContentLength--">getContentLength()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getContentLength--">getContentLength()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getContentLength--">getContentLength()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getContentLength--">getContentLength()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Returns the content length.</div>
 </dd>
@@ -14087,7 +14255,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getContentLength--">getContentLength()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getContentLengthLong--">getContentLengthLong()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getContentLengthLong--">getContentLengthLong()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlBeanMeta.html#getContentProperty--">getContentProperty()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlBeanMeta.html" title="class in org.apache.juneau.xml">XmlBeanMeta</a></dt>
 <dd>
@@ -14105,9 +14273,9 @@
 <dd>
 <div class="block">Returns the contents of this stream resource.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getContentType--">getContentType()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getContentType--">getContentType()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getContentType--">getContentType()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getContentType--">getContentType()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getContentType--">getContentType()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
@@ -14137,7 +14305,7 @@
 <dd>
 <div class="block">Returns the context path that this microservice is using.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getContextPath--">getContextPath()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getContextPath--">getContextPath()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getContextPath--">getContextPath()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
@@ -14149,9 +14317,9 @@
 <dd>
 <div class="block">Returns the converters associated with this resource at the class level.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getCookies--">getCookies()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getCookies--">getCookies()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getCreationTime--">getCreationTime()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getCreationTime--">getCreationTime()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/cognos/DataSet.html#getData--">getData()</a></span> - Method in class org.apache.juneau.dto.cognos.<a href="org/apache/juneau/dto/cognos/DataSet.html" title="class in org.apache.juneau.dto.cognos">DataSet</a></dt>
 <dd>
@@ -14165,7 +14333,7 @@
 <dd>
 <div class="block">Returns the <a href="http://docs.oracle.com/javase/8/docs/api/java/text/DateFormat.html?is-external=true" title="class or interface in java.text"><code>DateFormat</code></a> used for matching dates.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getDateHeader-java.lang.String-">getDateHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getDateHeader-java.lang.String-">getDateHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#getDebugOutputLines--">getDebugOutputLines()</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
 <dd>
@@ -14329,7 +14497,7 @@
 <dd>
 <div class="block">Bean property getter:  <property>discriminator</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getDispatcherType--">getDispatcherType()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getDispatcherType--">getDispatcherType()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/config/Config.html#getDouble-java.lang.String-">getDouble(String)</a></span> - Method in class org.apache.juneau.config.<a href="org/apache/juneau/config/Config.html" title="class in org.apache.juneau.config">Config</a></dt>
 <dd>
@@ -14772,9 +14940,9 @@
 <dd>
 <div class="block">Configuration property:  Header section contents.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getHeader-java.lang.String-">getHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getHeader-java.lang.String-">getHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getHeader-java.lang.String-">getHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getHeader-java.lang.String-">getHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getHeader-java.lang.String-">getHeader(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
@@ -14786,9 +14954,9 @@
 <dd>
 <div class="block">Returns metadata about the <ja>@ResponseHeader</ja>-annotated methods.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getHeaderNames--">getHeaderNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getHeaderNames--">getHeaderNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getHeaderNames--">getHeaderNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getHeaderNames--">getHeaderNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/ResponseInfo.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a></dt>
 <dd>
@@ -14802,11 +14970,19 @@
 <dd>
 <div class="block">Get the HTTP response headers.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getHeaders-java.lang.String-">getHeaders(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Returns the headers that were defined in this class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getHeaders-java.lang.String-">getHeaders(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getHeaders-java.lang.String-">getHeaders(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Returns the headers defined on this request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getHeaders-java.lang.String-">getHeaders(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getHeaders--">getHeaders()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>
@@ -14838,17 +15014,17 @@
 <dd>
 <div class="block">Returns the language of the target of this link.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getHtml(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/PoweredByApache.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByApache.html" title="class in org.apache.juneau.rest.widget">PoweredByApache</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/PoweredByApache.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getHtml(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByApache.html" title="class in org.apache.juneau.rest.widget">PoweredByApache</a></dt>
 <dd>
 <div class="block">Returns an Apache image tag hyperlinked to <js>"http://apache.org"</js></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/PoweredByJuneau.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByJuneau.html" title="class in org.apache.juneau.rest.widget">PoweredByJuneau</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/PoweredByJuneau.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getHtml(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByJuneau.html" title="class in org.apache.juneau.rest.widget">PoweredByJuneau</a></dt>
 <dd>
 <div class="block">Returns an Apache Juneau image tag hyperlinked to <js>"http://juneau.apache.org"</js></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getHtml(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Resolves the HTML content for this widget.</div>
 </dd>
@@ -14918,7 +15094,7 @@
 <dd>
 <div class="block">Returns the ID for the specified class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getId--">getId()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getId--">getId()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getIfMatch--">getIfMatch()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
@@ -15053,7 +15229,7 @@
 <div class="block">Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP
  response message body as an input stream.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getInputStream--">getInputStream()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getInputStream--">getInputStream()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestBody.html#getInputStream--">getInputStream()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a></dt>
 <dd>
@@ -15209,7 +15385,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/remote/RrpcServlet.html#getInterfaces--">getInterfaces()</a></span> - Method in class org.apache.juneau.rest.remote.<a href="org/apache/juneau/rest/remote/RrpcServlet.html" title="class in org.apache.juneau.rest.remote">RrpcServlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getIntHeader-java.lang.String-">getIntHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getIntHeader-java.lang.String-">getIntHeader(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html#getInventory--">getInventory()</a></span> - Method in class org.apache.juneau.examples.rest.petstore.<a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html" title="class in org.apache.juneau.examples.rest.petstore">PetStoreService</a></dt>
 <dd>&nbsp;</dd>
@@ -15333,21 +15509,21 @@
 <dd>
 <div class="block">Returns the category label.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddOrderMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddPetMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">AddPetMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">UploadPhotoMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html" title="class in org.apache.juneau.examples.rest.petstore.rest">UploadPhotoMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in org.apache.juneau.rest.widget">ContentTypeMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in org.apache.juneau.rest.widget">ContentTypeMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget">ThemeMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/ThemeMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ThemeMenuItem.html" title="class in org.apache.juneau.rest.widget">ThemeMenuItem</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlSerializer.html#getLabelParameter--">getLabelParameter()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlSerializer.html" title="class in org.apache.juneau.html">HtmlSerializer</a></dt>
 <dd>
@@ -15361,7 +15537,7 @@
 <dd>
 <div class="block">Returns the language of this object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getLastAccessedTime--">getLastAccessedTime()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getLastAccessedTime--">getLastAccessedTime()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanTraverseSession.html#getLastLocation--">getLastLocation()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanTraverseSession.html" title="class in org.apache.juneau">BeanTraverseSession</a></dt>
 <dd>
@@ -15481,7 +15657,7 @@
 <dd>
 <div class="block">Returns the list property with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getLocalAddr--">getLocalAddr()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getLocalAddr--">getLocalAddr()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanContext.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></dt>
 <dd>
@@ -15491,21 +15667,21 @@
 <dd>
 <div class="block">Configuration property:  Locale.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getLocale--">getLocale()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getLocales--">getLocales()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getLocales--">getLocales()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getLocales--">getLocales()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getLocalName--">getLocalName()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getLocalName--">getLocalName()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#getLocalName--">getLocalName()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getLocalPort--">getLocalPort()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getLocalPort--">getLocalPort()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/response/Found.html#getLocation--">getLocation()</a></span> - Method in class org.apache.juneau.rest.response.<a href="org/apache/juneau/rest/response/Found.html" title="class in org.apache.juneau.rest.response">Found</a></dt>
 <dd>&nbsp;</dd>
@@ -15691,7 +15867,7 @@
 <dd>
 <div class="block">Returns the <code>maximum</code> field of this schema.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getMaxInactiveInterval--">getMaxInactiveInterval()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getMaxInactiveInterval--">getMaxInactiveInterval()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/WriterSerializer.html#getMaxIndent--">getMaxIndent()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></dt>
 <dd>
@@ -15831,7 +16007,7 @@
 <dd>
 <div class="block">Finds the message.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getMessage--">getMessage()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getMessage--">getMessage()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>
 <div class="block">Returns the response message.</div>
 </dd>
@@ -15877,7 +16053,7 @@
 <dd>
 <div class="block">Bean property getter:  <property>metadata</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getMethod--">getMethod()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getMethod--">getMethod()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getMethod--">getMethod()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>
@@ -15945,7 +16121,7 @@
 <dd>
 <div class="block">Returns the localized method summary.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#getMetrics--">getMetrics()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#getMetrics--">getMetrics()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#getMinimum--">getMinimum()</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -16461,7 +16637,7 @@
 <dd>
 <div class="block">Retrieves an output stream associated with an ID via <a href="org/apache/juneau/rest/client/RestCall.html#pipeTo-java.lang.String-java.io.OutputStream-boolean-"><code>RestCall.pipeTo(String, OutputStream, boolean)</code></a></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getOutputStream--">getOutputStream()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getOutputStream--">getOutputStream()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#getOutputStream--">getOutputStream()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>&nbsp;</dd>
@@ -16477,15 +16653,15 @@
 <dd>
 <div class="block">Returns the parameter with the specified type and name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getParameter-java.lang.String-">getParameter(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getParameter-java.lang.String-">getParameter(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Swagger.html#getParameterInfo-java.lang.String-java.lang.String-java.lang.String-java.lang.String-">getParameterInfo(String, String, String, String)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></dt>
 <dd>
 <div class="block">Convenience method for calling <code>getPath(path).get(method).getParameter(in,name);</code></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getParameterMap--">getParameterMap()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getParameterMap--">getParameterMap()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getParameterNames--">getParameterNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getParameterNames--">getParameterNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#getParameters--">getParameters()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
 <dd>
@@ -16507,7 +16683,7 @@
 <dd>
 <div class="block">Returns the generic parameter type of the Value type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getParameterValues-java.lang.String-">getParameterValues(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getParameterValues-java.lang.String-">getParameterValues(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.html#getParamFormat--">getParamFormat()</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></dt>
 <dd>
@@ -16549,6 +16725,10 @@
 <dd>
 <div class="block">Returns the <code>parser</code> field of this schema.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/marshall/Marshall.html#getParser--">getParser()</a></span> - Method in class org.apache.juneau.marshall.<a href="org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></dt>
+<dd>
+<div class="block">Returns the parser associated with this marshall.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/parser/ParserGroup.html#getParser-java.lang.String-">getParser(String)</a></span> - Method in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a></dt>
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/parser/ParserGroup.html#getParserMatch-java.lang.String-"><code>ParserGroup.getParserMatch(String)</code></a> but returns just the matched parser.</div>
@@ -16605,7 +16785,7 @@
 <dd>
 <div class="block">Returns the session arguments to pass to parsers.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getPart-java.lang.String-">getPart(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getPart-java.lang.String-">getPart(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.html#getPartName--">getPartName()</a></span> - Method in class org.apache.juneau.httppart.bean.<a href="org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.html" title="class in org.apache.juneau.httppart.bean">RequestBeanPropertyMeta</a></dt>
 <dd>
@@ -16627,7 +16807,7 @@
 <dd>
 <div class="block">Returns the part serializer associated with this request.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getParts--">getParts()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getParts--">getParts()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/bean/ResponseBeanMeta.html#getPartSerializer--">getPartSerializer()</a></span> - Method in class org.apache.juneau.httppart.bean.<a href="org/apache/juneau/httppart/bean/ResponseBeanMeta.html" title="class in org.apache.juneau.httppart.bean">ResponseBeanMeta</a></dt>
 <dd>
@@ -16700,7 +16880,7 @@
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/http/annotation/Path.html" title="annotation in org.apache.juneau.http.annotation"><code>@Path</code></a> annotated arguments on this Java method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getPathInfo--">getPathInfo()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getPathInfo--">getPathInfo()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/RestUtils.html#getPathInfoUndecoded-javax.servlet.http.HttpServletRequest-">getPathInfoUndecoded(HttpServletRequest)</a></span> - Static method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/RestUtils.html" title="class in org.apache.juneau.rest.util">RestUtils</a></dt>
 <dd>
@@ -16718,7 +16898,7 @@
 <dd>
 <div class="block">Bean property getter:  <property>paths</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getPathTranslated--">getPathTranslated()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getPathTranslated--">getPathTranslated()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#getPattern--">getPattern()</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -17079,7 +17259,7 @@
 <dd>
 <div class="block">Returns whether this microservice is using <js>"http"</js> or <js>"https"</js>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getProtocol--">getProtocol()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getProtocol--">getProtocol()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getProxyAuthorization--">getProxyAuthorization()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
@@ -17114,7 +17294,7 @@
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/http/annotation/Query.html" title="annotation in org.apache.juneau.http.annotation"><code>@Query</code></a> annotated arguments on this Java method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getQueryString--">getQueryString()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getQueryString--">getQueryString()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/WriterSerializer.html#getQuoteChar--">getQuoteChar()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a></dt>
 <dd>
@@ -17198,7 +17378,7 @@
 <div class="block">Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP
  response message body as a reader.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getReader--">getReader()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getReader--">getReader()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestBody.html#getReader--">getReader()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a></dt>
 <dd>
@@ -17220,7 +17400,7 @@
 <dd>
 <div class="block">Bean property getter:  <property>readOnly</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRealPath-java.lang.String-">getRealPath(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRealPath-java.lang.String-">getRealPath(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#getRef--">getRef()</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -17254,11 +17434,11 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/RequestPath.html#getRemainder--"><code>RequestPath.getRemainder()</code></a> but doesn't decode characters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRemoteAddr--">getRemoteAddr()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRemoteAddr--">getRemoteAddr()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRemoteHost--">getRemoteHost()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRemoteHost--">getRemoteHost()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRemotePort--">getRemotePort()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRemotePort--">getRemotePort()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClient.html#getRemoteResource-java.lang.Class-">getRemoteResource(Class&lt;T&gt;)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a></dt>
 <dd>
@@ -17272,7 +17452,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/client/RestClient.html#getRemoteResource-java.lang.Class-java.lang.Object-"><code>RestClient.getRemoteResource(Class, Object)</code></a> but allows you to override the serializer and parser used.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRemoteUser--">getRemoteUser()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRemoteUser--">getRemoteUser()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html#getRender--">getRender()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html">HtmlBeanPropertyMeta</a></dt>
 <dd>
@@ -17314,13 +17494,13 @@
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/http/annotation/Request.html" title="annotation in org.apache.juneau.http.annotation"><code>@Request</code></a> annotated arguments on this Java method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRequestDispatcher-java.lang.String-">getRequestDispatcher(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRequestDispatcher-java.lang.String-">getRequestDispatcher(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRequestedSessionId--">getRequestedSessionId()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRequestedSessionId--">getRequestedSessionId()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRequestURI--">getRequestURI()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRequestURI--">getRequestURI()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getRequestURL--">getRequestURL()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getRequestURL--">getRequestURL()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#getRequired--">getRequired()</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -17654,7 +17834,7 @@
 <dd>
 <div class="block">Returns the category scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getScheme--">getScheme()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getScheme--">getScheme()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#getSchemes--">getSchemes()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
 <dd>
@@ -17676,14 +17856,18 @@
 <dd>
 <div class="block">Configuration property:  Javascript code.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getScript(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">Returns the Javascript needed for the show and hide actions of the menu item.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getScript(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Resolves any Javascript that should be added to the <xt>&lt;head&gt;/&lt;script&gt;</xt> element.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SearchArgs.html#getSearch--">getSearch()</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></dt>
+<dd>
+<div class="block">The query search terms.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/SearchArgs.html#getSearch--">getSearch()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></dt>
 <dd>
 <div class="block">The query search terms.</div>
@@ -17745,6 +17929,10 @@
 <dd>
 <div class="block">Returns the <code>serializer</code> field of this schema.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer()</a></span> - Method in class org.apache.juneau.marshall.<a href="org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></dt>
+<dd>
+<div class="block">Returns the serializer associated with this marshall.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/remote/RemoteMethodArg.html#getSerializer-org.apache.juneau.httppart.HttpPartSerializer-">getSerializer(HttpPartSerializer)</a></span> - Method in class org.apache.juneau.rest.client.remote.<a href="org/apache/juneau/rest/client/remote/RemoteMethodArg.html" title="class in org.apache.juneau.rest.client.remote">RemoteMethodArg</a></dt>
 <dd>
 <div class="block">Returns the HTTP part serializer to use for serializing this part.</div>
@@ -17805,9 +17993,9 @@
 <dd>
 <div class="block">Returns the underlying Jetty server.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getServerName--">getServerName()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getServerName--">getServerName()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getServerPort--">getServerPort()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getServerPort--">getServerPort()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/remote/RrpcServlet.html#getServiceMap--">getServiceMap()</a></span> - Method in class org.apache.juneau.rest.remote.<a href="org/apache/juneau/rest/remote/RrpcServlet.html" title="class in org.apache.juneau.rest.remote">RrpcServlet</a></dt>
 <dd>
@@ -17815,9 +18003,9 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getServletContext--">getServletContext()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getServletContext--">getServletContext()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getServletContext--">getServletContext()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getServletContext--">getServletContext()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContextBuilder.html#getServletContext--">getServletContext()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a></dt>
 <dd>&nbsp;</dd>
@@ -17831,25 +18019,25 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContextBuilder.html#getServletName--">getServletName()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getServletPath--">getServletPath()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getServletPath--">getServletPath()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#getServletPath--">getServletPath()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getSession-boolean-">getSession(boolean)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getSession-boolean-">getSession(boolean)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getSession--">getSession()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getSession--">getSession()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getSessionContext--">getSessionContext()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getSessionContext--">getSessionContext()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-boolean-">getSessionObject(Class&lt;T&gt;, String, boolean)</a></span> - Method in class org.apache.juneau.svl.<a href="org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a></dt>
 <dd>
 <div class="block">Returns the session object with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestCallHandler.html#getSessionObjects-org.apache.juneau.rest.RestRequest-">getSessionObjects(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestCallHandler.html" title="class in org.apache.juneau.rest">BasicRestCallHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestCallHandler.html#getSessionObjects-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getSessionObjects(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestCallHandler.html" title="class in org.apache.juneau.rest">BasicRestCallHandler</a></dt>
 <dd>
 <div class="block">Returns the session objects for the specified request.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestCallHandler.html#getSessionObjects-org.apache.juneau.rest.RestRequest-">getSessionObjects(RestRequest)</a></span> - Method in interface org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestCallHandler.html" title="interface in org.apache.juneau.rest">RestCallHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestCallHandler.html#getSessionObjects-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getSessionObjects(RestRequest, RestResponse)</a></span> - Method in interface org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestCallHandler.html" title="interface in org.apache.juneau.rest">RestCallHandler</a></dt>
 <dd>
 <div class="block">Returns the session objects for the specified request.</div>
 </dd>
@@ -17905,8 +18093,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jaxrs/BaseProvider.html#getSize-java.lang.Object-java.lang.Class-java.lang.reflect.Type-java.lang.annotation.Annotation:A-javax.ws.rs.core.MediaType-">getSize(Object, Class&lt;?&gt;, Type, Annotation[], MediaType)</a></span> - Method in class org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs">BaseProvider</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#getSocketTimeout--">getSocketTimeout()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#getSocketTimeout--">getSocketTimeout()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SortArgs.html#getSort--">getSort()</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a></dt>
+<dd>
+<div class="block">The sort columns.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/SearchArgs.html#getSort--">getSort()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></dt>
 <dd>
 <div class="block">The sort columns.</div>
@@ -17941,7 +18133,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/dto/UpdatePet.html#getStatus--">getStatus()</a></span> - Method in class org.apache.juneau.examples.rest.petstore.dto.<a href="org/apache/juneau/examples/rest/petstore/dto/UpdatePet.html" title="class in org.apache.juneau.examples.rest.petstore.dto">UpdatePet</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getStatus--">getStatus()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getStatus--">getStatus()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestException.html#getStatus--">getStatus()</a></span> - Method in exception org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest">RestException</a></dt>
 <dd>
@@ -18118,16 +18310,16 @@
 <dd>
 <div class="block">Returns the CSS style of the element containing the bean property value.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getStyle-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getStyle(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></dt>
 <dd>
 <div class="block">Defines a <js>"menu-item"</js> class that needs to be used on the outer element of the HTML returned by the
- <a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-"><code>MenuItemWidget.getHtml(RestRequest)</code></a> method.</div>
+ <a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-"><code>MenuItemWidget.getHtml(RestRequest,RestResponse)</code></a> method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#getStyle-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getStyle(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
 <dd>
 <div class="block">Returns CSS for the tooltips.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle(RestRequest)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getStyle(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Resolves any CSS styles that should be added to the <xt>&lt;head&gt;/&lt;style&gt;</xt> element.</div>
 </dd>
@@ -18297,6 +18489,14 @@
 <dd>
 <div class="block">Returns the exception thrown by calling the property getter.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#getTimestampFormats--">getTimestampFormats()</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#getTimestampFormatStrings--">getTimestampFormatStrings()</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanContext.html#getTimeZone--">getTimeZone()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a></dt>
 <dd>
 <div class="block">Configuration property:  Time zone.</div>
@@ -18619,7 +18819,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/dto/User.html#getUsername--">getUsername()</a></span> - Method in class org.apache.juneau.examples.rest.petstore.dto.<a href="org/apache/juneau/examples/rest/petstore/dto/User.html" title="class in org.apache.juneau.examples.rest.petstore.dto">User</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#getUserPrincipal--">getUserPrincipal()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#getUserPrincipal--">getUserPrincipal()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html#getUsers--">getUsers()</a></span> - Method in class org.apache.juneau.examples.rest.petstore.<a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html" title="class in org.apache.juneau.examples.rest.petstore">PetStoreService</a></dt>
 <dd>&nbsp;</dd>
@@ -18651,9 +18851,9 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/SerializedNameValuePair.html#getValue--">getValue()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/SerializedNameValuePair.html" title="class in org.apache.juneau.rest.client">SerializedNameValuePair</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getValue-java.lang.String-">getValue(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getValue-java.lang.String-">getValue(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#getValueNames--">getValueNames()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#getValueNames--">getValueNames()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanMap.html#getValues-boolean-org.apache.juneau.BeanPropertyValue...-">getValues(boolean, BeanPropertyValue...)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanMap.html" title="class in org.apache.juneau">BeanMap</a></dt>
 <dd>
@@ -18717,6 +18917,10 @@
 <dd>
 <div class="block">Returns the <code>Via</code> header on the request.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/ViewArgs.html#getView--">getView()</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a></dt>
+<dd>
+<div class="block">The view columns.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/SearchArgs.html#getView--">getView()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></dt>
 <dd>
 <div class="block">The view columns.</div>
@@ -18782,7 +18986,7 @@
 <dd>
 <div class="block">Retrieves a writer associated with an ID via <a href="org/apache/juneau/rest/client/RestCall.html#pipeTo-java.lang.String-java.io.Writer-boolean-"><code>RestCall.pipeTo(String, Writer, boolean)</code></a></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#getWriter--">getWriter()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#getWriter--">getWriter()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#getWriter--">getWriter()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>
@@ -19060,6 +19264,10 @@
 <dd>
 <div class="block">Returns whether this HTTP method normally has content.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClient.html#hasContent-java.lang.String-">hasContent(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if specified http method has content.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Swagger.html#hasDefinitions--">hasDefinitions()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></dt>
 <dd>
 <div class="block">Convenience method for testing whether this Swagger has one or more definitions defined.</div>
@@ -19438,7 +19646,15 @@
 <dd>
 <div class="block">Sets the HTML header section contents.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#header-java.lang.String-java.lang.Object-">header(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#header-java.lang.String-java.lang.Object-">header(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Adds a header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#header-java.lang.String-java.lang.Object-">header(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Adds a header to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#header-java.lang.String-java.lang.Object-">header(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -19564,8 +19780,28 @@
 <dd>
 <div class="block">Sets headers on the request.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#headers-java.util.Map-">headers(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
+<dd>
+<div class="block">Sets arbitrary request headers.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/helper/ResolvingReaderResource.Builder.html#headers-java.util.Map-">headers(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.helper.<a href="org/apache/juneau/rest/helper/ResolvingReaderResource.Builder.html" title="class in org.apache.juneau.rest.helper">ResolvingReaderResource.Builder</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#headers-java.util.Map-">headers(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Adds the specified headers to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#headers-java.util.Map-">headers(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Adds the specified headers to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#headers">headers</a></span> - Variable in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Requests headers to add to every request.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#headers-java.util.Map-">headers(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Fluent setter.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#headersIfNE-java.util.Map-">headersIfNE(Map&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Sets headers on the request if the values are not null/empty.</div>
@@ -19689,7 +19925,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Host</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#host-java.lang.Object-">host(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#host-java.lang.Object-">host(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Host</code> header value on the request.</div>
 </dd>
@@ -19783,7 +20019,19 @@
 <dd>
 <div class="block">Convenience method for specifying HTML as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#html--">html()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#html--">html()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#html--">html()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#html--">html()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#html--">html()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.</div>
 </dd>
@@ -20271,7 +20519,7 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#httpSession-javax.servlet.http.HttpSession-">httpSession(HttpSession)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#httpSession-javax.servlet.http.HttpSession-">httpSession(HttpSession)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -20686,7 +20934,7 @@
 <dd>
 <div class="block">Sets the value for the <code>If-Match</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#ifMatch-java.lang.Object-">ifMatch(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#ifMatch-java.lang.Object-">ifMatch(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>If-Match</code> header value on the request.</div>
 </dd>
@@ -20702,7 +20950,7 @@
 <dd>
 <div class="block">Sets the value for the <code>If-Modified-Since</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#ifModifiedSince-java.lang.Object-">ifModifiedSince(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#ifModifiedSince-java.lang.Object-">ifModifiedSince(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>If-Modified-Since</code> header value on the request.</div>
 </dd>
@@ -20718,7 +20966,7 @@
 <dd>
 <div class="block">Sets the value for the <code>If-None-Match</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#ifNoneMatch-java.lang.Object-">ifNoneMatch(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#ifNoneMatch-java.lang.Object-">ifNoneMatch(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>If-None-Match</code> header value on the request.</div>
 </dd>
@@ -20749,7 +20997,7 @@
 <dd>
 <div class="block">Sets the value for the <code>If-Range</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#ifRange-java.lang.Object-">ifRange(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#ifRange-java.lang.Object-">ifRange(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>If-Range</code> header value on the request.</div>
 </dd>
@@ -20765,7 +21013,7 @@
 <dd>
 <div class="block">Sets the value for the <code>If-Unmodified-Since</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#ifUnmodifiedSince-java.lang.Object-">ifUnmodifiedSince(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#ifUnmodifiedSince-java.lang.Object-">ifUnmodifiedSince(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>If-Unmodified-Since</code> header value on the request.</div>
 </dd>
@@ -22229,7 +22477,7 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#invalidate--">invalidate()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#invalidate--">invalidate()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/InvalidDataConversionException.html" title="class in org.apache.juneau"><span class="typeNameLink">InvalidDataConversionException</span></a> - Exception in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
 <dd>
@@ -22515,9 +22763,9 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if this class is a superclass of or the same as the specified class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isAsyncStarted--">isAsyncStarted()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isAsyncStarted--">isAsyncStarted()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isAsyncSupported--">isAsyncSupported()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isAsyncSupported--">isAsyncSupported()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/Version.html#isAtLeast-org.apache.juneau.internal.Version-boolean-">isAtLeast(Version, boolean)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/Version.html" title="class in org.apache.juneau.internal">Version</a></dt>
 <dd>
@@ -22659,7 +22907,7 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified character is whitespace or '/'.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#isCommitted--">isCommitted()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#isCommitted--">isCommitted()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#isDate--">isDate()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
 <dd>
@@ -23045,7 +23293,7 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect"><code>Method</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#isNew--">isNew()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#isNew--">isNew()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject(Object)</a></span> - Method in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a></dt>
 <dd>
@@ -23213,7 +23461,7 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if this format is one of those specified.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#isOpen--">isOpen()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#isOpen--">isOpen()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#isOutputType-java.lang.Class-">isOutputType(Class&lt;?&gt;)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>
@@ -23317,25 +23565,25 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified request can pass through this guard.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isRequestedSessionIdFromCookie--">isRequestedSessionIdFromCookie()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isRequestedSessionIdFromCookie--">isRequestedSessionIdFromCookie()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isRequestedSessionIdFromURL--">isRequestedSessionIdFromURL()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isRequestedSessionIdFromURL--">isRequestedSessionIdFromURL()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isRequestedSessionIdFromUrl--">isRequestedSessionIdFromUrl()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isRequestedSessionIdFromUrl--">isRequestedSessionIdFromUrl()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isRequestedSessionIdValid--">isRequestedSessionIdValid()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isRequestedSessionIdValid--">isRequestedSessionIdValid()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/HttpPartSchema.html#isRequired--">isRequired()</a></span> - Method in class org.apache.juneau.httppart.<a href="org/apache/juneau/httppart/HttpPartSchema.html" title="class in org.apache.juneau.httppart">HttpPartSchema</a></dt>
 <dd>
 <div class="block">Returns the <code>required</code> field of this schema.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#isResponseAvailable-int-">isResponseAvailable(int)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#isResponseAvailable-int-">isResponseAvailable(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/config/event/ConfigEvents.html#isSectionModified-java.lang.String-">isSectionModified(String)</a></span> - Method in class org.apache.juneau.config.event.<a href="org/apache/juneau/config/event/ConfigEvents.html" title="class in org.apache.juneau.config.event">ConfigEvents</a></dt>
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified section was modified in this list of events.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isSecure--">isSecure()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isSecure--">isSecure()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#isSet--">isSet()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
 <dd>
@@ -23393,7 +23641,7 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the properties defined on this bean class should be ordered alphabetically.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#isStale--">isStale()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#isStale--">isStale()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#isStandalone--">isStandalone()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
@@ -23573,7 +23821,7 @@
 <dd>
 <div class="block">Configuration property:  Use Java Introspector.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#isUserInRole-java.lang.String-">isUserInRole(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#isUserInRole-java.lang.String-">isUserInRole(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/Serializer.html#isUseWhitespace--">isUseWhitespace()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></dt>
 <dd>
@@ -23897,7 +24145,19 @@
 <dd>
 <div class="block">Convenience method for specifying JSON as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#json--">json()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#json--">json()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#json--">json()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#json--">json()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#json--">json()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.</div>
 </dd>
@@ -24916,7 +25176,7 @@
 <div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-"><code>Widget.getClasspathResourceAsString(String)</code></a> except also strips HTML comments from the
  file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadHtmlWithVars-org.apache.juneau.rest.RestRequest-java.lang.String-">loadHtmlWithVars(RestRequest, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadHtmlWithVars-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-java.lang.String-">loadHtmlWithVars(RestRequest, RestResponse, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-"><code>Widget.loadHtml(String)</code></a> but replaces request-time SVL variables.</div>
 </dd>
@@ -24925,7 +25185,7 @@
 <div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-"><code>Widget.getClasspathResourceAsString(String)</code></a> except also strips Javascript comments from
  the file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadScriptWithVars-org.apache.juneau.rest.RestRequest-java.lang.String-">loadScriptWithVars(RestRequest, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadScriptWithVars-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-java.lang.String-">loadScriptWithVars(RestRequest, RestResponse, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-"><code>Widget.loadScript(String)</code></a> but replaces request-time SVL variables.</div>
 </dd>
@@ -24934,7 +25194,7 @@
 <div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-"><code>Widget.getClasspathResourceAsString(String)</code></a> except also strips CSS comments from
  the file.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadStyleWithVars-org.apache.juneau.rest.RestRequest-java.lang.String-">loadStyleWithVars(RestRequest, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadStyleWithVars-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-java.lang.String-">loadStyleWithVars(RestRequest, RestResponse, String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt>
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-"><code>Widget.loadStyle(String)</code></a> but replaces request-time SVL variables.</div>
 </dd>
@@ -24942,7 +25202,7 @@
 <dd>
 <div class="block">Loads a text file from either the file system or classpath.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#localAddr-java.lang.String-">localAddr(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#localAddr-java.lang.String-">localAddr(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -25006,7 +25266,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#locale-java.util.Locale-">locale(Locale)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#locale-java.util.Locale-">locale(Locale)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#locale-java.util.Locale-">locale(Locale)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -25046,11 +25306,11 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#localName-java.lang.String-">localName(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#localName-java.lang.String-">localName(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#localPort-int-">localPort(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#localPort-int-">localPort(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -25170,7 +25430,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.html#login-java.lang.String-java.lang.String-org.apache.juneau.Value-org.apache.juneau.Value-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">login(String, String, Value&lt;Integer&gt;, Value&lt;ExpiresAfter&gt;, RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstor [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#login-java.lang.String-java.lang.String-">login(String, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#login-java.lang.String-java.lang.String-">login(String, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/AtomBuilder.html#logo-java.lang.Object-">logo(Object)</a></span> - Static method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom">AtomBuilder</a></dt>
 <dd>
@@ -25217,7 +25477,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.html#logout--">logout()</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.html" title="class in org.apache.juneau.examples.rest.petstore.rest">PetStoreResource</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#logout--">logout()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#logout--">logout()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/microservice/resources/LogParser.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">LogParser</span></a> - Class in <a href="org/apache/juneau/microservice/resources/package-summary.html">org.apache.juneau.microservice.resources</a></dt>
 <dd>
@@ -25571,6 +25831,20 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#marshall-org.apache.juneau.marshall.Marshall-">marshall(Marshall)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
+<dd>
+<div class="block">Configuration property:  Marshall</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#marshall-org.apache.juneau.marshall.Marshall-">marshall(Marshall)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Associates the specified <a href="org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> with this client.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#marshall-org.apache.juneau.marshall.Marshall-">marshall(Marshall)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to the primary media types on the specified marshall.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#marshall-org.apache.juneau.marshall.Marshall-">marshall(Marshall)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/MediaType.html#match-org.apache.juneau.http.MediaType-boolean-">match(MediaType, boolean)</a></span> - Method in class org.apache.juneau.http.<a href="org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a></dt>
 <dd>
 <div class="block">Returns a match metric against the specified media type where a larger number represents a better match.</div>
@@ -25583,8 +25857,20 @@
 <dd>
 <div class="block">Returns a number indicating how well this swap matches the specified session.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Matcher</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Common interface for matchers used by the <a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><code>PojoSearcher</code></a> class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/Matcher.html#Matcher--">Matcher()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/ProcBuilder.Matcher.html#Matcher--">Matcher()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils">ProcBuilder.Matcher</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">MatcherFactory</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Common interface for matchers used by the <a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><code>PojoSearcher</code></a> class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/MatcherFactory.html#MatcherFactory--">MatcherFactory()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/StringRange.html#matches-java.lang.String-">matches(String)</a></span> - Method in class org.apache.juneau.http.<a href="org/apache/juneau/http/StringRange.html" title="class in org.apache.juneau.http">StringRange</a></dt>
 <dd>
 <div class="block">Checks if the specified type matches this range.</div>
@@ -25593,6 +25879,10 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified version string matches this version range.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/Matcher.html#matches-org.apache.juneau.ClassMeta-java.lang.Object-">matches(ClassMeta&lt;?&gt;, Object)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if this matcher matches the specified object..</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/ClientVersionMatcher.html#matches-org.apache.juneau.rest.RestRequest-">matches(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/ClientVersionMatcher.html" title="class in org.apache.juneau.rest">ClientVersionMatcher</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html#matches-org.apache.juneau.rest.RestRequest-">matches(RestRequest)</a></span> - Method in class org.apache.juneau.rest.matchers.<a href="org/apache/juneau/rest/matchers/MultipartFormDataMatcher.html" title="class in org.apache.juneau.rest.matchers">MultipartFormDataMatcher</a></dt>
@@ -25681,7 +25971,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Max-Forwards</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#maxForwards-java.lang.Object-">maxForwards(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#maxForwards-java.lang.Object-">maxForwards(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Max-Forwards</code> header value on the request.</div>
 </dd>
@@ -26296,7 +26586,7 @@
 <div class="block">Annotation that can be applied to a parameter of a <a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a> annotated method to identify it as the HTTP
  method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#method-java.lang.String-">method(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#method-java.lang.String-">method(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -26492,26 +26782,22 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/internal/FileUtils.html#mkdirs-java.lang.String-boolean-"><code>FileUtils.mkdirs(String, boolean)</code></a> but uses String path.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock"><span class="typeNameLink">MockHttpClientConnection</span></a> - Class in <a href="org/apache/juneau/rest/client/mock/package-summary.html">org.apache.juneau.rest.client.mock</a></dt>
+<dt><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockHttpClientConnection</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">An implementation of <code>HttpClientConnection</code> specifically for use in mocked connections using the <a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils"><code>MockHttpConnection</code></a> class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#MockHttpClientConnection-org.apache.juneau.utils.MockHttpConnection-">MockHttpClientConnection(MockHttpConnection)</a></span> - Constructor for class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#MockHttpClientConnection-org.apache.juneau.utils.MockHttpConnection-">MockHttpClientConnection(MockHttpConnection)</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock"><span class="typeNameLink">MockHttpClientConnectionManager</span></a> - Class in <a href="org/apache/juneau/rest/client/mock/package-summary.html">org.apache.juneau.rest.client.mock</a></dt>
+<dt><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockHttpClientConnectionManager</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">An implementation of <code>HttpClientConnectionManager</code> specifically for use in mocked connections using the <a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils"><code>MockHttpConnection</code></a> class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#MockHttpClientConnectionManager-org.apache.juneau.utils.MockHttpConnection-">MockHttpClientConnectionManager(MockHttpConnection)</a></span> - Constructor for class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#MockHttpClientConnectionManager-org.apache.juneau.utils.MockHttpConnection-">MockHttpClientConnectionManager(MockHttpConnection)</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#mockHttpConnection-org.apache.juneau.utils.MockHttpConnection-">mockHttpConnection(MockHttpConnection)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
-<dd>
-<div class="block">Sets a mock connection used to construct a connection manager for working against mocked REST interfaces.</div>
-</dd>
 <dt><a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils"><span class="typeNameLink">MockHttpConnection</span></a> - Interface in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
 <dd>
 <div class="block">Represent the basic connection for mock HTTP requests.</div>
@@ -26524,27 +26810,51 @@
 <dd>
 <div class="block">Represent the basic interface for an HTTP response.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock"><span class="typeNameLink">MockHttpSession</span></a> - Class in <a href="org/apache/juneau/rest/mock/package-summary.html">org.apache.juneau.rest.mock</a></dt>
+<dt><a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockHttpSession</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">An implementation of <code>HttpSession</code> for mocking purposes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#MockHttpSession--">MockHttpSession()</a></span> - Constructor for class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#MockHttpSession--">MockHttpSession()</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock"><span class="typeNameLink">MockRest</span></a> - Class in <a href="org/apache/juneau/rest/mock/package-summary.html">org.apache.juneau.rest.mock</a></dt>
+<dt><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockRemoteResource</span></a>&lt;<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="type parameter in MockRemoteResource">T</a>&gt; - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
+<dd>
+<div class="block">Creates a mocked interface against a REST resource class to use for creating test remote resource interfaces.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#MockRemoteResource-java.lang.Class-java.lang.Object-">MockRemoteResource(Class&lt;T&gt;, Object)</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockRest</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">Creates a mocked interface against a REST resource class.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock"><span class="typeNameLink">MockServletRequest</span></a> - Class in <a href="org/apache/juneau/rest/mock/package-summary.html">org.apache.juneau.rest.mock</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#MockRest-org.apache.juneau.rest.mock2.MockRest.Builder-">MockRest(MockRest.Builder)</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockRest.Builder</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
+<dd>
+<div class="block">Builder class.</div>
+</dd>
+<dt><a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockRestClient</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
+<dd>
+<div class="block">Mocked <a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#MockRestClient-java.lang.Object-">MockRestClient(Object)</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockServletRequest</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">An implementation of <code>HttpServletRequest</code> for mocking purposes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#MockServletRequest--">MockServletRequest()</a></span> - Constructor for class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#MockServletRequest--">MockServletRequest()</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock"><span class="typeNameLink">MockServletResponse</span></a> - Class in <a href="org/apache/juneau/rest/mock/package-summary.html">org.apache.juneau.rest.mock</a></dt>
+<dt><a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2"><span class="typeNameLink">MockServletResponse</span></a> - Class in <a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a></dt>
 <dd>
 <div class="block">An implementation of <code>HttpServletResponse</code> for mocking purposes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#MockServletResponse--">MockServletResponse()</a></span> - Constructor for class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#MockServletResponse--">MockServletResponse()</a></span> - Constructor for class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectList.html#modifiable--">modifiable()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a></dt>
 <dd>
@@ -26598,7 +26908,19 @@
 <dd>
 <div class="block">Convenience method for specifying MessagePack as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#msgpack--">msgpack()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#msgpack--">msgpack()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#msgpack--">msgpack()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#msgpack--">msgpack()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#msgpack--">msgpack()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.</div>
 </dd>
@@ -28235,6 +28557,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/annotation/ParameterType.html#NUMBER">NUMBER</a></span> - Static variable in class org.apache.juneau.http.annotation.<a href="org/apache/juneau/http/annotation/ParameterType.html" title="class in org.apache.juneau.http.annotation">ParameterType</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">NumberMatcherFactory</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/NumberMatcherFactory.html#NumberMatcherFactory--">NumberMatcherFactory()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:O">
 <!--   -->
@@ -28803,6 +29131,18 @@
 <dd>
 <div class="block">Convenience method for specifying URL-Encoding as the transmission media type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#openapi--">openapi()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#openapi--">openapi()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#openapi--">openapi()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.</div>
+</dd>
 <dt><a href="org/apache/juneau/oapi/OpenApiParser.html" title="class in org.apache.juneau.oapi"><span class="typeNameLink">OpenApiParser</span></a> - Class in <a href="org/apache/juneau/oapi/package-summary.html">org.apache.juneau.oapi</a></dt>
 <dd>
 <div class="block">OpenAPI part parser.</div>
@@ -28938,7 +29278,7 @@
 <dd>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2'>OPTIONS</a></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#options-java.lang.String-">options(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#options-java.lang.String-">options(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Perform an OPTIONS request.</div>
 </dd>
@@ -29200,6 +29540,8 @@
 <dd>
 <div class="block">Plaintext Marshalling Support</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a> - package org.apache.juneau.pojotools</dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/remote/package-summary.html">org.apache.juneau.remote</a> - package org.apache.juneau.remote</dt>
 <dd>
 <div class="block">Remote Interfaces API</div>
@@ -29216,10 +29558,6 @@
 <dd>
 <div class="block">REST Client API</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/client/mock/package-summary.html">org.apache.juneau.rest.client.mock</a> - package org.apache.juneau.rest.client.mock</dt>
-<dd>
-<div class="block">REST Client Mock API</div>
-</dd>
 <dt><a href="org/apache/juneau/rest/client/remote/package-summary.html">org.apache.juneau.rest.client.remote</a> - package org.apache.juneau.rest.client.remote</dt>
 <dd>
 <div class="block">Remote REST API</div>
@@ -29244,7 +29582,7 @@
 <dd>
 <div class="block">Predefined Matchers</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/mock/package-summary.html">org.apache.juneau.rest.mock</a> - package org.apache.juneau.rest.mock</dt>
+<dt><a href="org/apache/juneau/rest/mock2/package-summary.html">org.apache.juneau.rest.mock2</a> - package org.apache.juneau.rest.mock2</dt>
 <dd>
 <div class="block">REST Server Mock API</div>
 </dd>
@@ -29885,6 +30223,16 @@
 <dd>
 <div class="block">Configuration property:  Parser.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#parser-org.apache.juneau.parser.Parser-">parser(Parser)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Associates the specified <a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><code>Parser</code></a> with this client.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#parser-org.apache.juneau.parser.Parser-">parser(Parser)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> header to the primary media type on the specified parser.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#parser-org.apache.juneau.parser.Parser-">parser(Parser)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/parser/Parser.html#PARSER_autoCloseStreams">PARSER_autoCloseStreams</a></span> - Static variable in class org.apache.juneau.parser.<a href="org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></dt>
 <dd>
 <div class="block">Configuration property:  Auto-close streams.</div>
@@ -30097,6 +30445,14 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/annotation/FormatType.html#PASSWORD">PASSWORD</a></span> - Static variable in class org.apache.juneau.http.annotation.<a href="org/apache/juneau/http/annotation/FormatType.html" title="class in org.apache.juneau.http.annotation">FormatType</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/http/HttpMethodName.html#PATCH">PATCH</a></span> - Static variable in class org.apache.juneau.http.<a href="org/apache/juneau/http/HttpMethodName.html" title="class in org.apache.juneau.http">HttpMethodName</a></dt>
+<dd>
+<div class="block"><a class='doclink' href='https://tools.ietf.org/html/rfc5789'>PATCH</a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#patch-java.lang.String-java.lang.Object-">patch(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Perform a PATCH request.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Swagger.html#path-java.lang.String-java.lang.String-org.apache.juneau.dto.swagger.Operation-">path(String, String, Operation)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></dt>
 <dd>
 <div class="block">Adds a single value to the <property>paths</property> property.</div>
@@ -30117,7 +30473,7 @@
 <dd>
 <div class="block">Configuration property:  Resource path.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#pathInfo-java.lang.String-">pathInfo(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#pathInfo-java.lang.String-">pathInfo(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -30135,7 +30491,7 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String-"><code>StringUtils.pathStartsWith(String, String)</code></a> but returns <jk>true</jk> if at least one prefix matches.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#pathTranslated-java.lang.String-">pathTranslated(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#pathTranslated-java.lang.String-">pathTranslated(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -30175,6 +30531,14 @@
 <dd>
 <div class="block">Date format pattern used to parse HTTP date headers in RFC 1123 format.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">PatternException</span></a> - Exception in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Indicates an invalid search pattern was specified.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PatternException.html#PatternException-java.lang.String-java.lang.Object...-">PatternException(String, Object...)</a></span> - Constructor for exception org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools">PatternException</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
 <dt><a href="org/apache/juneau/svl/vars/PatternExtractVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">PatternExtractVar</span></a> - Class in <a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></dt>
 <dd>
 <div class="block">A transformational variable that returns matched regex groups by given index.</div>
@@ -30422,7 +30786,19 @@
 <dd>
 <div class="block">Convenience method for specifying plain-text as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#plainText--">plainText()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#plainText--">plainText()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#plainText--">plainText()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#plainText--">plainText()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#plainText--">plainText()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.</div>
 </dd>
@@ -30530,6 +30906,12 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/PojoMerge.html#PojoMerge--">PojoMerge()</a></span> - Constructor for class org.apache.juneau.utils.<a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">PojoPaginator</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoPaginator.html#PojoPaginator--">PojoPaginator()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools">PojoPaginator</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoQuery</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
 <dd>
 <div class="block">Designed to provide search/view/sort/paging filtering on tabular in-memory POJO models.</div>
@@ -30562,6 +30944,24 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">PojoSearcher</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSearcher.html#PojoSearcher-org.apache.juneau.pojotools.MatcherFactory...-">PojoSearcher(MatcherFactory...)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSearcher.html#PojoSearcher--">PojoSearcher()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">PojoSorter</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Sorts arrays and collections of maps and beans.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSorter.html#PojoSorter--">PojoSorter()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools">PojoSorter</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><span class="typeNameLink">PojoSwap</span></a>&lt;<a href="org/apache/juneau/transform/PojoSwap.html" title="type parameter in PojoSwap">T</a>,<a href="org/apache/juneau/transform/PojoSwap.html" title="type parameter in PojoSwap">S</a>&gt; - Class in <a href="org/apache/juneau/transform/package-summary.html">org.apache.juneau.transform</a></dt>
 <dd>
 <div class="block">Used to swap out non-serializable objects with serializable replacements during serialization, and vis-versa during
@@ -30895,6 +31295,16 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.html#pojoSwapsRemove-java.lang.Object...-">pojoSwapsRemove(Object...)</a></span> - Method in class org.apache.juneau.xmlschema.<a href="org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.html" title="class in org.apache.juneau.xmlschema">XmlSchemaSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="typeNameLink">PojoTool</span></a>&lt;<a href="org/apache/juneau/pojotools/PojoTool.html" title="type parameter in PojoTool">T</a>&gt; - Interface in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Interface for classes that convert POJOs in some way using some predefined arguments object.</div>
+</dd>
+<dt><a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">PojoViewer</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoViewer.html#PojoViewer--">PojoViewer()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools">PojoViewer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#pooled--">pooled()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>
 <div class="block">When called, the <a href="org/apache/juneau/rest/client/RestClientBuilder.html#createConnectionManager--"><code>RestClientBuilder.createConnectionManager()</code></a> method will return a <code>PoolingHttpClientConnectionManager</code>
@@ -30940,7 +31350,7 @@
 <dd>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5'>POST</a></div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#post-java.lang.String-java.lang.Object-">post(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#post-java.lang.String-java.lang.Object-">post(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Perform a POST request.</div>
 </dd>
@@ -31009,7 +31419,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Pragma</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#pragma-java.lang.Object-">pragma(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#pragma-java.lang.Object-">pragma(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Pragma</code> header value on the request.</div>
 </dd>
@@ -31282,7 +31692,7 @@
 <dd>
 <div class="block">Represents possible property types of properties in a <a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><code>PropertyStore</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#protocol-java.lang.String-">protocol(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#protocol-java.lang.String-">protocol(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -31306,7 +31716,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#proxyAuthorization-java.lang.Object-">proxyAuthorization(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#proxyAuthorization-java.lang.Object-">proxyAuthorization(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Proxy-Authorization</code> header value on the request.</div>
 </dd>
@@ -31350,7 +31760,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/WrappedMap.html#put-K-V-">put(K, V)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/WrappedMap.html" title="class in org.apache.juneau.internal">WrappedMap</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#put-java.lang.String-java.lang.Object-">put(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#put-java.lang.String-java.lang.Object-">put(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Perform a PUT request.</div>
 </dd>
@@ -31406,7 +31816,7 @@
 <dd>
 <div class="block">Convenience method for inserting JSON directly into an attribute on this object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#putValue-java.lang.String-java.lang.Object-">putValue(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#putValue-java.lang.String-java.lang.Object-">putValue(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:Q">
@@ -31481,7 +31891,7 @@
 <dd>
 <div class="block">Configuration property:  Request query parameters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#query-java.lang.String-java.lang.Object-">query(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#query-java.lang.String-java.lang.Object-">query(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Adds a query data entry to this request.</div>
 </dd>
@@ -31505,7 +31915,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/QueryMenuItem.html#QueryMenuItem--">QueryMenuItem()</a></span> - Constructor for class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#queryString-java.lang.String-">queryString(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#queryString-java.lang.String-">queryString(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -31577,7 +31987,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Range</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#range-java.lang.Object-">range(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#range-java.lang.Object-">range(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Range</code> header value on the request.</div>
 </dd>
@@ -32249,13 +32659,13 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/parser/ParserReader.html#read--"><code>ParserReader.read()</code></a> but skips over any whitespace characters.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#realPath-java.lang.String-">realPath(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#realPath-java.lang.String-">realPath(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#receiveResponseEntity-org.apache.http.HttpResponse-">receiveResponseEntity(HttpResponse)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#receiveResponseEntity-org.apache.http.HttpResponse-">receiveResponseEntity(HttpResponse)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#receiveResponseHeader--">receiveResponseHeader()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#receiveResponseHeader--">receiveResponseHeader()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#redirectMaxAttempts-int-">redirectMaxAttempts(int)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
@@ -32287,7 +32697,7 @@
 <dd>
 <div class="block">Sets the value for the <code>Referer</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#referer-java.lang.Object-">referer(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#referer-java.lang.Object-">referer(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Referer</code> header value on the request.</div>
 </dd>
@@ -32333,13 +32743,13 @@
 <dd>
 <div class="block">Opposite of <a href="org/apache/juneau/serializer/SerializerSession.html#resolveUri-java.lang.Object-"><code>SerializerSession.resolveUri(Object)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#releaseConnection-org.apache.http.HttpClientConnection-java.lang.Object-long-java.util.concurrent.TimeUnit-">releaseConnection(HttpClientConnection, Object, long, TimeUnit)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHtt [...]
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#releaseConnection-org.apache.http.HttpClientConnection-java.lang.Object-long-java.util.concurrent.TimeUnit-">releaseConnection(HttpClientConnection, Object, long, TimeUnit)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#remoteAddr-java.lang.String-">remoteAddr(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#remoteAddr-java.lang.String-">remoteAddr(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#remoteHost-java.lang.String-">remoteHost(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#remoteHost-java.lang.String-">remoteHost(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32407,7 +32817,7 @@
 <dd>
 <div class="block">Represents the metadata about the returned object of a method on a remote proxy interface.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#remotePort-int-">remotePort(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#remotePort-int-">remotePort(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32427,7 +32837,7 @@
 <dd>
 <div class="block">Possible values for the <a href="org/apache/juneau/rest/client/remote/RemoteMethod.html#returns--"><code>@RemoteMethod(returns)</code></a> annotation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#remoteUser-java.lang.String-">remoteUser(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#remoteUser-java.lang.String-">remoteUser(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32465,9 +32875,9 @@
 <dd>
 <div class="block">Convenience method for removing several keys at once.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#removeAttribute-java.lang.String-">removeAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#removeAttribute-java.lang.String-">removeAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#removeAttribute-java.lang.String-">removeAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#removeAttribute-java.lang.String-">removeAttribute(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectMap.html#removeBoolean-java.lang.String-">removeBoolean(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></dt>
 <dd>
@@ -32619,7 +33029,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html#removeUser-java.lang.String-">removeUser(String)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.<a href="org/apache/juneau/examples/rest/petstore/PetStoreService.html" title="class in org.apache.juneau.examples.rest.petstore">PetStoreService</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#removeValue-java.lang.String-">removeValue(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#removeValue-java.lang.String-">removeValue(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ObjectMap.html#removeWithDefault-java.lang.String-T-java.lang.Class-">removeWithDefault(String, T, Class&lt;T&gt;)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></dt>
 <dd>
@@ -32645,6 +33055,10 @@
 <dd>
 <div class="block">Replace the last read character in the buffer with the specified character.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#replaceChars-java.lang.String-char-char-boolean-">replaceChars(String, char, char, boolean)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
+<dd>
+<div class="block">Replaces tokens in a string with a different token.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#replaceUnicodeSequences-java.lang.String-">replaceUnicodeSequences(String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
 <dd>
 <div class="block">Replaces <js>"\\uXXXX"</js> character sequences with their unicode characters.</div>
@@ -32663,15 +33077,23 @@
 <dd>
 <div class="block">Request bean annotation.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#request-java.lang.String-java.lang.String-java.lang.Object-">request(String, String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#request-java.lang.String-java.lang.String-java.util.Map-java.lang.Object-">request(String, String, Map&lt;String, Object&gt;, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Performs a REST request against the REST interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#request-java.lang.String-java.lang.String-">request(String, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
+<dd>
+<div class="block">Performs a REST request against the REST interface.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#request-java.lang.String-java.lang.String-java.lang.Object-">request(String, String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Performs a REST request against the REST interface.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockRest.html#request-java.lang.String-java.lang.String-">request(String, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.html#request-java.lang.String-java.util.Map-java.lang.String-">request(String, Map&lt;String, Object&gt;, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.html" title="class in org.apache.juneau.rest.mock2">MockRest</a></dt>
 <dd>
 <div class="block">Performs a REST request against the REST interface.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/MockHttpConnection.html#request-java.lang.String-java.lang.String-java.lang.Object-">request(String, String, Object)</a></span> - Method in interface org.apache.juneau.utils.<a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils">MockHttpConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/MockHttpConnection.html#request-java.lang.String-java.lang.String-java.util.Map-java.lang.Object-">request(String, String, Map&lt;String, Object&gt;, Object)</a></span> - Method in interface org.apache.juneau.utils.<a href="org/apache/juneau/utils/MockHttpConnection.html" title="interface in org.apache.juneau.utils">MockHttpConnection</a></dt>
 <dd>
 <div class="block">Creates a mocked HTTP request.</div>
 </dd>
@@ -32699,9 +33121,9 @@
 <dd>
 <div class="block">Specifies the part schema for the request body.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#requestConnection-org.apache.http.conn.routing.HttpRoute-java.lang.Object-">requestConnection(HttpRoute, Object)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#requestConnection-org.apache.http.conn.routing.HttpRoute-java.lang.Object-">requestConnection(HttpRoute, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#requestDispatcher-javax.servlet.RequestDispatcher-">requestDispatcher(RequestDispatcher)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#requestDispatcher-javax.servlet.RequestDispatcher-">requestDispatcher(RequestDispatcher)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32711,7 +33133,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/RequestEchoResource.html#RequestEchoResource--">RequestEchoResource()</a></span> - Constructor for class org.apache.juneau.examples.rest.<a href="org/apache/juneau/examples/rest/RequestEchoResource.html" title="class in org.apache.juneau.examples.rest">RequestEchoResource</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#requestedSessionId-java.lang.String-">requestedSessionId(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#requestedSessionId-java.lang.String-">requestedSessionId(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32797,7 +33219,7 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#requestURI-java.lang.String-">requestURI(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#requestURI-java.lang.String-">requestURI(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -32843,11 +33265,11 @@
 <dd>
 <div class="block"><mk>required</mk> field.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#reset--">reset()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#reset--">reset()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/BoundedServletInputStream.html#reset--">reset()</a></span> - Method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/BoundedServletInputStream.html" title="class in org.apache.juneau.rest.util">BoundedServletInputStream</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#resetBuffer--">resetBuffer()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#resetBuffer--">resetBuffer()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/rest/response/ResetContent.html" title="class in org.apache.juneau.rest.response"><span class="typeNameLink">ResetContent</span></a> - Class in <a href="org/apache/juneau/rest/response/package-summary.html">org.apache.juneau.rest.response</a></dt>
 <dd>
@@ -33510,7 +33932,7 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#restContext-org.apache.juneau.rest.RestContext-">restContext(RestContext)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#restContext-org.apache.juneau.rest.RestContext-">restContext(RestContext)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -33822,7 +34244,7 @@
 <dd>
 <div class="block">Configuration property:  Root URI.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#routeComplete-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-org.apache.http.protocol.HttpContext-">routeComplete(HttpClientConnection, HttpRoute, HttpContext)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.clie [...]
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#routeComplete-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-org.apache.http.protocol.HttpContext-">routeComplete(HttpClientConnection, HttpRoute, HttpContext)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientC [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#routePlanner-org.apache.http.conn.routing.HttpRoutePlanner-">routePlanner(HttpRoutePlanner)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>&nbsp;</dd>
@@ -33918,6 +34340,18 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/Ruby.html#Ruby--">Ruby()</a></span> - Constructor for class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/Ruby.html" title="class in org.apache.juneau.dto.html5">Ruby</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoPaginator.html#run-org.apache.juneau.BeanSession-java.lang.Object-java.lang.Object-">run(BeanSession, Object, Object)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools">PojoPaginator</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSearcher.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SearchArgs-">run(BeanSession, Object, SearchArgs)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoSorter.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SortArgs-">run(BeanSession, Object, SortArgs)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools">PojoSorter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run(BeanSession, Object, T)</a></span> - Method in interface org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a></dt>
+<dd>
+<div class="block">Converts the specified input to some other output.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/PojoViewer.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.ViewArgs-">run(BeanSession, Object, ViewArgs)</a></span> - Method in class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools">PojoViewer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#run--">run()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Method used to execute an HTTP response where you're only interested in the HTTP response code.</div>
@@ -34061,7 +34495,7 @@
 <dd>
 <div class="block">Sets the URI scheme.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#scheme-java.lang.String-">scheme(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#scheme-java.lang.String-">scheme(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -34115,6 +34549,18 @@
 <dd>
 <div class="block">Adds a search term to this builder.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">SearchArgs</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Encapsulates arguments for the <a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><code>PojoSorter</code></a> class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SearchArgs.html#SearchArgs-java.lang.String-">SearchArgs(String)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SearchArgs.html#SearchArgs-java.util.List-">SearchArgs(List&lt;String&gt;)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
 <dt><a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">SearchArgs</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
 <dd>
 <div class="block">Encapsulates arguments for basic search/view/sort/position/limit functionality.</div>
@@ -34257,23 +34703,23 @@
 <dd>
 <div class="block"><a class='doclink' href='https://www.w3.org/TR/html5/forms.html#attr-option-selected'>selected</a> attribute.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#sendError-int-java.lang.String-">sendError(int, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#sendError-int-java.lang.String-">sendError(int, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#sendError-int-">sendError(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#sendError-int-">sendError(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#sendPlainText-java.lang.String-">sendPlainText(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>
 <div class="block">Sets the output to a plain-text message regardless of the content type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#sendRedirect-java.lang.String-">sendRedirect(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#sendRedirect-java.lang.String-">sendRedirect(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#sendRedirect-java.lang.String-">sendRedirect(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>
 <div class="block">Redirects to the specified URI.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#sendRequestEntity-org.apache.http.HttpEntityEnclosingRequest-">sendRequestEntity(HttpEntityEnclosingRequest)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#sendRequestEntity-org.apache.http.HttpEntityEnclosingRequest-">sendRequestEntity(HttpEntityEnclosingRequest)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#sendRequestHeader-org.apache.http.HttpRequest-">sendRequestHeader(HttpRequest)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#sendRequestHeader-org.apache.http.HttpRequest-">sendRequestHeader(HttpRequest)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/BaseHttpPartSerializer.html#serialize-org.apache.juneau.httppart.HttpPartSchema-java.lang.Object-">serialize(HttpPartSchema, Object)</a></span> - Method in class org.apache.juneau.httppart.<a href="org/apache/juneau/httppart/BaseHttpPartSerializer.html" title="class in org.apache.juneau.httppart">BaseHttpPartSerializer</a></dt>
 <dd>&nbsp;</dd>
@@ -34441,6 +34887,16 @@
 <dd>
 <div class="block">Configuration property:  Serializer.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#serializer-org.apache.juneau.serializer.Serializer-">serializer(Serializer)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Associates the specified <a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> with this client.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#serializer-org.apache.juneau.serializer.Serializer-">serializer(Serializer)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Content-Type</code> header to the primary media type on the specified serializer.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#serializer-org.apache.juneau.serializer.Serializer-">serializer(Serializer)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">Serializer</span></a> - Class in <a href="org/apache/juneau/serializer/package-summary.html">org.apache.juneau.serializer</a></dt>
 <dd>
 <div class="block">Parent class for all Juneau serializers.</div>
@@ -34623,11 +35079,11 @@
 <dd>
 <div class="block">Represents a parsed <l>Server</l> HTTP response header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#serverName-java.lang.String-">serverName(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#serverName-java.lang.String-">serverName(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#serverPort-int-">serverPort(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#serverPort-int-">serverPort(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -34689,7 +35145,7 @@
 <dd>
 <div class="block">Adds a set of servlet attributes to the servlet container.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#servletContext-javax.servlet.ServletContext-">servletContext(ServletContext)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#servletContext-javax.servlet.ServletContext-">servletContext(ServletContext)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -34701,7 +35157,7 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#servletPath-java.lang.String-">servletPath(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#servletPath-java.lang.String-">servletPath(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -34755,6 +35211,10 @@
 <dd>
 <div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest"><code>RestRequest</code></a> object.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/vars/RequestVar.html#SESSION_res">SESSION_res</a></span> - Static variable in class org.apache.juneau.rest.vars.<a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars">RequestVar</a></dt>
+<dd>
+<div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest"><code>RestResponse</code></a> object.</div>
+</dd>
 <dt><a href="org/apache/juneau/SessionArgs.html" title="class in org.apache.juneau"><span class="typeNameLink">SessionArgs</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
 <dd>
 <div class="block">Runtime arguments common to all bean, serializer, and parser sessions.</div>
@@ -35150,9 +35610,9 @@
 <dd>
 <div class="block">Bean property setter:  <property>attribute</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#setAttribute-java.lang.String-java.lang.Object-">setAttribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#setAttribute-java.lang.String-java.lang.Object-">setAttribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#setAttribute-java.lang.String-java.lang.Object-">setAttribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#setAttribute-java.lang.String-java.lang.Object-">setAttribute(String, Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/HtmlElement.html#setAttrs-java.util.LinkedHashMap-">setAttrs(LinkedHashMap&lt;String, Object&gt;)</a></span> - Method in class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a></dt>
 <dd>
@@ -35174,11 +35634,11 @@
 <dd>
 <div class="block">Override the default bean session used for converting POJOs.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setBufferSize-int-">setBufferSize(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setBufferSize-int-">setBufferSize(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#setCharacterEncoding-java.lang.String-">setCharacterEncoding(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
 <dd>
@@ -35233,11 +35693,11 @@
 <dd>
 <div class="block">Bean property setter:  <property>contact</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setContentLength-int-">setContentLength(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setContentLength-int-">setContentLength(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setContentLengthLong-long-">setContentLengthLong(long)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setContentLengthLong-long-">setContentLengthLong(long)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setContentType-java.lang.String-">setContentType(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setContentType-java.lang.String-">setContentType(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestServlet.html#setContext-org.apache.juneau.rest.RestContext-">setContext(RestContext)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></dt>
 <dd>
@@ -35263,7 +35723,7 @@
 <dd>
 <div class="block">Bean property setter:  <property>data</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setDateHeader-java.lang.String-long-">setDateHeader(String, long)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setDateHeader-java.lang.String-long-">setDateHeader(String, long)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/jetty/JettyLogger.html#setDebugEnabled-boolean-">setDebugEnabled(boolean)</a></span> - Method in class org.apache.juneau.microservice.jetty.<a href="org/apache/juneau/microservice/jetty/JettyLogger.html" title="class in org.apache.juneau.microservice.jetty">JettyLogger</a></dt>
 <dd>&nbsp;</dd>
@@ -35475,7 +35935,7 @@
 <dd>
 <div class="block">Bean property setter:  <property>format</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setHeader-java.lang.String-java.lang.String-">setHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setHeader-java.lang.String-java.lang.String-">setHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestResponse.html#setHeader-java.lang.String-java.lang.String-">setHeader(String, String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a></dt>
 <dd>&nbsp;</dd>
@@ -35523,7 +35983,7 @@
 <dd>
 <div class="block">Set an inner map in this map to allow for chained get calls.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setIntHeader-java.lang.String-int-">setIntHeader(String, int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setIntHeader-java.lang.String-int-">setIntHeader(String, int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#setItems-java.lang.Object-">setItems(Object)</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -35559,7 +36019,7 @@
 <dd>
 <div class="block">Bean property setter:  <property>license</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setLocale-java.util.Locale-">setLocale(Locale)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setLocale-java.util.Locale-">setLocale(Locale)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#setMaster-org.apache.juneau.dto.jsonschema.JsonSchema-">setMaster(JsonSchema)</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -35585,7 +36045,7 @@
 <dd>
 <div class="block">Bean property setter:  <property>maximum</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockHttpSession.html#setMaxInactiveInterval-int-">setMaxInactiveInterval(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockHttpSession.html" title="class in org.apache.juneau.rest.mock">MockHttpSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpSession.html#setMaxInactiveInterval-int-">setMaxInactiveInterval(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpSession.html" title="class in org.apache.juneau.rest.mock2">MockHttpSession</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/JsonSchema.html#setMaxItems-java.lang.Integer-">setMaxItems(Integer)</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonSchema.html" title="class in org.apache.juneau.dto.jsonschema">JsonSchema</a></dt>
 <dd>
@@ -35989,11 +36449,11 @@
 <dd>
 <div class="block">Sets the server-side exception details.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#setSocketTimeout-int-">setSocketTimeout(int)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#setSocketTimeout-int-">setSocketTimeout(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setStatus-int-">setStatus(int)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setStatus-int-">setStatus(int)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletResponse.html#setStatus-int-java.lang.String-">setStatus(int, String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletResponse.html" title="class in org.apache.juneau.rest.mock">MockServletResponse</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletResponse.html#setStatus-int-java.lang.String-">setStatus(int, String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletResponse.html" title="class in org.apache.juneau.rest.mock2">MockServletResponse</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestException.html#setStatus-int-">setStatus(int)</a></span> - Method in exception org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest">RestException</a></dt>
 <dd>
@@ -36187,9 +36647,9 @@
 <dd>
 <div class="block">[GET /] - Shutdown this resource.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html#shutdown--">shutdown()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html#shutdown--">shutdown()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnection.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnection</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#shutdown--">shutdown()</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">MockHttpClientConnectionManager</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#shutdown--">shutdown()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionManager</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ShutdownResource</span></a> - Class in <a href="org/apache/juneau/microservice/resources/package-summary.html">org.apache.juneau.microservice.resources</a></dt>
 <dd>
@@ -36249,6 +36709,22 @@
 <dd>
 <div class="block">Convenience method for specifying Simple JSON as the transmission media type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#simpleJson--">simpleJson()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#simpleJson--">simpleJson()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#simpleJson--">simpleJson()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#simpleJson--">simpleJson()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.</div>
+</dd>
 <dt><a href="org/apache/juneau/json/SimpleJsonSerializer.html" title="class in org.apache.juneau.json"><span class="typeNameLink">SimpleJsonSerializer</span></a> - Class in <a href="org/apache/juneau/json/package-summary.html">org.apache.juneau.json</a></dt>
 <dd>
 <div class="block">Serializes POJO models to Simplified JSON.</div>
@@ -36445,6 +36921,18 @@
 <dd>
 <div class="block">Specifies the sort arguments.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">SortArgs</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Encapsulates arguments for the <a href="org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><code>PojoSorter</code></a> class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SortArgs.html#SortArgs-java.lang.String...-">SortArgs(String...)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/SortArgs.html#SortArgs-java.util.Collection-">SortArgs(Collection&lt;String&gt;)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerBuilder.html#sortCollections-boolean-">sortCollections(boolean)</a></span> - Method in class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in org.apache.juneau.csv">CsvSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerBuilder.html#sortCollections--">sortCollections()</a></span> - Method in class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in org.apache.juneau.csv">CsvSerializerBuilder</a></dt>
@@ -36892,6 +37380,10 @@
 <dd>
 <div class="block">Splits a space-delimited string with optionally quoted arguments.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#splitQuoted-java.lang.String-boolean-">splitQuoted(String, boolean)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
+<dd>
+<div class="block">Same as <a href="org/apache/juneau/internal/StringUtils.html#splitQuoted-java.lang.String-"><code>StringUtils.splitQuoted(String)</code></a> but allows you to optionally keep the quote characters.</div>
+</dd>
 <dt><a href="org/apache/juneau/rest/springboot/SpringRestResourceResolver.html" title="class in org.apache.juneau.rest.springboot"><span class="typeNameLink">SpringRestResourceResolver</span></a> - Class in <a href="org/apache/juneau/rest/springboot/package-summary.html">org.apache.juneau.rest.springboot</a></dt>
 <dd>
 <div class="block">Implementation of a <a href="org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest"><code>RestResourceResolver</code></a> for resolving resource classes using Spring.</div>
@@ -37082,9 +37574,9 @@
 <dd>
 <div class="block">Start this application.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#startAsync--">startAsync()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#startAsync--">startAsync()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#startAsync-javax.servlet.ServletRequest-javax.servlet.ServletResponse-">startAsync(ServletRequest, ServletResponse)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#startAsync-javax.servlet.ServletRequest-javax.servlet.ServletResponse-">startAsync(ServletRequest, ServletResponse)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/jetty/JettyMicroservice.html#startConsole--">startConsole()</a></span> - Method in class org.apache.juneau.microservice.jetty.<a href="org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a></dt>
 <dd>&nbsp;</dd>
@@ -37102,6 +37594,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.html#startup-org.apache.juneau.rest.RestContextBuilder-">startup(RestContextBuilder)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.rest.<a href="org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.html" title="class in org.apache.juneau.examples.rest.petstore.rest">PetStoreResource</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">StateMachineState</span></a> - Enum in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></dt>
+<dd>
+<div class="block">Enums for state-machine states.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.StaticFile.html#StaticFile-org.apache.juneau.http.StreamResource-">StaticFile(StreamResource)</a></span> - Constructor for class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.StaticFile.html" title="class in org.apache.juneau.rest">RestContext.StaticFile</a></dt>
 <dd>
 <div class="block">Constructor.</div>
@@ -37362,6 +37858,12 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">StringMatcherFactory</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/StringMatcherFactory.html#StringMatcherFactory--">StringMatcherFactory()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> - Class in <a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></dt>
 <dd>
 <div class="block">An encapsulated MessageFormat-style string and arguments.</div>
@@ -37403,6 +37905,10 @@
 <dd>
 <div class="block">Serializes the specified object as a JSON string value.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#strip-java.lang.String-">strip(String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
+<dd>
+<div class="block">Strips the first and last character from a string.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/html5/HtmlBuilder.html#strong--">strong()</a></span> - Static method in class org.apache.juneau.dto.html5.<a href="org/apache/juneau/dto/html5/HtmlBuilder.html" title="class in org.apache.juneau.dto.html5">HtmlBuilder</a></dt>
 <dd>
 <div class="block">Creates an empty <a href="org/apache/juneau/dto/html5/Strong.html" title="class in org.apache.juneau.dto.html5"><code>Strong</code></a> element.</div>
@@ -38211,7 +38717,7 @@
 <dd>
 <div class="block">Sets the value for the <code>TE</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#te-java.lang.Object-">te(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#te-java.lang.Object-">te(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>TE</code> header value on the request.</div>
 </dd>
@@ -38462,6 +38968,14 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transforms/DateSwap.TimeLong.html#TimeLong--">TimeLong()</a></span> - Constructor for class org.apache.juneau.transforms.<a href="org/apache/juneau/transforms/DateSwap.TimeLong.html" title="class in org.apache.juneau.transforms">DateSwap.TimeLong</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">TimeMatcherFactory</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">TODO</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/TimeMatcherFactory.html#TimeMatcherFactory--">TimeMatcherFactory()</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transforms/CalendarSwap.TimeMedium.html#TimeMedium--">TimeMedium()</a></span> - Constructor for class org.apache.juneau.transforms.<a href="org/apache/juneau/transforms/CalendarSwap.TimeMedium.html" title="class in org.apache.juneau.transforms">CalendarSwap.TimeMedium</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transforms/DateSwap.TimeMedium.html#TimeMedium--">TimeMedium()</a></span> - Constructor for class org.apache.juneau.transforms.<a href="org/apache/juneau/transforms/DateSwap.TimeMedium.html" title="class in org.apache.juneau.transforms">DateSwap.TimeMedium</a></dt>
@@ -39139,6 +39653,10 @@
 <dd>
 <div class="block">Trims the specified string if <a href="org/apache/juneau/serializer/SerializerSession.html#isTrimStrings--"><code>SerializerSession.isTrimStrings()</code></a> returns <jk>true</jk>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/util/RestUtils.html#trimContextPath-java.lang.String-java.lang.String-">trimContextPath(String, String)</a></span> - Static method in class org.apache.juneau.rest.util.<a href="org/apache/juneau/rest/util/RestUtils.html" title="class in org.apache.juneau.rest.util">RestUtils</a></dt>
+<dd>
+<div class="block">If the specified path-info starts with the specified context path, trims the context path from the path info.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerBuilder.html#trimEmptyCollections-boolean-">trimEmptyCollections(boolean)</a></span> - Method in class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in org.apache.juneau.csv">CsvSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/csv/CsvSerializerBuilder.html#trimEmptyCollections--">trimEmptyCollections()</a></span> - Method in class org.apache.juneau.csv.<a href="org/apache/juneau/csv/CsvSerializerBuilder.html" title="class in org.apache.juneau.csv">CsvSerializerBuilder</a></dt>
@@ -40160,7 +40678,19 @@
 <dd>
 <div class="block">Convenience method for specifying UON as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#uon--">uon()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#uon--">uon()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#uon--">uon()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#uon--">uon()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#uon--">uon()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.</div>
 </dd>
@@ -40390,8 +40920,6 @@
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html#upgrade-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-org.apache.http.protocol.HttpContext-">upgrade(HttpClientConnection, HttpRoute, HttpContext)</a></span> - Method in class org.apache.juneau.rest.client.mock.<a href="org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.client.mock">Moc [...]
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#upgrade-java.lang.Object-">upgrade(Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Sets the value for the <code>Upgrade</code> request header.</div>
@@ -40400,9 +40928,11 @@
 <dd>
 <div class="block">Sets the value for the <code>Upgrade</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#upgrade-java.lang.Class-">upgrade(Class&lt;T&gt;)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html#upgrade-org.apache.http.HttpClientConnection-org.apache.http.conn.routing.HttpRoute-org.apache.http.protocol.HttpContext-">upgrade(HttpClientConnection, HttpRoute, HttpContext)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockHttpClientConnectionManager.html" title="class in org.apache.juneau.rest.mock2">MockHttpClientConnectionMan [...]
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#upgrade-java.lang.Object-">upgrade(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#upgrade-java.lang.Class-">upgrade(Class&lt;T&gt;)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#upgrade-java.lang.Object-">upgrade(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Upgrade</code> header value on the request.</div>
 </dd>
@@ -40478,7 +41008,7 @@
 <dd>
 <div class="block">Sets the URI for this call.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#uri-java.lang.String-">uri(String)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#uri-java.lang.String-">uri(String)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -40737,7 +41267,19 @@
 <dd>
 <div class="block">Convenience method for specifying URL-Encoding as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#urlEnc--">urlEnc()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#urlEnc--">urlEnc()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#urlEnc--">urlEnc()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#urlEnc--">urlEnc()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#urlEnc--">urlEnc()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.</div>
 </dd>
@@ -41278,7 +41820,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#userAgent-java.lang.String-">userAgent(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#userAgent-java.lang.Object-">userAgent(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#userAgent-java.lang.Object-">userAgent(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>User-Agent</code> header value on the request.</div>
 </dd>
@@ -41296,7 +41838,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/examples/rest/petstore/dto/User.html#username-java.lang.String-">username(String)</a></span> - Method in class org.apache.juneau.examples.rest.petstore.dto.<a href="org/apache/juneau/examples/rest/petstore/dto/User.html" title="class in org.apache.juneau.examples.rest.petstore.dto">User</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#userPrincipal-java.security.Principal-">userPrincipal(Principal)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#userPrincipal-java.security.Principal-">userPrincipal(Principal)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Fluent setter.</div>
 </dd>
@@ -41584,6 +42126,10 @@
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StateMachineState.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.internal.<a href="org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfCollectionFormat.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -41592,6 +42138,10 @@
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/Equality.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/PropertyType.html" title="enum in org.apache.juneau">PropertyType</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -41730,6 +42280,11 @@ the order they are declared.</div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StateMachineState.html#values--">values()</a></span> - Static method in enum org.apache.juneau.internal.<a href="org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/WrappedMap.html#values--">values()</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/WrappedMap.html" title="class in org.apache.juneau.internal">WrappedMap</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfCollectionFormat.html#values--">values()</a></span> - Static method in enum org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a></dt>
@@ -41742,6 +42297,11 @@ the order they are declared.</div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/Equality.html#values--">values()</a></span> - Static method in enum org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyType.html#values--">values()</a></span> - Static method in enum org.apache.juneau.<a href="org/apache/juneau/PropertyType.html" title="enum in org.apache.juneau">PropertyType</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -41990,6 +42550,18 @@ the order they are declared.</div>
 <dd>
 <div class="block">Specifies the list of columns to view.</div>
 </dd>
+<dt><a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">ViewArgs</span></a> - Class in <a href="org/apache/juneau/pojotools/package-summary.html">org.apache.juneau.pojotools</a></dt>
+<dd>
+<div class="block">Encapsulates arguments for the <a href="org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><code>PojoViewer</code></a> class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/ViewArgs.html#ViewArgs-java.lang.String...-">ViewArgs(String...)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/pojotools/ViewArgs.html#ViewArgs-java.util.Collection-">ViewArgs(Collection&lt;String&gt;)</a></span> - Constructor for class org.apache.juneau.pojotools.<a href="org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a></dt>
+<dd>
+<div class="block">Constructor.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/DirectoryResource.html#viewFile-org.apache.juneau.rest.RestResponse-java.lang.String-">viewFile(RestResponse, String)</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources">DirectoryResource</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogsResource.html#viewFile-org.apache.juneau.rest.RestResponse-java.lang.String-boolean-java.lang.String-java.lang.String-java.lang.String-java.lang.String:A-java.lang.String:A-">viewFile(RestResponse, String, boolean, String, String, String, String[], String[])</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.html" title=" [...]
@@ -42036,7 +42608,7 @@ the order they are declared.</div>
 <dd>
 <div class="block">Sets the value for the <code>Warning</code> request header.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#warning-java.lang.Object-">warning(Object)</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#warning-java.lang.Object-">warning(Object)</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Specifies the <code>Warning</code> header value on the request.</div>
 </dd>
@@ -42418,7 +42990,19 @@ the order they are declared.</div>
 <dd>
 <div class="block">Convenience method for specifying XML as the transmission media type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#xml--">xml()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRemoteResource.html#xml--">xml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRemoteResource.html" title="class in org.apache.juneau.rest.mock2">MockRemoteResource</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#xml--">xml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRestClient.html#xml--">xml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRestClient.html" title="class in org.apache.juneau.rest.mock2">MockRestClient</a></dt>
+<dd>
+<div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#xml--">xml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.</div>
 </dd>
@@ -42743,7 +43327,11 @@ the order they are declared.</div>
 </a>
 <h2 class="title">Y</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock/MockServletRequest.html#yaml--">yaml()</a></span> - Method in class org.apache.juneau.rest.mock.<a href="org/apache/juneau/rest/mock/MockServletRequest.html" title="class in org.apache.juneau.rest.mock">MockServletRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockRest.Builder.html#yaml--">yaml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockRest.Builder.html" title="class in org.apache.juneau.rest.mock2">MockRest.Builder</a></dt>
+<dd>
+<div class="block">Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/yaml"</js>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/mock2/MockServletRequest.html#yaml--">yaml()</a></span> - Method in class org.apache.juneau.rest.mock2.<a href="org/apache/juneau/rest/mock2/MockServletRequest.html" title="class in org.apache.juneau.rest.mock2">MockServletRequest</a></dt>
 <dd>
 <div class="block">Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/yaml"</js>.</div>
 </dd>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/FormattedRuntimeException.html b/content/site/apidocs-8.0.1/org/apache/juneau/FormattedRuntimeException.html
index e6d9c50..32dea7e 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/FormattedRuntimeException.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/FormattedRuntimeException.html
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau">BeanRuntimeException</a>, <a href="../../../org/apache/juneau/ClassMetaRuntimeException.html" title="class in org.apache.juneau">ClassMetaRuntimeException</a>, <a href="../../../org/apache/juneau/ConfigException.html" title="class in org.apache.juneau">ConfigException</a>, <a href="../../../org/apache/juneau/ContextRuntimeException.html" title="class in org.apache.juneau">ContextRuntimeE [...]
+<dd><a href="../../../org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau">BeanRuntimeException</a>, <a href="../../../org/apache/juneau/ClassMetaRuntimeException.html" title="class in org.apache.juneau">ClassMetaRuntimeException</a>, <a href="../../../org/apache/juneau/ConfigException.html" title="class in org.apache.juneau">ConfigException</a>, <a href="../../../org/apache/juneau/ContextRuntimeException.html" title="class in org.apache.juneau">ContextRuntimeE [...]
 </dl>
 <hr>
 <br>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html
index 9ba1228..b2703bf 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html
@@ -163,19 +163,22 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript</a></span>(<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)</code>
 <div class="block">Optional Javascript to execute immediately before a menu item is shown.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></span>(<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)</code>
 <div class="block">The content of the popup.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></span>(<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)</code>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 </td>
 </tr>
@@ -185,14 +188,14 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript</a>, <a href="../../../../../../../org/apache/junea [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getHtml</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getScript-org.apache.juneau.rest.Res [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.widget.Widget">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -232,21 +235,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getLabel-org.apache.juneau.rest.RestRequest-">
+<a name="getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabel</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#line.32">getLabel</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#line.32">getLabel</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)
                 throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The menu item label.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -254,15 +259,16 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </dl>
 </li>
 </ul>
-<a name="getBeforeShowScript-org.apache.juneau.rest.RestRequest-">
+<a name="getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeforeShowScript</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#line.37">getBeforeShowScript</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddOrderMenuItem.html#line.37">getBeforeShowScript</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)
                            throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">Optional Javascript to execute immediately before a menu item is shown.
 
  <p>
@@ -305,9 +311,10 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
  </p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
+<dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Javascript code to execute, or <jk>null</jk> if there isn't any.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -315,21 +322,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </dl>
 </li>
 </ul>
-<a name="getContent-org.apache.juneau.rest.RestRequest-">
+<a name="getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getContent</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#line.42">getContent</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/AddOrderMenuItem.html#line.42">getContent</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)
                   throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The content of the popup.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The content of the popup.
    <br>Can be any of the following types:
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html
index d2b6824..3dce806 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html
@@ -163,13 +163,15 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></span>(<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)</code>
 <div class="block">The content of the popup.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddPetMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></span>(<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)</code>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 </td>
 </tr>
@@ -179,14 +181,14 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml</a>, <a href="../../../../../.. [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org. [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.widget.Widget">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -226,21 +228,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getLabel-org.apache.juneau.rest.RestRequest-">
+<a name="getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabel</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddPetMenuItem.html#line.32">getLabel</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/AddPetMenuItem.html#line.32">getLabel</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)
                 throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The menu item label.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -248,21 +252,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </dl>
 </li>
 </ul>
-<a name="getContent-org.apache.juneau.rest.RestRequest-">
+<a name="getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getContent</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#line.37">getContent</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/AddPetMenuItem.html#line.37">getContent</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)
                   throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The content of the popup.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The content of the popup.
    <br>Can be any of the following types:
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html
index ebdf2c5..cd0ac01 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html
@@ -163,13 +163,15 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></span>(<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)</code>
 <div class="block">The content of the popup.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></span>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></span>(<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)</code>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 </td>
 </tr>
@@ -179,14 +181,14 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-">getBeforeShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml</a>, <a href="../../../../../.. [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getAfterShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getAfterShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getBeforeShowScript-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getBeforeShowScript</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getHtml-org. [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.widget.Widget">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.rest.widget.<a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3>
-<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
+<code><a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getClasspathResourceAsString-java.lang.String-java.util.Locale-">getClasspathResourceAsString</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../../../org/apache/juneau/rest/widget/Widge [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -226,21 +228,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getLabel-org.apache.juneau.rest.RestRequest-">
+<a name="getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabel</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/UploadPhotoMenuItem.html#line.32">getLabel</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/examples/rest/petstore/rest/UploadPhotoMenuItem.html#line.32">getLabel</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)
                 throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The label for the menu item as it's rendered in the menu bar.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getLabel-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getLabel</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The menu item label.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -248,21 +252,23 @@ extends <a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidg
 </dl>
 </li>
 </ul>
-<a name="getContent-org.apache.juneau.rest.RestRequest-">
+<a name="getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getContent</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#line.37">getContent</a>(<a href="../../../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../../../src-html/org/apache/juneau/examples/rest/petstore/rest/UploadPhotoMenuItem.html#line.37">getContent</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)
                   throws <a href="http://docs.oracle.com/javase/8/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/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">MenuItemWidget</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">MenuItemWidget</a></code></span></div>
 <div class="block">The content of the popup.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
+<dd><code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">getContent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The HTTP request object.</dd>
+<dd><code>res</code> - The HTTP response object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The content of the popup.
    <br>Can be any of the following types:
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/http/HttpMethodName.html b/content/site/apidocs-8.0.1/org/apache/juneau/http/HttpMethodName.html
index e5b0b0c..6371228 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/http/HttpMethodName.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/http/HttpMethodName.html
@@ -166,23 +166,29 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/http/HttpMethodName.html#PATCH">PATCH</a></span></code>
+<div class="block"><a class='doclink' href='https://tools.ietf.org/html/rfc5789'>PATCH</a></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/http/HttpMethodName.html#POST">POST</a></span></code>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5'>POST</a></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/http/HttpMethodName.html#PUT">PUT</a></span></code>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6'>PUT</a></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/http/HttpMethodName.html#RRPC">RRPC</a></span></code>
 <div class="block">Special case for a REST method that implements a REST-RPC interface.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/http/HttpMethodName.html#TRACE">TRACE</a></span></code>
 <div class="block"><a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8'>TRACE</a></div>
@@ -347,13 +353,27 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="PATCH">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>PATCH</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/http/HttpMethodName.html#line.50">PATCH</a></pre>
+<div class="block"><a class='doclink' href='https://tools.ietf.org/html/rfc5789'>PATCH</a></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.juneau.http.HttpMethodName.PATCH">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="RRPC">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>RRPC</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/http/HttpMethodName.html#line.50">RRPC</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/http/HttpMethodName.html#line.53">RRPC</a></pre>
 <div class="block">Special case for a REST method that implements a REST-RPC interface.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -367,7 +387,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>OTHER</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/http/HttpMethodName.html#line.53">OTHER</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/http/HttpMethodName.html#line.56">OTHER</a></pre>
 <div class="block">A non-standard value.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateBeanMap.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateBeanMap.html
index fb0b447..a7a0020 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateBeanMap.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateBeanMap.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="type parameter in DelegateBeanMap">T</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html#filterKeys-java.util.List-">filterKeys</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;keys)</code>
 <div class="block">Remove all but the specified properties from this bean map.</div>
 </td>
@@ -462,7 +462,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <ul class="blockList">
 <li class="blockList">
 <h4>filterKeys</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.82">filterKeys</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;keys)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="type parameter in DelegateBeanMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.83">filterKeys</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or inter [...]
 <div class="block">Remove all but the specified properties from this bean map.
 
  <p>
@@ -470,6 +470,8 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>keys</code> - The remaining keys in the bean map (in the specified order).</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
 </dl>
 </li>
 </ul>
@@ -479,7 +481,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <ul class="blockList">
 <li class="blockList">
 <h4>remove</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.88">remove</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.90">remove</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true#remove-java.lang.Object-" title="class or interface in java.util">remove</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a h [...]
@@ -494,7 +496,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <ul class="blockList">
 <li class="blockList">
 <h4>getMeta</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="type parameter in DelegateBeanMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.94">getMeta</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="type parameter in DelegateBeanMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.96">getMeta</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanMap.html#getMeta--">BeanMap</a></code></span></div>
 <div class="block">Returns the metadata associated with this bean map.</div>
 <dl>
@@ -511,7 +513,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <ul class="blockList">
 <li class="blockList">
 <h4>entrySet</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/ [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/ [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanMap.html#entrySet--">BeanMap</a></code></span></div>
 <div class="block">Returns all the properties associated with the bean.</div>
 <dl>
@@ -530,7 +532,7 @@ extends <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getProperties</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.115">getProperties</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateBeanMap.html#line.117">getProperties</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanMap.html#getProperties--">BeanMap</a></code></span></div>
 <div class="block">Returns a simple collection of properties for this bean map.</div>
 <dl>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateMap.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateMap.html
index 1054fd8..fa0b42c 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateMap.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/DelegateMap.html
@@ -92,7 +92,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.juneau.internal</div>
-<h2 title="Class DelegateMap" class="title">Class DelegateMap&lt;T&gt;</h2>
+<h2 title="Class DelegateMap" class="title">Class DelegateMap&lt;T extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&gt;</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -136,7 +136,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.24">DelegateMap</a>&lt;T&gt;
+<pre>public class <a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.25">DelegateMap</a>&lt;T extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&gt;
 extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>
 implements <a href="../../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau">Delegate</a>&lt;T&gt;</pre>
 <div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> where entries in the map can be removed without affecting the underlying map.</div>
@@ -192,7 +192,8 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <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/internal/DelegateMap.html#DelegateMap-org.apache.juneau.ClassMeta-">DelegateMap</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;&nbsp;classMeta)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/DelegateMap.html#DelegateMap-T-org.apache.juneau.BeanSession-">DelegateMap</a></span>(<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&nbsp;m,
+           <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -212,7 +213,7 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/DelegateMap.html#filterKeys-java.util.List-">filterKeys</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;keys)</code>
 <div class="block">Remove all but the specified keys from this map.</div>
 </td>
@@ -280,17 +281,21 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DelegateMap-org.apache.juneau.ClassMeta-">
+<a name="DelegateMap-java.util.Map-org.apache.juneau.BeanSession-">
+<!--   -->
+</a><a name="DelegateMap-T-org.apache.juneau.BeanSession-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DelegateMap</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.34">DelegateMap</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;&nbsp;classMeta)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.36">DelegateMap</a>(<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&nbsp;m,
+                   <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>classMeta</code> - The metadata object that created this delegate object.</dd>
+<dd><code>m</code> - The metadata object that created this delegate object.</dd>
+<dd><code>session</code> - </dd>
 </dl>
 </li>
 </ul>
@@ -308,12 +313,12 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <ul class="blockList">
 <li class="blockList">
 <h4>getClassMeta</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.39">getClassMeta</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.43">getClassMeta</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/apache/juneau/Delegate.html#getClassMeta--">Delegate</a></code></span></div>
 <div class="block">The <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> of the class of the represented object.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/Delegate.html#getClassMeta--">getClassMeta</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau">Delegate</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;</code></dd>
+<dd><code><a href="../../../../org/apache/juneau/Delegate.html#getClassMeta--">getClassMeta</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau">Delegate</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a [...]
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The class type of the represented object.</dd>
 </dl>
@@ -325,7 +330,7 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <ul class="blockListLast">
 <li class="blockList">
 <h4>filterKeys</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.51">filterKeys</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;keys)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a>&lt;<a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="type parameter in DelegateMap">T</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/DelegateMap.html#line.56">filterKeys</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">L [...]
 <div class="block">Remove all but the specified keys from this map.
 
  <p>
@@ -333,6 +338,8 @@ implements <a href="../../../../org/apache/juneau/Delegate.html" title="interfac
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>keys</code> - The remaining keys in the map (in the specified order).</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
 </dl>
 </li>
 </ul>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/ObjectUtils.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/ObjectUtils.html
index 5eecc23..07a6ce1 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/ObjectUtils.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/ObjectUtils.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -280,55 +280,62 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#compare-java.lang.Object-java.lang.Object-">compare</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o1,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o2)</code>
+<div class="block">Compares two objects for equality.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#equals-java.lang.Object-java.lang.Object-">equals</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o1,
       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o2)</code>
 <div class="block">Returns <jk>true</jk> if the specified objects are equal.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#firstNonEmpty-T...-">firstNonEmpty</a></span>(T...&nbsp;o)</code>
 <div class="block">Returns the first non-empty value in the list of objects.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#firstNonNull-T...-">firstNonNull</a></span>(T...&nbsp;t)</code>
 <div class="block">Returns the first non-null value in the specified array</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#firstNonZero-int...-">firstNonZero</a></span>(int...&nbsp;ints)</code>
 <div class="block">Returns the first non-zero value in the list of ints.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;?&gt;[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#getEnumConstants-java.lang.Class-">getEnumConstants</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;c)</code>
 <div class="block">Returns the enum names for the specified enum class.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#isEmpty-java.lang.Object-">isEmpty</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Returns <jk>true</jk> if the specified object is empty.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toBoolean-java.lang.Object-">toBoolean</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Converts an object to a Boolean.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toInteger-java.lang.Object-">toInteger</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Converts an object to an Integer.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toMemberType-java.lang.Object-java.lang.Object-java.lang.Class-">toMemberType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;outer,
             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
@@ -336,20 +343,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Converts the specified object to the specified type.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toNumber-java.lang.Object-">toNumber</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Converts an object to a Number.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toType-java.lang.Object-java.lang.Class-">toType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</code>
 <div class="block">Converts the specified object to the specified type.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#toType-java.lang.Object-java.lang.Class-java.lang.reflect.Type...-">toType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type,
@@ -637,7 +644,7 @@ public static&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apach
 </a><a name="firstNonEmpty-T...-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>firstNonEmpty</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/SafeVarargs.html?is-external=true" title="class or interface in java.lang">@SafeVarargs</a>
@@ -651,6 +658,28 @@ public static&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apach
 </dl>
 </li>
 </ul>
+<a name="compare-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>compare</h4>
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.367">compare</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o1,
+                          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o2)</pre>
+<div class="block">Compares two objects for equality.
+
+ <p>
+ Nulls are always considered less-than unless both are null.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o1</code> - Object 1.</dd>
+<dd><code>o2</code> - Object 2.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>-1</code>, <code>0</code>, or <code>1</code> if <code>o1</code> is less-than, equal, or greater-than <code>o2</code>.
+   <br><code>0</code> if objects are not of the same type or do not implement the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang"><code>Comparable</code></a> interface.</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/SimpleMap.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/SimpleMap.html
index 7eed95a..fdb0b58 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/SimpleMap.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/SimpleMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/internal/SimpleMap.html" target="_top">Frames</a></li>
@@ -356,7 +356,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/AbstractMap.
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/internal/SimpleMap.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/StateMachineState.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StateMachineState.html
new file mode 100644
index 0000000..046328b
--- /dev/null
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StateMachineState.html
@@ -0,0 +1,557 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>StateMachineState (Apache Juneau 8.0.1)</title>
+<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="StateMachineState (Apache Juneau 8.0.1)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/internal/StateMachineState.html" target="_top">Frames</a></li>
+<li><a href="StateMachineState.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.internal</div>
+<h2 title="Enum StateMachineState" class="title">Enum StateMachineState</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/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="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.internal.StateMachineState</li>
+</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/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.19">StateMachineState</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>&gt;</pre>
+<div class="block">Enums for state-machine states.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S01">S01</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S02">S02</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S03">S03</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S04">S04</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S05">S05</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S06">S06</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S07">S07</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S08">S08</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S09">S09</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S10">S10</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S11">S11</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S12">S12</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S13">S13</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S14">S14</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S15">S15</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S16">S16</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S17">S17</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S18">S18</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S19">S19</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#S20">S20</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StateMachineState.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://do [...]
+</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/8/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/8/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/8/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/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.or [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="S01">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S01</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S01</a></pre>
+</li>
+</ul>
+<a name="S02">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S02</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S02</a></pre>
+</li>
+</ul>
+<a name="S03">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S03</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S03</a></pre>
+</li>
+</ul>
+<a name="S04">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S04</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S04</a></pre>
+</li>
+</ul>
+<a name="S05">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S05</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S05</a></pre>
+</li>
+</ul>
+<a name="S06">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S06</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S06</a></pre>
+</li>
+</ul>
+<a name="S07">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S07</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S07</a></pre>
+</li>
+</ul>
+<a name="S08">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S08</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S08</a></pre>
+</li>
+</ul>
+<a name="S09">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S09</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S09</a></pre>
+</li>
+</ul>
+<a name="S10">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S10</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S10</a></pre>
+</li>
+</ul>
+<a name="S11">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S11</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S11</a></pre>
+</li>
+</ul>
+<a name="S12">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S12</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S12</a></pre>
+</li>
+</ul>
+<a name="S13">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S13</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S13</a></pre>
+</li>
+</ul>
+<a name="S14">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S14</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S14</a></pre>
+</li>
+</ul>
+<a name="S15">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S15</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S15</a></pre>
+</li>
+</ul>
+<a name="S16">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S16</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S16</a></pre>
+</li>
+</ul>
+<a name="S17">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S17</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S17</a></pre>
+</li>
+</ul>
+<a name="S18">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S18</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S18</a></pre>
+</li>
+</ul>
+<a name="S19">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>S19</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S19</a></pre>
+</li>
+</ul>
+<a name="S20">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>S20</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a> <a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.20">S20</a></pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.19">values</a>()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (StateMachineState c : StateMachineState.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StateMachineState.html#line.19">valueOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/internal/StateMachineState.html" target="_top">Frames</a></li>
+<li><a href="StateMachineState.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2019 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringBuilderWriter.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringBuilderWriter.html
index a48653d..02ea1f8 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringBuilderWriter.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringBuilderWriter.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -486,7 +486,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringUtils.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringUtils.html
index 532b221..4d21246 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringUtils.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/StringUtils.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9,"i57":9,"i58":9,"i59":9,"i60":9 [...]
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9,"i57":9,"i58":9,"i59":9,"i60":9 [...]
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -646,38 +646,47 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i76" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#replaceChars-java.lang.String-char-char-boolean-">replaceChars</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+            char&nbsp;from,
+            char&nbsp;to,
+            boolean&nbsp;ignoreEscapedChars)</code>
+<div class="block">Replaces tokens in a string with a different token.</div>
+</td>
+</tr>
+<tr id="i77" class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#replaceUnicodeSequences-java.lang.String-">replaceUnicodeSequences</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Replaces <js>"\\uXXXX"</js> character sequences with their unicode characters.</div>
 </td>
 </tr>
-<tr id="i77" class="rowColor">
+<tr id="i78" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#replaceVars-java.lang.String-java.util.Map-">replaceVars</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
            <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;m)</code>
 <div class="block">Simple utility for replacing variables of the form <js>"{key}"</js> with values in the specified map.</div>
 </td>
 </tr>
-<tr id="i78" class="altColor">
+<tr id="i79" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#split-java.lang.String-">split</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Shortcut for calling <code>split(s, <js>','</js>)</code></div>
 </td>
 </tr>
-<tr id="i79" class="rowColor">
+<tr id="i80" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#split-java.lang.String:A-char-">split</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;s,
      char&nbsp;c)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#split-java.lang.String-char-"><code>split(String, char)</code></a> except splits all strings in the input and returns a single result.</div>
 </td>
 </tr>
-<tr id="i80" class="altColor">
+<tr id="i81" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#split-java.lang.String-char-">split</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
      char&nbsp;c)</code>
 <div class="block">Splits a character-delimited string into a string array.</div>
 </td>
 </tr>
-<tr id="i81" class="rowColor">
+<tr id="i82" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#split-java.lang.String-char-int-">split</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
      char&nbsp;c,
@@ -685,161 +694,174 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#split-java.lang.String-char-"><code>split(String, char)</code></a> but limits the number of tokens returned.</div>
 </td>
 </tr>
-<tr id="i82" class="altColor">
+<tr id="i83" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#splitEqually-java.lang.String-int-">splitEqually</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
             int&nbsp;size)</code>
 <div class="block">Splits a string into equally-sized parts.</div>
 </td>
 </tr>
-<tr id="i83" class="rowColor">
+<tr id="i84" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#splitMap-java.lang.String-boolean-">splitMap</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
         boolean&nbsp;trim)</code>
 <div class="block">Splits a list of key-value pairs into an ordered map.</div>
 </td>
 </tr>
-<tr id="i84" class="altColor">
+<tr id="i85" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#splitQuoted-java.lang.String-">splitQuoted</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Splits a space-delimited string with optionally quoted arguments.</div>
 </td>
 </tr>
-<tr id="i85" class="rowColor">
+<tr id="i86" class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#splitQuoted-java.lang.String-boolean-">splitQuoted</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+           boolean&nbsp;keepQuotes)</code>
+<div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#splitQuoted-java.lang.String-"><code>splitQuoted(String)</code></a> but allows you to optionally keep the quote characters.</div>
+</td>
+</tr>
+<tr id="i87" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#startsWith-java.lang.String-char-">startsWith</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
           char&nbsp;c)</code>
 <div class="block">An efficient method for checking if a string starts with a character.</div>
 </td>
 </tr>
-<tr id="i86" class="altColor">
+<tr id="i88" class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#strip-java.lang.String-">strip</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
+<div class="block">Strips the first and last character from a string.</div>
+</td>
+</tr>
+<tr id="i89" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#toHex-byte:A-">toHex</a></span>(byte[]&nbsp;bytes)</code>
 <div class="block">Converts a byte array into a simple hexadecimal character string.</div>
 </td>
 </tr>
-<tr id="i87" class="rowColor">
+<tr id="i90" class="altColor">
 <td class="colFirst"><code>static char[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex2-int-">toHex2</a></span>(int&nbsp;num)</code>
 <div class="block">Converts the specified number into a 2 hexadecimal characters.</div>
 </td>
 </tr>
-<tr id="i88" class="altColor">
+<tr id="i91" class="rowColor">
 <td class="colFirst"><code>static char[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex4-int-">toHex4</a></span>(int&nbsp;num)</code>
 <div class="block">Converts the specified number into a 4 hexadecimal characters.</div>
 </td>
 </tr>
-<tr id="i89" class="rowColor">
+<tr id="i92" class="altColor">
 <td class="colFirst"><code>static char[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex8-long-">toHex8</a></span>(long&nbsp;num)</code>
 <div class="block">Converts the specified number into a 8 hexadecimal characters.</div>
 </td>
 </tr>
-<tr id="i90" class="altColor">
+<tr id="i93" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#toIsoDate-java.util.Calendar-">toIsoDate</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</code>
 <div class="block">Converts the specified object to an ISO8601 date string.</div>
 </td>
 </tr>
-<tr id="i91" class="rowColor">
+<tr id="i94" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#toIsoDateTime-java.util.Calendar-">toIsoDateTime</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</code>
 <div class="block">Converts the specified object to an ISO8601 date-time string.</div>
 </td>
 </tr>
-<tr id="i92" class="altColor">
+<tr id="i95" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#toLowerCase-java.lang.String-">toLowerCase</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Null-safe <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#toLowerCase--" title="class or interface in java.lang"><code>String.toLowerCase()</code></a>.</div>
 </td>
 </tr>
-<tr id="i93" class="rowColor">
+<tr id="i96" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#toSpacedHex-byte:A-">toSpacedHex</a></span>(byte[]&nbsp;bytes)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex-byte:A-"><code>toHex(byte[])</code></a> but puts spaces between the byte strings.</div>
 </td>
 </tr>
-<tr id="i94" class="altColor">
+<tr id="i97" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#toURI-java.lang.Object-">toURI</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Converts the specified object to a URI.</div>
 </td>
 </tr>
-<tr id="i95" class="rowColor">
+<tr id="i98" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#trim-java.lang.String-">trim</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#trim--" title="class or interface in java.lang"><code>String.trim()</code></a> but prevents <code>NullPointerExceptions</code>.</div>
 </td>
 </tr>
-<tr id="i96" class="altColor">
+<tr id="i99" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#trimEnd-java.lang.String-">trimEnd</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Trims whitespace characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i97" class="rowColor">
+<tr id="i100" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#trimSlashes-java.lang.String-">trimSlashes</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from both the start and end of the specified string.</div>
 </td>
 </tr>
-<tr id="i98" class="altColor">
+<tr id="i101" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#trimStart-java.lang.String-">trimStart</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Trims whitespace characters from the beginning of the specified string.</div>
 </td>
 </tr>
-<tr id="i99" class="rowColor">
+<tr id="i102" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#trimTrailingSlashes-java.lang.String-">trimTrailingSlashes</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i100" class="altColor">
+<tr id="i103" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/StringUtils.html#trimTrailingSlashes-java.lang.StringBuffer-">trimTrailingSlashes</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a>&nbsp;s)</code>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 </td>
 </tr>
-<tr id="i101" class="rowColor">
+<tr id="i104" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#unEscapeChars-java.lang.String-org.apache.juneau.internal.AsciiSet-">unEscapeChars</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
              <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a>&nbsp;escaped)</code>
 <div class="block">Removes escape characters from the specified characters.</div>
 </td>
 </tr>
-<tr id="i102" class="altColor">
+<tr id="i105" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#unicodeSequence-char-">unicodeSequence</a></span>(char&nbsp;c)</code>
 <div class="block">Creates an escaped-unicode sequence (e.g.</div>
 </td>
 </tr>
-<tr id="i103" class="rowColor">
+<tr id="i106" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#urlDecode-java.lang.String-">urlDecode</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 </td>
 </tr>
-<tr id="i104" class="altColor">
+<tr id="i107" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#urlEncode-java.lang.Object-">urlEncode</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Shortcut for calling <code>URLEncoder.<jsm>encode</jsm>(o.toString(), <js>"UTF-8"</js>)</code>.</div>
 </td>
 </tr>
-<tr id="i105" class="rowColor">
+<tr id="i108" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#urlEncode-java.lang.String-">urlEncode</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 </td>
 </tr>
-<tr id="i106" class="altColor">
+<tr id="i109" class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#urlEncodeLax-java.lang.String-">urlEncodeLax</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.String-"><code>urlEncode(String)</code></a> except only escapes characters that absolutely need to be escaped.</div>
 </td>
 </tr>
-<tr id="i107" class="rowColor">
+<tr id="i110" class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#urlEncodePath-java.lang.Object-">urlEncodePath</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Similar to <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.Object-"><code>urlEncode(Object)</code></a> but doesn't encode <js>"/"</js> characters.</div>
@@ -1449,13 +1471,32 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="splitQuoted-java.lang.String-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>splitQuoted</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.787">splitQuoted</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+                                   boolean&nbsp;keepQuotes)</pre>
+<div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#splitQuoted-java.lang.String-"><code>splitQuoted(String)</code></a> but allows you to optionally keep the quote characters.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The input string.</dd>
+<dd><code>keepQuotes</code> - If <jk>true</jk>, quote characters are kept on the tokens.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The results, or <jk>null</jk> if the input was <jk>null</jk>.
+   <br>An empty string results in an empty array.</dd>
+</dl>
+</li>
+</ul>
 <a name="isEmpty-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isEmpty</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.851">isEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.864">isEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if specified string is <jk>null</jk> or empty.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1471,7 +1512,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isEmpty</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.863">isEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.876">isEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if specified string is <jk>null</jk> or it's <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a> method returns an empty
  string.</div>
 <dl>
@@ -1488,7 +1529,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isNotEmpty</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.873">isNotEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.886">isNotEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if specified string is not <jk>null</jk> or empty.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1504,7 +1545,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isNotEmpty</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.885">isNotEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.898">isNotEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if specified string is not <jk>null</jk> or it's <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a> method doesn't return an empty
  string.</div>
 <dl>
@@ -1521,7 +1562,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>nullIfEmpty</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.895">nullIfEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.908">nullIfEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>null</jk> if the specified string is <jk>null</jk> or empty.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1537,7 +1578,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>emptyIfNull</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.907">emptyIfNull</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.920">emptyIfNull</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns an empty string if the specified string is <jk>null</jk>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1553,7 +1594,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>emptyIfNull</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.919">emptyIfNull</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.932">emptyIfNull</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Returns an empty string if the specified object is <jk>null</jk>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1569,7 +1610,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unEscapeChars</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.933">unEscapeChars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.946">unEscapeChars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                    <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a>&nbsp;escaped)</pre>
 <div class="block">Removes escape characters from the specified characters.</div>
 <dl>
@@ -1587,7 +1628,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>escapeChars</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.969">escapeChars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.982">escapeChars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                  <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a>&nbsp;escaped)</pre>
 <div class="block">Escapes the specified characters in the string.</div>
 <dl>
@@ -1605,7 +1646,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>decodeHex</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.996">decodeHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1009">decodeHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Debug method for rendering non-ASCII character sequences.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1621,7 +1662,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>startsWith</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1016">startsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1029">startsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                  char&nbsp;c)</pre>
 <div class="block">An efficient method for checking if a string starts with a character.</div>
 <dl>
@@ -1639,7 +1680,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>endsWith</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1032">endsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1045">endsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                char&nbsp;c)</pre>
 <div class="block">An efficient method for checking if a string ends with a character.</div>
 <dl>
@@ -1657,7 +1698,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>endsWith</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1048">endsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1061">endsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                char...&nbsp;c)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#endsWith-java.lang.String-char-"><code>endsWith(String, char)</code></a> except check for multiple characters.</div>
 <dl>
@@ -1675,7 +1716,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toHex2</h4>
-<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1067">toHex2</a>(int&nbsp;num)</pre>
+<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1080">toHex2</a>(int&nbsp;num)</pre>
 <div class="block">Converts the specified number into a 2 hexadecimal characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1691,7 +1732,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toHex4</h4>
-<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1084">toHex4</a>(int&nbsp;num)</pre>
+<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1097">toHex4</a>(int&nbsp;num)</pre>
 <div class="block">Converts the specified number into a 4 hexadecimal characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1707,7 +1748,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toHex8</h4>
-<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1103">toHex8</a>(long&nbsp;num)</pre>
+<pre>public static final&nbsp;char[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1116">toHex8</a>(long&nbsp;num)</pre>
 <div class="block">Converts the specified number into a 8 hexadecimal characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1723,7 +1764,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isEquals</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1123">isEquals</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1136">isEquals</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s2)</pre>
 <div class="block">Tests two strings for equality, but gracefully handles nulls.</div>
 <dl>
@@ -1741,7 +1782,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isNotEquals</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1138">isNotEquals</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1151">isNotEquals</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
                                   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s2)</pre>
 <div class="block">Tests two strings for non-equality, but gracefully handles nulls.</div>
 <dl>
@@ -1759,7 +1800,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>base64EncodeToString</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1148">base64EncodeToString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1161">base64EncodeToString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
 <div class="block">Shortcut for calling <code>base64Encode(in.getBytes(<js>"UTF-8"</js>))</code></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1775,7 +1816,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>base64Encode</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1160">base64Encode</a>(byte[]&nbsp;in)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1173">base64Encode</a>(byte[]&nbsp;in)</pre>
 <div class="block">BASE64-encodes the specified byte array.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1791,7 +1832,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>base64DecodeToString</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1189">base64DecodeToString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1202">base64DecodeToString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
 <div class="block">Shortcut for calling <code>base64Decode(String)</code> and converting the result to a UTF-8 encoded string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1807,7 +1848,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>base64Decode</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1202">base64Decode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1215">base64Decode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;in)</pre>
 <div class="block">BASE64-decodes the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1823,7 +1864,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>generateUUID</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1263">generateUUID</a>(int&nbsp;numchars)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1276">generateUUID</a>(int&nbsp;numchars)</pre>
 <div class="block">Generated a random UUID with the specified number of characters.
 
  <p>
@@ -1855,7 +1896,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trim</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1281">trim</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1294">trim</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#trim--" title="class or interface in java.lang"><code>String.trim()</code></a> but prevents <code>NullPointerExceptions</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1865,13 +1906,29 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="strip-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>strip</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1306">strip</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<div class="block">Strips the first and last character from a string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The string to strip.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The striped string, or the same string if the input was <jk>null</jk> or less than length 2.</dd>
+</dl>
+</li>
+</ul>
 <a name="parseIsoDate-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parseIsoDate</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1298">parseIsoDate</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;date)
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1323">parseIsoDate</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;date)
                          throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></pre>
 <div class="block">Parses an ISO8601 string into a date.
 
@@ -1894,7 +1951,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseIsoCalendar</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1315">parseIsoCalendar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;date)
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1340">parseIsoCalendar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;date)
                                  throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></pre>
 <div class="block">Parses an ISO8601 string into a calendar.
 
@@ -1917,7 +1974,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toIsoDate</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1340">toIsoDate</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1365">toIsoDate</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</pre>
 <div class="block">Converts the specified object to an ISO8601 date string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1933,7 +1990,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toIsoDateTime</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1350">toIsoDateTime</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1375">toIsoDateTime</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a>&nbsp;c)</pre>
 <div class="block">Converts the specified object to an ISO8601 date-time string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1949,7 +2006,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>replaceVars</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1370">replaceVars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1395">replaceVars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;m)</pre>
 <div class="block">Simple utility for replacing variables of the form <js>"{key}"</js> with values in the specified map.
 
@@ -1976,7 +2033,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>pathStartsWith</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1442">pathStartsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1467">pathStartsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pathPrefix)</pre>
 <div class="block">Returns <jk>true</jk> if the specified path string is prefixed with the specified prefix.
 
@@ -2002,7 +2059,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>pathStartsWith</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1457">pathStartsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1482">pathStartsWith</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;pathPrefixes)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#pathStartsWith-java.lang.String-java.lang.String-"><code>pathStartsWith(String, String)</code></a> but returns <jk>true</jk> if at least one prefix matches.</div>
 <dl>
@@ -2020,7 +2077,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>replaceUnicodeSequences</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1470">replaceUnicodeSequences</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1495">replaceUnicodeSequences</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Replaces <js>"\\uXXXX"</js> character sequences with their unicode characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2036,7 +2093,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unicodeSequence</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1490">unicodeSequence</a>(char&nbsp;c)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1515">unicodeSequence</a>(char&nbsp;c)</pre>
 <div class="block">Creates an escaped-unicode sequence (e.g. <js>"\\u1234"</js>) for the specified character.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2052,7 +2109,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getField</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1514">getField</a>(int&nbsp;fieldNum,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1539">getField</a>(int&nbsp;fieldNum,
                               <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                               char&nbsp;delim)</pre>
 <div class="block">Returns the specified field in a delimited string without splitting the string.
@@ -2080,7 +2137,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getField</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1527">getField</a>(int&nbsp;fieldNum,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1552">getField</a>(int&nbsp;fieldNum,
                               <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                               char&nbsp;delim,
                               <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;def)</pre>
@@ -2102,7 +2159,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>asString</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1552">asString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1577">asString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Calls <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a> on the specified object if it's not null.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2118,7 +2175,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>asStrings</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1562">asStrings</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1587">asStrings</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;o)</pre>
 <div class="block">Converts an array of objects to an array of strings.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2134,7 +2191,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromHexToUTF8</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1579">fromHexToUTF8</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1604">fromHexToUTF8</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
 <div class="block">Converts a hexadecimal byte stream (e.g. "34A5BC") into a UTF-8 encoded string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2150,7 +2207,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromSpacedHexToUTF8</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1594">fromSpacedHexToUTF8</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1619">fromSpacedHexToUTF8</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
 <div class="block">Converts a space-deliminted hexadecimal byte stream (e.g. "34 A5 BC") into a UTF-8 encoded string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2166,7 +2223,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toHex</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1611">toHex</a>(byte[]&nbsp;bytes)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1636">toHex</a>(byte[]&nbsp;bytes)</pre>
 <div class="block">Converts a byte array into a simple hexadecimal character string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2182,7 +2239,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toSpacedHex</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1626">toSpacedHex</a>(byte[]&nbsp;bytes)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1651">toSpacedHex</a>(byte[]&nbsp;bytes)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#toHex-byte:A-"><code>toHex(byte[])</code></a> but puts spaces between the byte strings.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2198,7 +2255,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromHex</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1643">fromHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1668">fromHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
 <div class="block">Converts a hexadecimal character string to a byte array.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2214,7 +2271,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromSpacedHex</h4>
-<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1657">fromSpacedHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
+<pre>public static&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1682">fromSpacedHex</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;hex)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#fromHex-java.lang.String-"><code>fromHex(String)</code></a> except expects spaces between the byte strings.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2230,7 +2287,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>repeat</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1672">repeat</a>(int&nbsp;count,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1697">repeat</a>(int&nbsp;count,
                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</pre>
 <div class="block">Creates a repeated pattern.</div>
 <dl>
@@ -2248,7 +2305,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimStart</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1685">trimStart</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1710">trimStart</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Trims whitespace characters from the beginning of the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2264,7 +2321,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimEnd</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1698">trimEnd</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1723">trimEnd</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Trims whitespace characters from the end of the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2280,7 +2337,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isOneOf</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1716">isOneOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1741">isOneOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                               <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string is one of the specified values.</div>
 <dl>
@@ -2300,7 +2357,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimSlashes</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1729">trimSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1754">trimSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Trims <js>'/'</js> characters from both the start and end of the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2316,7 +2373,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimTrailingSlashes</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1745">trimTrailingSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1770">trimTrailingSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2332,7 +2389,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>trimTrailingSlashes</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1759">trimTrailingSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1784">trimTrailingSlashes</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/StringBuffer.html?is-external=true" title="class or interface in java.lang">StringBuffer</a>&nbsp;s)</pre>
 <div class="block">Trims <js>'/'</js> characters from the end of the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2348,7 +2405,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlEncode</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1773">urlEncode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1798">urlEncode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Shortcut for calling <code>URLEncoder.<jsm>encode</jsm>(o.toString(), <js>"UTF-8"</js>)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2364,7 +2421,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlEncodePath</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1790">urlEncodePath</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1815">urlEncodePath</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Similar to <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.Object-"><code>urlEncode(Object)</code></a> but doesn't encode <js>"/"</js> characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2380,7 +2437,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlDecode</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1858">urlDecode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1883">urlDecode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2396,7 +2453,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlEncode</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1881">urlEncode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1906">urlEncode</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2412,7 +2469,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlEncodeLax</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1901">urlEncodeLax</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.1926">urlEncodeLax</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.String-"><code>urlEncode(String)</code></a> except only escapes characters that absolutely need to be escaped.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2428,7 +2485,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>splitEqually</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1936">splitEqually</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-e [...]
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1961">splitEqually</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-e [...]
                                         int&nbsp;size)</pre>
 <div class="block">Splits a string into equally-sized parts.</div>
 <dl>
@@ -2446,7 +2503,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>firstNonWhitespaceChar</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1958">firstNonWhitespaceChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1983">firstNonWhitespaceChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns the first non-whitespace character in the string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2463,7 +2520,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>lastNonWhitespaceChar</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1974">lastNonWhitespaceChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1999">lastNonWhitespaceChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns the last non-whitespace character in the string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2480,7 +2537,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>charAt</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1991">charAt</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2016">charAt</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                           int&nbsp;i)</pre>
 <div class="block">Returns the character at the specified index in the string without throwing exceptions.</div>
 <dl>
@@ -2499,7 +2556,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isAbsoluteUri</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2005">isAbsoluteUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2030">isAbsoluteUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Efficiently determines whether a URL is of the pattern "xxx://xxx"</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2515,7 +2572,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isUri</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2060">isUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2085">isUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Efficiently determines whether a URL is of the pattern "xxx:/xxx".
 
  <p>
@@ -2537,7 +2594,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getAuthorityUri</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2106">getAuthorityUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2131">getAuthorityUri</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Given an absolute URI, returns just the authority portion (e.g. <js>"http://hostname:port"</js>)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2553,7 +2610,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toURI</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2159">toURI</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2184">toURI</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Converts the specified object to a URI.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2569,7 +2626,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>firstNonEmpty</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2175">firstNonEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2200">firstNonEmpty</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;s)</pre>
 <div class="block">Returns the first non-null, non-empty string in the list.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2585,7 +2642,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>indexOf</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2189">indexOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2214">indexOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                           char...&nbsp;c)</pre>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#indexOf-int-" title="class or interface in java.lang"><code>String.indexOf(int)</code></a> except allows you to check for multiple characters.</div>
 <dl>
@@ -2603,7 +2660,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>format</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2208">format</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2233">format</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern,
                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/8/docs/api/java/text/MessageFormat.html?is-external=true#format-java.lang.String-java.lang.Object...-" title="class or interface in java.text"><code>MessageFormat.format(String, Object...)</code></a> except allows you to specify POJO arguments.</div>
 <dl>
@@ -2621,7 +2678,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseIntWithSuffix</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2247">parseIntWithSuffix</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2272">parseIntWithSuffix</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Converts a string containing a possible multiplier suffix to an integer.
 
  <p>
@@ -2645,7 +2702,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseLongWithSuffix</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2277">parseLongWithSuffix</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2302">parseLongWithSuffix</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Converts a string containing a possible multiplier suffix to a long.
 
  <p>
@@ -2669,7 +2726,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contains</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2300">contains</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2325">contains</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value,
                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;substring)</pre>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#contains-java.lang.CharSequence-" title="class or interface in java.lang"><code>String.contains(CharSequence)</code></a> except returns <jk>null</jk> if the value is null.</div>
 <dl>
@@ -2687,7 +2744,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isObjectList</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2311">isObjectList</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2336">isObjectList</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                                    boolean&nbsp;ignoreWhitespaceAndComments)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string appears to be an JSON array.</div>
 <dl>
@@ -2705,7 +2762,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseListOrCdl</h4>
-<pre>public static&nbsp;<a href="../../../../org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2339">parseListOrCdl</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/ObjectList.html" title="class in org.apache.juneau">ObjectList</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2364">parseListOrCdl</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
                                  throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
 <div class="block">Parses a string that can consist of either a JSON array or comma-delimited list.
 
@@ -2727,7 +2784,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isJson</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2357">isJson</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2382">isJson</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string is valid JSON.
 
  <p>
@@ -2747,7 +2804,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isObjectMap</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2377">isObjectMap</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2402">isObjectMap</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                                   boolean&nbsp;ignoreWhitespaceAndComments)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string appears to be a JSON object.</div>
 <dl>
@@ -2765,7 +2822,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumberedLines</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2436">getNumberedLines</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2461">getNumberedLines</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Takes in a string, splits it by lines, and then prepends each line with line numbers.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2781,7 +2838,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumberedLines</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2451">getNumberedLines</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2476">getNumberedLines</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                                       int&nbsp;start,
                                       int&nbsp;end)</pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/internal/StringUtils.html#getNumberedLines-java.lang.String-"><code>getNumberedLines(String)</code></a> except only returns the specified lines.
@@ -2804,7 +2861,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>compare</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2473">compare</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2498">compare</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s1,
                           <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s2)</pre>
 <div class="block">Compares two strings, but gracefully handles <jk>nulls</jk>.</div>
 <dl>
@@ -2822,7 +2879,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>firstChar</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2489">firstChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2514">firstChar</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Returns the first character in the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2838,7 +2895,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getMatchPattern</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2501">getMatchPattern</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2526">getMatchPattern</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Converts a string containing <js>"*"</js> meta characters with a regular expression pattern.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2854,7 +2911,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toLowerCase</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2523">toLowerCase</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2548">toLowerCase</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Null-safe <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#toLowerCase--" title="class or interface in java.lang"><code>String.toLowerCase()</code></a>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2867,10 +2924,10 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <a name="getDuration-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getDuration</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2558">getDuration</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2583">getDuration</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Parses a duration string.
 
  <p>
@@ -2904,6 +2961,36 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="replaceChars-java.lang.String-char-char-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>replaceChars</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/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/internal/StringUtils.html#line.2630">replaceChars</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+                                  char&nbsp;from,
+                                  char&nbsp;to,
+                                  boolean&nbsp;ignoreEscapedChars)</pre>
+<div class="block">Replaces tokens in a string with a different token.
+
+ <p>
+ replace("A and B and C", "and", "or") -> "A or B or C"
+ replace("andandand", "and", "or") -> "ororor"
+ replace(null, "and", "or") -> null
+ replace("andandand", null, "or") -> "andandand"
+ replace("andandand", "", "or") -> "andandand"
+ replace("A and B and C", "and", null) -> "A  B  C"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The string to replace characters in.</dd>
+<dd><code>from</code> - The character to replace.</dd>
+<dd><code>to</code> - The character to replace with.</dd>
+<dd><code>ignoreEscapedChars</code> - Specify 'true' if escaped 'from' characters should be ignored.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The string with characters replaced.</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-frame.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-frame.html
index f0f9853..d95a4b6 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-frame.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-frame.html
@@ -62,6 +62,7 @@
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
 <li><a href="ClassFlags.html" title="enum in org.apache.juneau.internal" target="classFrame">ClassFlags</a></li>
+<li><a href="StateMachineState.html" title="enum in org.apache.juneau.internal" target="classFrame">StateMachineState</a></li>
 </ul>
 </div>
 </body>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-summary.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-summary.html
index d0795d2..44e1235 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-summary.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-summary.html
@@ -178,7 +178,7 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a>&lt;T&gt;</td>
+<td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a>&lt;T extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&gt;</td>
 <td class="colLast">
 <div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> where entries in the map can be removed without affecting the underlying map.</div>
 </td>
@@ -375,6 +375,12 @@
 <div class="block">Identifies possible modifiers on classes, methods, fields, and constructors.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal">StateMachineState</a></td>
+<td class="colLast">
+<div class="block">Enums for state-machine states.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-tree.html b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-tree.html
index 3c2ae35..5c005d9 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-tree.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/internal/package-tree.html
@@ -203,6 +203,7 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" t [...]
 <ul>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ClassFlags.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">ClassFlags</span></a></li>
+<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/StateMachineState.html" title="enum in org.apache.juneau.internal"><span class="typeNameLink">StateMachineState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfCommon.html b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfCommon.html
index 4ae8c7c..78219db 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfCommon.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfCommon.html
@@ -402,7 +402,7 @@
       Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
       created.
       Default is the pretty writer but can be overridden with system property
-      <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+      <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
    <li>
       <js>"N3-PP"</js> - Name of the N3 pretty writer.
       The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
@@ -582,13 +582,13 @@
  See also:
  <ul class='spaced-list'>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()'>ARPOptions.setDefaultErrorMode()</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setDefaultErrorMode()'>ARPOptions.setDefaultErrorMode()</a>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setLaxErrorMode()'>ARPOptions.setLaxErrorMode()</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setLaxErrorMode()'>ARPOptions.setLaxErrorMode()</a>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode()'>ARPOptions.setStrictErrorMode()</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setStrictErrorMode()'>ARPOptions.setStrictErrorMode()</a>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode(int)'>ARPOptions.setStrictErrorMode(int)</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setStrictErrorMode(int)'>ARPOptions.setStrictErrorMode(int)</a>
  </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -620,7 +620,7 @@
  See also:
  <ul class='spaced-list'>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)'>ARPOptions.setEmbedding(boolean)</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setEmbedding(boolean)'>ARPOptions.setEmbedding(boolean)</a>
  </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -660,9 +660,9 @@
  See also:
  <ul class='spaced-list'>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html'>ARPErrorNumbers</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPErrorNumbers.html'>ARPErrorNumbers</a>
    <li>
-      <a class='doclink' href='http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)'>ARPOptions.setErrorMode(int, int)</a>
+      <a class='doclink' href='https://jena.apache.org/documentation/io/arp.html/ARPOptions.html#setErrorMode(int,%20int)'>ARPOptions.setErrorMode(int, int)</a>
  </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserBuilder.html b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserBuilder.html
index 8b72f8e..38bea14 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserBuilder.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserBuilder.html
@@ -938,7 +938,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserBuilder.html"
       Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
       created.
       Default is the pretty writer but can be overridden with system property
-      <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+      <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
    <li>
       <js>"N3-PP"</js> - Name of the N3 pretty writer.
       The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserSession.html b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserSession.html
index 9261e01..ca8a6da 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserSession.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfParserSession.html
@@ -128,7 +128,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.36">RdfParserSession</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.35">RdfParserSession</a>
 extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html" title="class in org.apache.juneau.parser">ReaderParserSession</a></pre>
 <div class="block">Session object that lives for the duration of a single use of <a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena"><code>RdfParser</code></a>.
 
@@ -280,7 +280,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RdfParserSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.53">RdfParserSession</a>(<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.52">RdfParserSession</a>(<a href="../../../../org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a>&nbsp;ctx,
                            <a href="../../../../org/apache/juneau/parser/ParserSessionArgs.html" title="class in org.apache.juneau.parser">ParserSessionArgs</a>&nbsp;args)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
@@ -305,7 +305,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>asMap</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.73">asMap</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.72">asMap</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/Session.html#asMap--">Session</a></code></span></div>
 <div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
 <dl>
@@ -322,7 +322,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>doParse</h4>
-<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.80">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserPipe.html" title="class in org.apache.juneau.parser">ParserPipe</a>&nbsp;pipe,
+<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.79">doParse</a>(<a href="../../../../org/apache/juneau/parser/ParserPipe.html" title="class in org.apache.juneau.parser">ParserPipe</a>&nbsp;pipe,
                         <a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;T&gt;&nbsp;type)
                  throws <a href="http://docs.oracle.com/javase/8/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/parser/ParserSession.html#doParse-org.apache.juneau.parser.ParserPipe-org.apache.juneau.ClassMeta-">ParserSession</a></code></span></div>
@@ -354,7 +354,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>isTrimWhitespace</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.444">isTrimWhitespace</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.443">isTrimWhitespace</a>()</pre>
 <div class="block">Configuration property:  Trim whitespace from text elements.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -370,7 +370,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>isLooseCollections</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.456">isLooseCollections</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.455">isLooseCollections</a>()</pre>
 <div class="block">Configuration property:  Collections should be serialized and parsed as loose collections.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -387,7 +387,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getRdfLanguage</h4>
-<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/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/jena/RdfParserSession.html#line.467">getRdfLanguage</a>()</pre>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/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/jena/RdfParserSession.html#line.466">getRdfLanguage</a>()</pre>
 <div class="block">Configuration property:  RDF language.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -403,7 +403,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauNs</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.478">getJuneauNs</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.477">getJuneauNs</a>()</pre>
 <div class="block">Configuration property:  XML namespace for Juneau properties.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -419,7 +419,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauBpNs</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.489">getJuneauBpNs</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.488">getJuneauBpNs</a>()</pre>
 <div class="block">Configuration property:  Default XML namespace for bean properties.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -435,7 +435,7 @@ extends <a href="../../../../org/apache/juneau/parser/ReaderParserSession.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getCollectionFormat</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.500">getCollectionFormat</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfParserSession.html#line.499">getCollectionFormat</a>()</pre>
 <div class="block">Configuration property:  RDF format for representing collections and arrays.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerBuilder.html b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerBuilder.html
index 418dd18..0256718 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerBuilder.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerBuilder.html
@@ -1249,7 +1249,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerBuilde
       Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
       created.
       Default is the pretty writer but can be overridden with system property
-      <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+      <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
    <li>
       <js>"N3-PP"</js> - Name of the N3 pretty writer.
       The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerSession.html b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerSession.html
index c3904db..49637b9 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerSession.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/jena/RdfSerializerSession.html
@@ -133,7 +133,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.38">RdfSerializerSession</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.37">RdfSerializerSession</a>
 extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSession.html" title="class in org.apache.juneau.serializer">WriterSerializerSession</a></pre>
 <div class="block">Session object that lives for the duration of a single use of <a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena"><code>RdfSerializer</code></a>.
 
@@ -331,7 +331,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RdfSerializerSession</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.58">RdfSerializerSession</a>(<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a>&nbsp;ctx,
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.57">RdfSerializerSession</a>(<a href="../../../../org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a>&nbsp;ctx,
                                <a href="../../../../org/apache/juneau/serializer/SerializerSessionArgs.html" title="class in org.apache.juneau.serializer">SerializerSessionArgs</a>&nbsp;args)</pre>
 <div class="block">Create a new session using properties specified in the context.</div>
 <dl>
@@ -359,7 +359,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>asMap</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.93">asMap</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.92">asMap</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/Session.html#asMap--">Session</a></code></span></div>
 <div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
 <dl>
@@ -376,7 +376,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>doSerialize</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.124">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerPipe.html" title="class in org.apache.juneau.serializer">SerializerPipe</a>&nbsp;out,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.123">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerPipe.html" title="class in org.apache.juneau.serializer">SerializerPipe</a>&nbsp;out,
                            <a href="http://docs.oracle.com/javase/8/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/8/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/SerializerSession.html#doSerialize-org.apache.juneau.serializer.SerializerPipe-java.lang.Object-">SerializerSession</a></code></span></div>
@@ -401,7 +401,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddLiteralTypes</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.416">isAddLiteralTypes</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.415">isAddLiteralTypes</a>()</pre>
 <div class="block">Configuration property:  Add XSI data types to non-<code>String</code> literals.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -417,7 +417,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddRootProp</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.428">isAddRootProp</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.427">isAddRootProp</a>()</pre>
 <div class="block">Configuration property:  Add RDF root identifier property to root node.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -434,7 +434,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isUseXmlNamespaces</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.440">isUseXmlNamespaces</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.439">isUseXmlNamespaces</a>()</pre>
 <div class="block">Configuration property:  Reuse XML namespaces when RDF namespaces not specified.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -451,7 +451,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isLooseCollections</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.452">isLooseCollections</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.451">isLooseCollections</a>()</pre>
 <div class="block">Configuration property:  Collections should be serialized and parsed as loose collections.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -468,7 +468,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isAutoDetectNamespaces</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.463">isAutoDetectNamespaces</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.462">isAutoDetectNamespaces</a>()</pre>
 <div class="block">Configuration property:  Auto-detect namespace usage.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -484,7 +484,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>isAddBeanTypes</h4>
-<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.476">isAddBeanTypes</a>()</pre>
+<pre>protected final&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.475">isAddBeanTypes</a>()</pre>
 <div class="block">Configuration property:  Add <js>"_type"</js> properties when needed.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -503,7 +503,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>getRdfLanguage</h4>
-<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/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/jena/RdfSerializerSession.html#line.487">getRdfLanguage</a>()</pre>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/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/jena/RdfSerializerSession.html#line.486">getRdfLanguage</a>()</pre>
 <div class="block">Configuration property:  RDF language.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -519,7 +519,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauNs</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.498">getJuneauNs</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.497">getJuneauNs</a>()</pre>
 <div class="block">Configuration property:  XML namespace for Juneau properties.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -535,7 +535,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockList">
 <li class="blockList">
 <h4>getJuneauBpNs</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.509">getJuneauBpNs</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/xml/Namespace.html" title="class in org.apache.juneau.xml">Namespace</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.508">getJuneauBpNs</a>()</pre>
 <div class="block">Configuration property:  Default XML namespace for bean properties.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -551,7 +551,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializerSessio
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getCollectionFormat</h4>
-<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.520">getCollectionFormat</a>()</pre>
+<pre>protected final&nbsp;<a href="../../../../org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena">RdfCollectionFormat</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/jena/RdfSerializerSession.html#line.519">getCollectionFormat</a>()</pre>
 <div class="block">Configuration property:  RDF format for representing collections and arrays.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/CharMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/CharMarshall.html
index bb10b6c..a84f476 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/CharMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/CharMarshall.html
@@ -177,7 +177,7 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Html.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Html.html
index 99517d8..38faa74 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Html.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Html.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Jso.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Jso.html
index c1f0476..6d88250 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Jso.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Jso.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/StreamMarshall.html" tit
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Json.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Json.html
index a15a521..976cef3 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Json.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Json.html
@@ -210,7 +210,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Marshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Marshall.html
index ebfa52e..aafa353 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Marshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Marshall.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -177,19 +177,31 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.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/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a></span>()</code>
+<div class="block">Returns the parser associated with this marshall.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a></span>()</code>
+<div class="block">Returns the serializer associated with this marshall.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Convenience method for calling <code>System.out.println(...)</code> on the specified object after calling <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-"><code>toString(Object)</code></a>.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</code>
 <div class="block">Same as <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>read(Object, Type, Type...)</code></a> except optimized for a non-parameterized class.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>&nbsp;type,
@@ -197,19 +209,19 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Parses input into the specified object type.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html#toString-java.lang.Object-">toString</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Convenience method for serializing an object to a String.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
 <div class="block">Serializes a POJO directly to either a <code>String</code> or <code><jk>byte</jk>[]</code> depending on the serializer type.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output)</code>
@@ -264,13 +276,41 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="getSerializer--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSerializer</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.71">getSerializer</a>()</pre>
+<div class="block">Returns the serializer associated with this marshall.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The serializer associated with this marshall.</dd>
+</dl>
+</li>
+</ul>
+<a name="getParser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getParser</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.80">getParser</a>()</pre>
+<div class="block">Returns the parser associated with this marshall.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The parser associated with this marshall.</dd>
+</dl>
+</li>
+</ul>
 <a name="write-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>write</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.76">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.94">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
              throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
 <div class="block">Serializes a POJO directly to either a <code>String</code> or <code><jk>byte</jk>[]</code> depending on the serializer type.</div>
 <dl>
@@ -291,7 +331,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>write</h4>
-<pre>public final&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.103">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<pre>public final&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.121">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;output)
                  throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
 <div class="block">Serializes a POJO to the specified output stream or writer.
@@ -325,7 +365,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html#line.118">toString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html#line.136">toString</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Convenience method for serializing an object to a String.
 
  <p>
@@ -346,7 +386,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>println</h4>
-<pre>public final&nbsp;<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.133">println</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<pre>public final&nbsp;<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.151">println</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Convenience method for calling <code>System.out.println(...)</code> on the specified object after calling <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-"><code>toString(Object)</code></a>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -362,7 +402,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>read</h4>
-<pre>public final&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.214">read</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+<pre>public final&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.232">read</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>&nbsp;type,
                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>...&nbsp;args)
                  throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -450,7 +490,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>read</h4>
-<pre>public final&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.253">read</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+<pre>public final&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/Marshall.html#line.271">read</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)
                  throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>read(Object, Type, Type...)</code></a> except optimized for a non-parameterized class.
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/MsgPack.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/MsgPack.html
index a7c6371..1d5eb21 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/MsgPack.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/MsgPack.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/StreamMarshall.html" tit
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/N3.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/N3.html
index 67bb406..ffd0ab6 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/N3.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/N3.html
@@ -201,7 +201,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html
index 2fb4163..9442b32 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html
@@ -201,7 +201,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/OpenApi.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/OpenApi.html
index abc60a4..5baa720 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/OpenApi.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/OpenApi.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/PlainText.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/PlainText.html
index 6d03e94..a727fb4 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/PlainText.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/PlainText.html
@@ -211,7 +211,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXml.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXml.html
index caa4715..a3d1305 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXml.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXml.html
@@ -201,7 +201,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXmlAbbrev.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXmlAbbrev.html
index 72ed822..ec1ea8a 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXmlAbbrev.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/RdfXmlAbbrev.html
@@ -201,7 +201,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/SimpleJson.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/SimpleJson.html
index f9c2460..8e16d50 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/SimpleJson.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/SimpleJson.html
@@ -217,7 +217,7 @@ extends <a href="../../../../org/apache/juneau/marshall/Json.html" title="class
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
index 071bb02..c260b34 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
@@ -177,7 +177,7 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Turtle.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Turtle.html
index da856c1..218f43c 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Turtle.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Turtle.html
@@ -201,7 +201,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Uon.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Uon.html
index de69af4..1a04d8f 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Uon.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Uon.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/UrlEncoding.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/UrlEncoding.html
index 15e836a..5efd898 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/UrlEncoding.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/UrlEncoding.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Xml.html b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Xml.html
index b03c3bf..7f526e3 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Xml.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/marshall/Xml.html
@@ -206,7 +206,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
+<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#getParser--">getParser</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#getSerializer--">getSerializer</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object- [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/microservice/jetty/JettyMicroservice.html b/content/site/apidocs-8.0.1/org/apache/juneau/microservice/jetty/JettyMicroservice.html
index d0510e0..6fdf7ff 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/microservice/jetty/JettyMicroservice.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/microservice/jetty/JettyMicroservice.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.48">JettyMicroservice</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.49">JettyMicroservice</a>
 extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></pre>
 <div class="block">Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.
 
@@ -331,7 +331,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>JettyMicroservice</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.117">JettyMicroservice</a>(<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroserviceBuilder</a>&nbsp;builder)
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.118">JettyMicroservice</a>(<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroserviceBuilder</a>&nbsp;builder)
                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -356,7 +356,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.66">getInstance</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.67">getInstance</a>()</pre>
 <div class="block">Returns the Microservice instance.
  <p>
  This method only works if there's only one Microservice instance in a JVM.
@@ -373,7 +373,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.78">main</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.79">main</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Entry-point method.</div>
 <dl>
@@ -390,7 +390,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroserviceBuilder</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.107">create</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroserviceBuilder</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.108">create</a>()</pre>
 <div class="block">Creates a new microservice builder.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -404,7 +404,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>init</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.130">init</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.131">init</a>()
                        throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#init--">Microservice</a></code></span></div>
 <div class="block">Initializes this microservice.
@@ -430,7 +430,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>startConsole</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.136">startConsole</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.137">startConsole</a>()
                                throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#startConsole--">Microservice</a></code></span></div>
 <div class="block">Starts the console thread for this microservice.</div>
@@ -450,7 +450,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>stopConsole</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.142">stopConsole</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.143">stopConsole</a>()
                               throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#stopConsole--">Microservice</a></code></span></div>
 <div class="block">Stops the console thread for this microservice.</div>
@@ -470,7 +470,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>start</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.148">start</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.149">start</a>()
                         throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#start--">Microservice</a></code></span></div>
 <div class="block">Start this application.
@@ -493,7 +493,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.156">join</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.157">join</a>()
                        throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#join--">Microservice</a></code></span></div>
 <div class="block">Joins the application with the current thread.
@@ -516,7 +516,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>stop</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.162">stop</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.163">stop</a>()
                        throws <a href="http://docs.oracle.com/javase/8/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/microservice/Microservice.html#stop--">Microservice</a></code></span></div>
 <div class="block">Stop this application.
@@ -539,7 +539,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getPort</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.205">getPort</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.206">getPort</a>()</pre>
 <div class="block">Returns the port that this microservice started up on.
  <p>
  The value is determined by looking at the <code>Server/Connectors[ServerConnector]/port</code> value in the
@@ -556,7 +556,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getContextPath</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.220">getContextPath</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.221">getContextPath</a>()</pre>
 <div class="block">Returns the context path that this microservice is using.
  <p>
  The value is determined by looking at the <code>Server/Handlers[ServletContextHandler]/contextPath</code> value
@@ -573,7 +573,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getProtocol</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.241">getProtocol</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.242">getProtocol</a>()</pre>
 <div class="block">Returns whether this microservice is using <js>"http"</js> or <js>"https"</js>.
  <p>
  The value is determined by looking for the existence of an SSL Connection Factorie by looking for the
@@ -591,7 +591,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getHostName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.257">getHostName</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/microservice/jetty/JettyMicroservice.html#line.258">getHostName</a>()</pre>
 <div class="block">Returns the hostname of this microservice.
  <p>
  Simply uses <code>InetAddress.getLocalHost().getHostName()</code>.</div>
@@ -607,7 +607,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getURI</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.270">getURI</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.271">getURI</a>()</pre>
 <div class="block">Returns the URI where this microservice is listening on.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -621,7 +621,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createServer</h4>
-<pre>public&nbsp;org.eclipse.jetty.server.Server&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.310">createServer</a>()
+<pre>public&nbsp;org.eclipse.jetty.server.Server&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.311">createServer</a>()
                                              throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Method used to create (but not start) an instance of a Jetty server.
 
@@ -663,7 +663,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>destroyServer</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.376">destroyServer</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.377">destroyServer</a>()
                    throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Calls <code>HandlerWrapper.destroy()</code> on the underlying Jetty server if it exists.</div>
 <dl>
@@ -678,7 +678,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addServlet</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.390">addServlet</a>(javax.servlet.Servlet&nbsp;servlet,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.391">addServlet</a>(javax.servlet.Servlet&nbsp;servlet,
                                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pathSpec)</pre>
 <div class="block">Adds an arbitrary servlet to this microservice.</div>
 <dl>
@@ -698,7 +698,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletContextHandler</h4>
-<pre>protected&nbsp;org.eclipse.jetty.servlet.ServletContextHandler&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.402">getServletContextHandler</a>()</pre>
+<pre>protected&nbsp;org.eclipse.jetty.servlet.ServletContextHandler&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.405">getServletContextHandler</a>()</pre>
 <div class="block">Finds and returns the servlet context handler define in the Jetty container.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -714,7 +714,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addServletAttribute</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.419">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html" title="class in org.apache.juneau.microservice.jetty">JettyMicroservice</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.422">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                              <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block">Adds a servlet attribute to the Jetty server.</div>
 <dl>
@@ -734,7 +734,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getServer</h4>
-<pre>public&nbsp;org.eclipse.jetty.server.Server&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.429">getServer</a>()</pre>
+<pre>public&nbsp;org.eclipse.jetty.server.Server&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.432">getServer</a>()</pre>
 <div class="block">Returns the underlying Jetty server.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -748,7 +748,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Microservice.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>startServer</h4>
-<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.444">startServer</a>()
+<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/jetty/JettyMicroservice.html#line.447">startServer</a>()
                    throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Method used to start the Jetty server created by <a href="../../../../../org/apache/juneau/microservice/jetty/JettyMicroservice.html#createServer--"><code>createServer()</code></a>.
 
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-summary.html b/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-summary.html
index 9bb02cc..3597a13 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-summary.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-summary.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/parser/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../org/apache/juneau/remote/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/package-summary.html" target="_top">Frames</a></li>
@@ -152,7 +152,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/parser/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../org/apache/juneau/remote/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/package-summary.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-tree.html b/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-tree.html
index c72906c..c926e03 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-tree.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/plaintext/package-tree.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/parser/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/juneau/remote/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/package-tree.html" target="_top">Frames</a></li>
@@ -195,7 +195,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/parser/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/juneau/remote/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/plaintext/package-tree.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Equality.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Equality.html
new file mode 100644
index 0000000..1016e1a
--- /dev/null
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Equality.html
@@ -0,0 +1,377 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Equality (Apache Juneau 8.0.1)</title>
+<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Equality (Apache Juneau 8.0.1)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/Equality.html" target="_top">Frames</a></li>
+<li><a href="Equality.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Enum Equality" class="title">Enum Equality</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/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="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">java.lang.Enum</a>&lt;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.pojotools.Equality</li>
+</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/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.19">Equality</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>&gt;</pre>
+<div class="block">TODO</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#GT">GT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#GTE">GTE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#LT">LT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#LTE">LTE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#NONE">NONE</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Equality.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-" title="class or interface in java.lang">compareTo</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://do [...]
+</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/8/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/8/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/8/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/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.or [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="GT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>GT</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a> <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.20">GT</a></pre>
+</li>
+</ul>
+<a name="GTE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>GTE</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a> <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.20">GTE</a></pre>
+</li>
+</ul>
+<a name="LT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LT</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a> <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.20">LT</a></pre>
+</li>
+</ul>
+<a name="LTE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LTE</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a> <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.20">LTE</a></pre>
+</li>
+</ul>
+<a name="NONE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NONE</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a> <a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.20">NONE</a></pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>[]&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.19">values</a>()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (Equality c : Equality.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools">Equality</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/Equality.html#line.19">valueOf</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if this enum type has no constant with the specified name</dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/NullPointerException.html?is-external=true" title="class or interface in java.lang">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/Equality.html" target="_top">Frames</a></li>
+<li><a href="Equality.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2019 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/rest/RestContext.StaticFile.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Matcher.html
similarity index 61%
copy from content/site/apidocs-8.0.1/org/apache/juneau/rest/RestContext.StaticFile.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Matcher.html
index 30607d5..b9e89be 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/rest/RestContext.StaticFile.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/Matcher.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RestContext.StaticFile (Apache Juneau 8.0.1)</title>
+<title>Matcher (Apache Juneau 8.0.1)</title>
 <link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,12 +12,18 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RestContext.StaticFile (Apache Juneau 8.0.1)";
+            parent.document.title="Matcher (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
     }
 //-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -42,12 +48,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<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/RestContextBuilder.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/rest/RestContext.StaticFile.html" target="_top">Frames</a></li>
-<li><a href="RestContext.StaticFile.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/Matcher.html" target="_top">Frames</a></li>
+<li><a href="Matcher.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -70,13 +76,13 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></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="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -85,30 +91,26 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.rest</div>
-<h2 title="Class RestContext.StaticFile" class="title">Class RestContext.StaticFile</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class Matcher" class="title">Class Matcher</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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>org.apache.juneau.rest.RestContext.StaticFile</li>
+<li>org.apache.juneau.pojotools.Matcher</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dd>
-</dl>
 <hr>
 <br>
-<pre>protected class <a href="../../../../src-html/org/apache/juneau/rest/RestContext.html#line.3608">RestContext.StaticFile</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/pojotools/Matcher.html#line.20">Matcher</a>
 extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-<div class="block">A cached static file instance.</div>
+<div class="block">Common interface for matchers used by the <a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><code>PojoSearcher</code></a> class.</div>
 </li>
 </ul>
 </div>
@@ -124,14 +126,10 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestContext.StaticFile.html#StaticFile-org.apache.juneau.http.StreamResource-">StaticFile</a></span>(<a href="../../../../org/apache/juneau/http/StreamResource.html" title="class in org.apache.juneau.http">StreamResource</a>&nbsp;resource)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Matcher.html#Matcher--">Matcher</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -142,6 +140,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/Matcher.html#matches-org.apache.juneau.ClassMeta-java.lang.Object-">matches</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
+<div class="block">Returns <jk>true</jk> if this matcher matches the specified object..</div>
+</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
@@ -163,17 +175,38 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StaticFile-org.apache.juneau.http.StreamResource-">
+<a name="Matcher--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Matcher</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/Matcher.html#line.20">Matcher</a>()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="matches-org.apache.juneau.ClassMeta-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StaticFile</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContext.StaticFile.html#line.3617">StaticFile</a>(<a href="../../../../org/apache/juneau/http/StreamResource.html" title="class in org.apache.juneau.http">StreamResource</a>&nbsp;resource)</pre>
-<div class="block">Constructor.</div>
+<h4>matches</h4>
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/Matcher.html#line.29">matches</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm,
+                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
+<div class="block">Returns <jk>true</jk> if this matcher matches the specified object..</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>resource</code> - </dd>
+<dd><code>cm</code> - The class type of the object being matched.  Never <jk>null</jk>.</dd>
+<dd><code>o</code> - The object being matched.  Never <jk>null</jk>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the specified object matches the specified pattern.</dd>
 </dl>
 </li>
 </ul>
@@ -204,12 +237,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<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/RestContextBuilder.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/Equality.html" title="enum in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/rest/RestContext.StaticFile.html" target="_top">Frames</a></li>
-<li><a href="RestContext.StaticFile.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/Matcher.html" target="_top">Frames</a></li>
+<li><a href="Matcher.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -232,13 +265,13 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></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="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/MatcherFactory.html
similarity index 58%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/MatcherFactory.html
index 071bb02..96b3ad4 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/MatcherFactory.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>MatcherFactory (Apache Juneau 8.0.1)</title>
 <link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="MatcherFactory (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/MatcherFactory.html" target="_top">Frames</a></li>
+<li><a href="MatcherFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,20 +91,15 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class MatcherFactory" class="title">Class MatcherFactory</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.MatcherFactory</li>
 </ul>
 </li>
 </ul>
@@ -113,18 +108,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
+<dd><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a>, <a href="../../../../org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools">StringMatcherFactory</a>, <a href="../../../../org/apache/juneau/pojotools/TimeMatcherFactory.html" title="class in org.apache.juneau.pojotools">TimeMatcherFactory</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
-
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/pojotools/MatcherFactory.html#line.20">MatcherFactory</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Common interface for matchers used by the <a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><code>PojoSearcher</code></a> class.</div>
 </li>
 </ul>
 </div>
@@ -140,15 +130,10 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#MatcherFactory--">MatcherFactory</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -160,26 +145,25 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm)</code>
+<div class="block">Returns <jk>true</jk> if this matcher can be used on the specified object.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#create-java.lang.String-">create</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</code>
+<div class="block">Instantiates a matcher for the specified pattern.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,22 +184,13 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="MatcherFactory--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
-</dl>
+<h4>MatcherFactory</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/MatcherFactory.html#line.20">MatcherFactory</a>()</pre>
 </li>
 </ul>
 </li>
@@ -226,24 +201,35 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="canMatch-org.apache.juneau.ClassMeta-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>canMatch</h4>
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/MatcherFactory.html#line.28">canMatch</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm)</pre>
+<div class="block">Returns <jk>true</jk> if this matcher can be used on the specified object.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cm</code> - The class type of the object being matched.  Never <jk>null</jk>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if this matcher can be used on the specified object.</dd>
+</dl>
+</li>
+</ul>
+<a name="create-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>write</h4>
-<pre>public final&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.54">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
-                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<h4>create</h4>
+<pre>public abstract&nbsp;<a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/MatcherFactory.html#line.36">create</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</pre>
+<div class="block">Instantiates a matcher for the specified pattern.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>o</code> - The object to serialize.</dd>
+<dd><code>pattern</code> - The pattern string.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The serialized object.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></code> - If a problem occurred trying to convert the output.</dd>
+<dd>A matcher for the specified pattern.</dd>
 </dl>
 </li>
 </ul>
@@ -274,12 +260,12 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/MatcherFactory.html" target="_top">Frames</a></li>
+<li><a href="MatcherFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/NumberMatcherFactory.html
similarity index 55%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/NumberMatcherFactory.html
index 2fb4163..50a4e8a 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/NTriple.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/NumberMatcherFactory.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NTriple (Apache Juneau 8.0.1)</title>
+<title>NumberMatcherFactory (Apache Juneau 8.0.1)</title>
 <link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,12 +12,18 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NTriple (Apache Juneau 8.0.1)";
+            parent.document.title="NumberMatcherFactory (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
     }
 //-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -42,12 +48,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/N3.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/OpenApi.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/NTriple.html" target="_top">Frames</a></li>
-<li><a href="NTriple.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/NumberMatcherFactory.html" target="_top">Frames</a></li>
+<li><a href="NumberMatcherFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -70,13 +76,13 @@
 <li>Nested&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="#methods.inherited.from.class.org.apache.juneau.marshall.CharMarshall">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -85,23 +91,18 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class NTriple" class="title">Class NTriple</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class NumberMatcherFactory" class="title">Class NumberMatcherFactory</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">org.apache.juneau.pojotools.MatcherFactory</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.CharMarshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.NTriple</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.NumberMatcherFactory</li>
 </ul>
 </li>
 </ul>
@@ -112,25 +113,9 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/marshall/NTriple.html#line.36">NTriple</a>
-extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title="class in org.apache.juneau.marshall">CharMarshall</a></pre>
-<div class="block">A pairing of a <a href="../../../../org/apache/juneau/jena/NTripleSerializer.html" title="class in org.apache.juneau.jena"><code>NTripleSerializer</code></a> and <a href="../../../../org/apache/juneau/jena/NTripleParser.html" title="class in org.apache.juneau.jena"><code>NTripleParser</code></a> into a single class with convenience read/write methods.
-
- <p>
-   The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
-
- <h5 class='figure'>Examples:</h5>
- <p class='bcode w800'>
-   <jc>// Using instance.</jc>
-   NTriple nTriple = <jk>new</jk> NTriple();
-   MyPojo myPojo = nTriple.read(string, MyPojo.<jk>class</jk>);
-   String string = nTriple.write(myPojo);
- </p>
- <p class='bcode w800'>
-   <jc>// Using DEFAULT instance.</jc>
-   MyPojo myPojo = NTriple.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
-   String string = NTriple.<jsf>DEFAULT</jsf>.write(myPojo);
- </p></div>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/pojotools/NumberMatcherFactory.html#line.26">NumberMatcherFactory</a>
+extends <a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></pre>
+<div class="block">TODO</div>
 </li>
 </ul>
 </div>
@@ -150,9 +135,9 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/marshall/NTriple.html" title="class in org.apache.juneau.marshall">NTriple</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/NTriple.html#DEFAULT">DEFAULT</a></span></code>
-<div class="block">Default reusable instance.</div>
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html#DEFAULT">DEFAULT</a></span></code>
+<div class="block">Default reusable matcher.</div>
 </td>
 </tr>
 </table>
@@ -170,15 +155,7 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <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/marshall/NTriple.html#NTriple--">NTriple</a></span>()</code>
-<div class="block">Constructor.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/NTriple.html#NTriple-org.apache.juneau.jena.NTripleSerializer-org.apache.juneau.jena.NTripleParser-">NTriple</a></span>(<a href="../../../../org/apache/juneau/jena/NTripleSerializer.html" title="class in org.apache.juneau.jena">NTripleSerializer</a>&nbsp;s,
-       <a href="../../../../org/apache/juneau/jena/NTripleParser.html" title="class in org.apache.juneau.jena">NTripleParser</a>&nbsp;p)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html#NumberMatcherFactory--">NumberMatcherFactory</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -189,20 +166,25 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.CharMarshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title="class in org.apache.juneau.marshall">CharMarshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/CharMarshall.html#write-java.lang.Object-">write</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch</a></span>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm)</code>
+<div class="block">Returns <jk>true</jk> if this matcher can be used on the specified object.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html#create-java.lang.String-">create</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</code>
+<div class="block">Instantiates a matcher for the specified pattern.</div>
+</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
@@ -230,8 +212,8 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DEFAULT</h4>
-<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/marshall/NTriple.html" title="class in org.apache.juneau.marshall">NTriple</a> <a href="../../../../src-html/org/apache/juneau/marshall/NTriple.html#line.41">DEFAULT</a></pre>
-<div class="block">Default reusable instance.</div>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools">NumberMatcherFactory</a> <a href="../../../../src-html/org/apache/juneau/pojotools/NumberMatcherFactory.html#line.31">DEFAULT</a></pre>
+<div class="block">Default reusable matcher.</div>
 </li>
 </ul>
 </li>
@@ -242,35 +224,59 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="NTriple-org.apache.juneau.jena.NTripleSerializer-org.apache.juneau.jena.NTripleParser-">
+<a name="NumberMatcherFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NumberMatcherFactory</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/NumberMatcherFactory.html#line.26">NumberMatcherFactory</a>()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="canMatch-org.apache.juneau.ClassMeta-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>NTriple</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/NTriple.html#line.53">NTriple</a>(<a href="../../../../org/apache/juneau/jena/NTripleSerializer.html" title="class in org.apache.juneau.jena">NTripleSerializer</a>&nbsp;s,
-               <a href="../../../../org/apache/juneau/jena/NTripleParser.html" title="class in org.apache.juneau.jena">NTripleParser</a>&nbsp;p)</pre>
-<div class="block">Constructor.</div>
+<h4>canMatch</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/NumberMatcherFactory.html#line.34">canMatch</a>(<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a>&lt;?&gt;&nbsp;cm)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">MatcherFactory</a></code></span></div>
+<div class="block">Returns <jk>true</jk> if this matcher can be used on the specified object.</div>
 <dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#canMatch-org.apache.juneau.ClassMeta-">canMatch</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
+<dd><code>cm</code> - The class type of the object being matched.  Never <jk>null</jk>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if this matcher can be used on the specified object.</dd>
 </dl>
 </li>
 </ul>
-<a name="NTriple--">
+<a name="create-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>NTriple</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/NTriple.html#line.63">NTriple</a>()</pre>
-<div class="block">Constructor.
-
- <p>
- Uses <a href="../../../../org/apache/juneau/jena/NTripleSerializer.html#DEFAULT"><code>NTripleSerializer.DEFAULT</code></a> and <a href="../../../../org/apache/juneau/jena/NTripleParser.html#DEFAULT"><code>NTripleParser.DEFAULT</code></a>.</div>
+<h4>create</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/pojotools/Matcher.html" title="class in org.apache.juneau.pojotools">Matcher</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/NumberMatcherFactory.html#line.39">create</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pattern)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#create-java.lang.String-">MatcherFactory</a></code></span></div>
+<div class="block">Instantiates a matcher for the specified pattern.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html#create-java.lang.String-">create</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>pattern</code> - The pattern string.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A matcher for the specified pattern.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -300,12 +306,12 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/N3.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/OpenApi.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/NTriple.html" target="_top">Frames</a></li>
-<li><a href="NTriple.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/NumberMatcherFactory.html" target="_top">Frames</a></li>
+<li><a href="NumberMatcherFactory.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -328,13 +334,13 @@ extends <a href="../../../../org/apache/juneau/marshall/CharMarshall.html" title
 <li>Nested&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="#methods.inherited.from.class.org.apache.juneau.marshall.CharMarshall">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PatternException.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PatternException.html
new file mode 100644
index 0000000..c5fa947
--- /dev/null
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PatternException.html
@@ -0,0 +1,289 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>PatternException (Apache Juneau 8.0.1)</title>
+<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PatternException (Apache Juneau 8.0.1)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PatternException.html" target="_top">Frames</a></li>
+<li><a href="PatternException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.FormattedRuntimeException">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class PatternException" class="title">Class PatternException</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">java.lang.RuntimeException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau">org.apache.juneau.FormattedRuntimeException</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.pojotools.PatternException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</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/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/pojotools/PatternException.html#line.20">PatternException</a>
+extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau">FormattedRuntimeException</a></pre>
+<div class="block">Indicates an invalid search pattern was specified.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.juneau.pojotools.PatternException">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<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/pojotools/PatternException.html#PatternException-java.lang.String-java.lang.Object...-">PatternException</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
+                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</code>
+<div class="block">Constructor.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.FormattedRuntimeException">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.apache.juneau.<a href="../../../../org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau">FormattedRuntimeException</a></h3>
+<code><a href="../../../../org/apache/juneau/FormattedRuntimeException.html#getMessage-java.lang.Throwable-java.lang.String-java.lang.String-">getMessage</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or inter [...]
+</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/8/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/8/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/8/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/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http:/ [...]
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="PatternException-java.lang.String-java.lang.Object...-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PatternException</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PatternException.html#line.30">PatternException</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
+                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>message</code> - Message.</dd>
+<dd><code>args</code> - Message arguments.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/pojotools/NumberMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PatternException.html" target="_top">Frames</a></li>
+<li><a href="PatternException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.FormattedRuntimeException">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2019 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
+</body>
+</html>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoPaginator.html
similarity index 57%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoPaginator.html
index 071bb02..4c05a99 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoPaginator.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>PojoPaginator (Apache Juneau 8.0.1)</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="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="PojoPaginator (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoPaginator.html" target="_top">Frames</a></li>
+<li><a href="PojoPaginator.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,20 +91,15 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class PojoPaginator" class="title">Class PojoPaginator</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.PojoPaginator</li>
 </ul>
 </li>
 </ul>
@@ -112,19 +107,18 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</dd>
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/pojotools/PojoPaginator.html#line.23">PojoPaginator</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
+implements <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</pre>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.
 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+ <p>
+ Allows you to quickly return subsets of arrays and collections based on position/limit arguments.</div>
 </li>
 </ul>
 </div>
@@ -140,15 +134,10 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html#PojoPaginator--">PojoPaginator</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -166,20 +155,15 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html#run-org.apache.juneau.BeanSession-java.lang.Object-java.lang.Object-">run</a></span>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;args)</code>
+<div class="block">Converts the specified input to some other output.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,22 +184,13 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="PojoPaginator--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
-</dl>
+<h4>PojoPaginator</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoPaginator.html#line.23">PojoPaginator</a>()</pre>
 </li>
 </ul>
 </li>
@@ -226,24 +201,26 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="run-org.apache.juneau.BeanSession-java.lang.Object-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>write</h4>
-<pre>public final&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.54">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
-                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<h4>run</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoPaginator.html#line.26">run</a>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;args)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">PojoTool</a></code></span></div>
+<div class="block">Converts the specified input to some other output.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>o</code> - The object to serialize.</dd>
+<dd><code>session</code> - The current bean session.</dd>
+<dd><code>input</code> - The input POJO.</dd>
+<dd><code>args</code> - The arguments.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The serialized object.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></code> - If a problem occurred trying to convert the output.</dd>
+<dd>The output POJO.</dd>
 </dl>
 </li>
 </ul>
@@ -274,12 +251,12 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PatternException.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoPaginator.html" target="_top">Frames</a></li>
+<li><a href="PojoPaginator.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/rest/vars/WidgetVar.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSearcher.html
similarity index 54%
copy from content/site/apidocs-8.0.1/org/apache/juneau/rest/vars/WidgetVar.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSearcher.html
index 5d52ef3..7ef8d5d 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/rest/vars/WidgetVar.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSearcher.html
@@ -4,15 +4,15 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>WidgetVar (Apache Juneau 8.0.1)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
+<title>PojoSearcher (Apache Juneau 8.0.1)</title>
+<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WidgetVar (Apache Juneau 8.0.1)";
+            parent.document.title="PojoSearcher (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -37,26 +37,26 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
 <li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/vars/WidgetVar.html" target="_top">Frames</a></li>
-<li><a href="WidgetVar.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoSearcher.html" target="_top">Frames</a></li>
+<li><a href="PojoSearcher.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -91,53 +91,34 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.rest.vars</div>
-<h2 title="Class WidgetVar" class="title">Class WidgetVar</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class PojoSearcher" class="title">Class PojoSearcher</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/svl/Var.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.Var</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.SimpleVar</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.rest.vars.WidgetVar</li>
-</ul>
-</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.PojoSearcher</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&gt;</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/rest/vars/WidgetVar.html#line.40">WidgetVar</a>
-extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></pre>
-<div class="block">HTML widget variable resolver.
-
- <p>
- The format for this var is <js>"$W{widgetName}"</js>.
-
- <p>
- Widgets are simple class that produce some sort of string based on a passed-in HTTP request.
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/pojotools/PojoSearcher.html#line.29">PojoSearcher</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
+implements <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&gt;</pre>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.
 
  <p>
- They're registered via the following mechanisms:
- <ul>
-   <li><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html#widgets--"><code>@HtmlDoc(widgets)</code></a>
- </ul>
-
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-rest-server.SvlVariables'>Overview &gt; juneau-rest-server &gt; SVL Variables</a>
- </ul></div>
+ Allows you to quickly return subsets of arrays and collections based on position/limit arguments.</div>
 </li>
 </ul>
 </div>
@@ -157,9 +138,9 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/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/vars/WidgetVar.html#NAME">NAME</a></span></code>
-<div class="block">The name of this variable.</div>
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html#DEFAULT">DEFAULT</a></span></code>
+<div class="block">Default reusable searcher.</div>
 </td>
 </tr>
 </table>
@@ -177,8 +158,13 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <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/rest/vars/WidgetVar.html#WidgetVar--">WidgetVar</a></span>()</code>
-<div class="block">Constructor.</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html#PojoSearcher--">PojoSearcher</a></span>()</code>
+<div class="block">TODO</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html#PojoSearcher-org.apache.juneau.pojotools.MatcherFactory...-">PojoSearcher</a></span>(<a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a>...&nbsp;factories)</code>
+<div class="block">TODO</div>
 </td>
 </tr>
 </table>
@@ -197,28 +183,15 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/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/vars/WidgetVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></span>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
-       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</code>
-<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SearchArgs-">run</a></span>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+   <a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&nbsp;args)</code>
+<div class="block">Converts the specified input to some other output.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.SimpleVar">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/SimpleVar.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-">resolveTo</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.Var">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></h3>
-<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">allowNested</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">allowRecurse</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a>, <a href="../../../../../org/apache/juneau/svl/Var.html#getName--">getName</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -239,18 +212,14 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="NAME">
+<a name="DEFAULT">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/vars/WidgetVar.html#line.50">NAME</a></pre>
-<div class="block">The name of this variable.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.rest.vars.WidgetVar.NAME">Constant Field Values</a></dd>
-</dl>
+<h4>DEFAULT</h4>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a> <a href="../../../../src-html/org/apache/juneau/pojotools/PojoSearcher.html#line.34">DEFAULT</a></pre>
+<div class="block">Default reusable searcher.</div>
 </li>
 </ul>
 </li>
@@ -261,14 +230,28 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="WidgetVar--">
+<a name="PojoSearcher-org.apache.juneau.pojotools.MatcherFactory...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>PojoSearcher</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoSearcher.html#line.43">PojoSearcher</a>(<a href="../../../../org/apache/juneau/pojotools/MatcherFactory.html" title="class in org.apache.juneau.pojotools">MatcherFactory</a>...&nbsp;factories)</pre>
+<div class="block">TODO</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>factories</code> - </dd>
+</dl>
+</li>
+</ul>
+<a name="PojoSearcher--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>WidgetVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/vars/WidgetVar.html#line.55">WidgetVar</a>()</pre>
-<div class="block">Constructor.</div>
+<h4>PojoSearcher</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoSearcher.html#line.51">PojoSearcher</a>()</pre>
+<div class="block">TODO</div>
 </li>
 </ul>
 </li>
@@ -279,27 +262,26 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">
+<a name="run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SearchArgs-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/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/vars/WidgetVar.html#line.60">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
-                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)
-               throws <a href="http://docs.oracle.com/javase/8/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/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
-<div class="block">The interface that needs to be implemented for subclasses of <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>.</div>
+<h4>run</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoSearcher.html#line.56">run</a>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+                  <a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&nbsp;args)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">PojoTool</a></code></span></div>
+<div class="block">Converts the specified input to some other output.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></code></dd>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&gt;</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>session</code> - The session object used for a single instance of a var resolution.</dd>
-<dd><code>key</code> - The inside argument of the variable.</dd>
+<dd><code>session</code> - The current bean session.</dd>
+<dd><code>input</code> - The input POJO.</dd>
+<dd><code>args</code> - The arguments.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The resolved value.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - Any exception can be thrown.</dd>
+<dd>The output POJO.</dd>
 </dl>
 </li>
 </ul>
@@ -319,26 +301,26 @@ extends <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="cla
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
 <li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/vars/WidgetVar.html" target="_top">Frames</a></li>
-<li><a href="WidgetVar.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoSearcher.html" target="_top">Frames</a></li>
+<li><a href="PojoSearcher.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSorter.html
similarity index 57%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSorter.html
index 071bb02..4fd809c 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoSorter.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>PojoSorter (Apache Juneau 8.0.1)</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="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="PojoSorter (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoSorter.html" target="_top">Frames</a></li>
+<li><a href="PojoSorter.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,20 +91,15 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class PojoSorter" class="title">Class PojoSorter</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.PojoSorter</li>
 </ul>
 </li>
 </ul>
@@ -112,19 +107,15 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a>&gt;</dd>
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
-
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/pojotools/PojoSorter.html#line.25">PojoSorter</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
+implements <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a>&gt;</pre>
+<div class="block">Sorts arrays and collections of maps and beans.</div>
 </li>
 </ul>
 </div>
@@ -140,15 +131,10 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html#PojoSorter--">PojoSorter</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -166,20 +152,15 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SortArgs-">run</a></span>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+   <a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a>&nbsp;args)</code>
+<div class="block">Converts the specified input to some other output.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,22 +181,13 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="PojoSorter--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
-</dl>
+<h4>PojoSorter</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoSorter.html#line.25">PojoSorter</a>()</pre>
 </li>
 </ul>
 </li>
@@ -226,24 +198,26 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.SortArgs-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>write</h4>
-<pre>public final&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.54">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
-                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<h4>run</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoSorter.html#line.28">run</a>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+                  <a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a>&nbsp;args)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">PojoTool</a></code></span></div>
+<div class="block">Converts the specified input to some other output.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools">SortArgs</a>&gt;</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>o</code> - The object to serialize.</dd>
+<dd><code>session</code> - The current bean session.</dd>
+<dd><code>input</code> - The input POJO.</dd>
+<dd><code>args</code> - The arguments.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The serialized object.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></code> - If a problem occurred trying to convert the output.</dd>
+<dd>The output POJO.</dd>
 </dl>
 </li>
 </ul>
@@ -274,12 +248,12 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoSorter.html" target="_top">Frames</a></li>
+<li><a href="PojoSorter.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/utils/MockHttpConnection.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoTool.html
similarity index 59%
copy from content/site/apidocs-8.0.1/org/apache/juneau/utils/MockHttpConnection.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoTool.html
index d4bce52..6d889ea 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/utils/MockHttpConnection.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoTool.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MockHttpConnection (Apache Juneau 8.0.1)</title>
+<title>PojoTool (Apache Juneau 8.0.1)</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="MockHttpConnection (Apache Juneau 8.0.1)";
+            parent.document.title="PojoTool (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/utils/MockHttpConnection.html" target="_top">Frames</a></li>
-<li><a href="MockHttpConnection.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoTool.html" target="_top">Frames</a></li>
+<li><a href="PojoTool.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,25 +91,25 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.utils</div>
-<h2 title="Interface MockHttpConnection" class="title">Interface MockHttpConnection</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Interface PojoTool" class="title">Interface PojoTool&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - The argument object type.</dd>
+</dl>
+<dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/apache/juneau/rest/mock/MockRest.html" title="class in org.apache.juneau.rest.mock">MockRest</a></dd>
+<dd><a href="../../../../org/apache/juneau/pojotools/PojoPaginator.html" title="class in org.apache.juneau.pojotools">PojoPaginator</a>, <a href="../../../../org/apache/juneau/pojotools/PojoSearcher.html" title="class in org.apache.juneau.pojotools">PojoSearcher</a>, <a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools">PojoSorter</a>, <a href="../../../../org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.june [...]
 </dl>
 <hr>
 <br>
-<pre>public interface <a href="../../../../src-html/org/apache/juneau/utils/MockHttpConnection.html#line.22">MockHttpConnection</a></pre>
-<div class="block">Represent the basic connection for mock HTTP requests.
-
- <p>
- Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- class to send and receive mocked requests using the <code>MockRest</code> interface.</div>
+<pre>public interface <a href="../../../../src-html/org/apache/juneau/pojotools/PojoTool.html#line.22">PojoTool</a>&lt;T&gt;</pre>
+<div class="block">Interface for classes that convert POJOs in some way using some predefined arguments object.</div>
 </li>
 </ul>
 </div>
@@ -129,11 +129,11 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils">MockHttpRequest</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/MockHttpConnection.html#request-java.lang.String-java.lang.String-java.lang.Object-">request</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
-       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;body)</code>
-<div class="block">Creates a mocked HTTP request.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run</a></span>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+   <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="type parameter in PojoTool">T</a>&nbsp;args)</code>
+<div class="block">Converts the specified input to some other output.</div>
 </td>
 </tr>
 </table>
@@ -151,26 +151,25 @@ var activeTableTab = "activeTableTab";
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="request-java.lang.String-java.lang.String-java.lang.Object-">
+<a name="run-org.apache.juneau.BeanSession-java.lang.Object-java.lang.Object-">
+<!--   -->
+</a><a name="run-org.apache.juneau.BeanSession-java.lang.Object-T-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>request</h4>
-<pre><a href="../../../../org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils">MockHttpRequest</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/utils/MockHttpConnection.html#line.33">request</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;method,
-                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;body)
-                 throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Creates a mocked HTTP request.</div>
+<h4>run</h4>
+<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoTool.html#line.32">run</a>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+           <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+           <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="type parameter in PojoTool">T</a>&nbsp;args)</pre>
+<div class="block">Converts the specified input to some other output.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The HTTP request method.</dd>
-<dd><code>path</code> - The HTTP request path.</dd>
-<dd><code>body</code> - The HTTP request body.</dd>
+<dd><code>session</code> - The current bean session.</dd>
+<dd><code>input</code> - The input POJO.</dd>
+<dd><code>args</code> - The arguments.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>A new mock request.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+<dd>The output POJO.</dd>
 </dl>
 </li>
 </ul>
@@ -201,12 +200,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/MockHttpRequest.html" title="interface in org.apache.juneau.utils"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/utils/MockHttpConnection.html" target="_top">Frames</a></li>
-<li><a href="MockHttpConnection.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoTool.html" target="_top">Frames</a></li>
+<li><a href="PojoTool.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoViewer.html
similarity index 57%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoViewer.html
index 071bb02..b65061f 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/PojoViewer.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>PojoViewer (Apache Juneau 8.0.1)</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="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="PojoViewer (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoViewer.html" target="_top">Frames</a></li>
+<li><a href="PojoViewer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,20 +91,15 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class PojoViewer" class="title">Class PojoViewer</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.PojoViewer</li>
 </ul>
 </li>
 </ul>
@@ -112,19 +107,18 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a>&gt;</dd>
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/pojotools/PojoViewer.html#line.28">PojoViewer</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
+implements <a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a>&gt;</pre>
+<div class="block">Designed to provide paging on POJOs consisting of arrays and collections.
 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+ <p>
+ Allows you to quickly return subsets of arrays and collections based on position/limit arguments.</div>
 </li>
 </ul>
 </div>
@@ -140,15 +134,10 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html#PojoViewer--">PojoViewer</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -166,20 +155,15 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html#run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.ViewArgs-">run</a></span>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+   <a href="../../../../org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a>&nbsp;args)</code>
+<div class="block">Converts the specified input to some other output.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,22 +184,13 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="PojoViewer--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
-</dl>
+<h4>PojoViewer</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoViewer.html#line.28">PojoViewer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -226,24 +201,26 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="run-org.apache.juneau.BeanSession-java.lang.Object-org.apache.juneau.pojotools.ViewArgs-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>write</h4>
-<pre>public final&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.54">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
-                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<h4>run</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/PojoViewer.html#line.31">run</a>(<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;session,
+                  <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;input,
+                  <a href="../../../../org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a>&nbsp;args)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">PojoTool</a></code></span></div>
+<div class="block">Converts the specified input to some other output.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html#run-org.apache.juneau.BeanSession-java.lang.Object-T-">run</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools">PojoTool</a>&lt;<a href="../../../../org/apache/juneau/pojotools/ViewArgs.html" title="class in org.apache.juneau.pojotools">ViewArgs</a>&gt;</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>o</code> - The object to serialize.</dd>
+<dd><code>session</code> - The current bean session.</dd>
+<dd><code>input</code> - The input POJO.</dd>
+<dd><code>args</code> - The arguments.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The serialized object.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></code> - If a problem occurred trying to convert the output.</dd>
+<dd>The output POJO.</dd>
 </dl>
 </li>
 </ul>
@@ -274,12 +251,12 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoTool.html" title="interface in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/PojoViewer.html" target="_top">Frames</a></li>
+<li><a href="PojoViewer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SearchArgs.html
similarity index 57%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SearchArgs.html
index 071bb02..6a13df3 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SearchArgs.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>SearchArgs (Apache Juneau 8.0.1)</title>
 <link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="SearchArgs (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/SearchArgs.html" target="_top">Frames</a></li>
+<li><a href="SearchArgs.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,40 +91,26 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class SearchArgs" class="title">Class SearchArgs</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.SearchArgs</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
-
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/pojotools/SearchArgs.html#line.22">SearchArgs</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Encapsulates arguments for the <a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><code>PojoSorter</code></a> class.</div>
 </li>
 </ul>
 </div>
@@ -140,13 +126,15 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html#SearchArgs-java.util.List-">SearchArgs</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;searchArgs)</code>
+<div class="block">Constructor.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html#SearchArgs-java.lang.String-">SearchArgs</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;searchArgs)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -166,20 +154,20 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html#append-java.lang.String-java.lang.String-">append</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;column,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;searchTerm)</code>
+<div class="block">Appends the specified search argument.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html#getSearch--">getSearch</a></span>()</code>
+<div class="block">The query search terms.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,21 +188,31 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="SearchArgs-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SearchArgs</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/SearchArgs.html#line.32">SearchArgs</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;searchArgs)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>searchArgs</code> - Search arguments.</dd>
+</dl>
+</li>
+</ul>
+<a name="SearchArgs-java.util.List-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
+<h4>SearchArgs</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/SearchArgs.html#line.41">SearchArgs</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;searchArgs)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
+<dd><code>searchArgs</code> - Search arguments.</dd>
 </dl>
 </li>
 </ul>
@@ -226,24 +224,41 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="append-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>write</h4>
-<pre>public final&nbsp;byte[]&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.54">write</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)
-                   throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<h4>append</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools">SearchArgs</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/SearchArgs.html#line.58">append</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;column,
+                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;searchTerm)</pre>
+<div class="block">Appends the specified search argument.</div>
 <dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/marshall/Marshall.html#write-java.lang.Object-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>o</code> - The object to serialize.</dd>
+<dd><code>column</code> - The column name to search.</dd>
+<dd><code>searchTerm</code> - The search term.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
+<a name="getSearch--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getSearch</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/junea [...]
+<div class="block">The query search terms.
+
+ <p>
+ The search terms are key/value pairs consisting of column-names and search tokens.
+
+ <p>
+ It's up to implementers to decide the syntax and meaning of the search term.</div>
+<dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The serialized object.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></code> - If a problem occurred trying to convert the output.</dd>
+<dd>An unmodifiable map of query search terms.</dd>
 </dl>
 </li>
 </ul>
@@ -274,12 +289,12 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/PojoViewer.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/SortArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/SearchArgs.html" target="_top">Frames</a></li>
+<li><a href="SearchArgs.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SortArgs.html
similarity index 58%
copy from content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
copy to content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SortArgs.html
index 071bb02..e90ecda 100644
--- a/content/site/apidocs-8.0.1/org/apache/juneau/marshall/StreamMarshall.html
+++ b/content/site/apidocs-8.0.1/org/apache/juneau/pojotools/SortArgs.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StreamMarshall (Apache Juneau 8.0.1)</title>
+<title>SortArgs (Apache Juneau 8.0.1)</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="StreamMarshall (Apache Juneau 8.0.1)";
+            parent.document.title="SortArgs (Apache Juneau 8.0.1)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/marshall/SimpleJson.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/marshall/Turtle.html" title="class in org.apache.juneau.marshall"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/SearchArgs.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/pojotools/StringMatcherFactory.html" title="class in org.apache.juneau.pojotools"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/marshall/StreamMarshall.html" target="_top">Frames</a></li>
-<li><a href="StreamMarshall.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/pojotools/SortArgs.html" target="_top">Frames</a></li>
+<li><a href="SortArgs.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,40 +91,26 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.marshall</div>
-<h2 title="Class StreamMarshall" class="title">Class StreamMarshall</h2>
+<div class="subTitle">org.apache.juneau.pojotools</div>
+<h2 title="Class SortArgs" class="title">Class SortArgs</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/8/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/marshall/Marshall.html" title="class in org.apache.juneau.marshall">org.apache.juneau.marshall.Marshall</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.marshall.StreamMarshall</li>
-</ul>
-</li>
+<li>org.apache.juneau.pojotools.SortArgs</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/marshall/Jso.html" title="class in org.apache.juneau.marshall">Jso</a>, <a href="../../../../org/apache/juneau/marshall/MsgPack.html" title="class in org.apache.juneau.marshall">MsgPack</a></dd>
-</dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.26">StreamMarshall</a>
-extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall"><code>Marshall</code></a> for stream-based serializers and parsers.
-
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Marshalls'>Overview &gt; juneau-marshall &gt; Marshalls</a>
- </ul></div>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/pojotools/SortArgs.html#line.23">SortArgs</a>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Encapsulates arguments for the <a href="../../../../org/apache/juneau/pojotools/PojoSorter.html" title="class in org.apache.juneau.pojotools"><code>PojoSorter</code></a> class.</div>
 </li>
 </ul>
 </div>
@@ -140,13 +126,15 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colFirst" scope="col">Modifier</th>
-<th class="colLast" scope="col">Constructor and Description</th>
+<th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">StreamMarshall</a></span>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-              <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SortArgs.html#SortArgs-java.util.Collection-">SortArgs</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;sortArgs)</code>
+<div class="block">Constructor.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SortArgs.html#SortArgs-java.lang.String...-">SortArgs</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;sortArgs)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -166,20 +154,13 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/marshall/StreamMarshall.html#write-java.lang.Object-">write</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</code>
-<div class="block">Serializes a POJO directly to a <code><jk>byte</jk>[]</code>.</div>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/pojotools/SortArgs.html#getSort--">getSort</a></span>()</code>
+<div class="block">The sort columns.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.marshall.Marshall">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.marshall.<a href="../../../../org/apache/juneau/marshall/Marshall.html" title="class in org.apache.juneau.marshall">Marshall</a></h3>
-<code><a href="../../../../org/apache/juneau/marshall/Marshall.html#println-java.lang.Object-">println</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.Class-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#read-java.lang.Object-java.lang.reflect.Type-java.lang.reflect.Type...-">read</a>, <a href="../../../../org/apache/juneau/marshall/Marshall.html#toString-java.lang.Object-">toString</a>, <a href="../../../../or [...]
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -200,21 +181,43 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="StreamMarshall-org.apache.juneau.serializer.OutputStreamSerializer-org.apache.juneau.parser.InputStreamParser-">
+<a name="SortArgs-java.lang.String...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SortArgs</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/SortArgs.html#line.39">SortArgs</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;sortArgs)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sortArgs</code> - Sort arguments.
+   <br>Values are of the following forms:
+   <ul>
+      <li><js>"column"</js> - Sort column ascending.
+      <li><js>"column+"</js> - Sort column ascending.
+      <li><js>"column-"</js> - Sort column descending.
+   </ul></dd>
+</dl>
+</li>
+</ul>
+<a name="SortArgs-java.util.Collection-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>StreamMarshall</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/marshall/StreamMarshall.html#line.40">StreamMarshall</a>(<a href="../../../../org/apache/juneau/serializer/OutputStreamSerializer.html" title="class in org.apache.juneau.serializer">OutputStreamSerializer</a>&nbsp;s,
-                         <a href="../../../../org/apache/juneau/parser/InputStreamParser.html" title="class in org.apache.juneau.parser">InputStreamParser</a>&nbsp;p)</pre>
+<h4>SortArgs</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/pojotools/SortArgs.html#line.55">SortArgs</a>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;sortArgs)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The serializer to use for serializing output.
-   <br>Must not be <jk>null</jk>.</dd>
-<dd><code>p</code> - The parser to use for parsing input.
-   <br>Must not be <jk>null</jk>.</dd>
+<dd><code>sortArgs</code> - Sort arguments.
+   <br>Values are of the following forms:
+   <ul>
+      <li><js>"column"</js> - Sort column ascending.
+      <li><js>"column+"</js> - Sort column ascending.
+      <li><js>"column-"</js> - Sort column descending.
+   </ul></dd>
 </dl>
 </li>
 </ul>
@@ -226,24 +229,21 @@ extends <a href="../../../../org/apache/juneau/marshall/Marshall.html" title="cl
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-java.lang.Object-">
+<a name="getSort--">
 <!--   -->
 </a>
... 70312 lines suppressed ...