juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau-website] branch asf-site updated: Javadoc updates.
Date Thu, 08 Feb 2018 02:07:06 GMT
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 63f9043  Javadoc updates.
63f9043 is described below

commit 63f9043750d53ee0ff31caf53e0e995a2ff79545
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Wed Feb 7 21:07:01 2018 -0500

    Javadoc updates.
---
 content/site/apidocs/allclasses-frame.html         |    6 +-
 content/site/apidocs/allclasses-noframe.html       |    6 +-
 content/site/apidocs/constant-values.html          |  118 +-
 content/site/apidocs/index-all.html                |   70 +-
 .../org/apache/juneau/ini/ConfigFileImpl.html      |   94 +-
 .../org/apache/juneau/ini/ConfigFileListener.html  |    4 +-
 .../org/apache/juneau/ini/ConfigFileVar.html       |  418 --
 .../org/apache/juneau/ini/ConfigFileWrapped.html   |   92 +-
 .../org/apache/juneau/ini/package-frame.html       |    1 -
 .../org/apache/juneau/ini/package-summary.html     |   28 +-
 .../org/apache/juneau/ini/package-tree.html        |   17 +-
 .../ArgsVar.html => ini/vars/ConfigFileVar.html}   |   87 +-
 .../org/apache/juneau/ini/vars/package-frame.html  |   20 +
 .../sample => ini/vars}/package-summary.html       |   34 +-
 .../juneau/{svl => ini}/vars/package-tree.html     |   39 +-
 .../apache/juneau/internal/package-summary.html    |    4 +-
 .../org/apache/juneau/internal/package-tree.html   |    4 +-
 .../apache/juneau/microservice/Microservice.html   |   62 +-
 .../microservice/sample/package-summary.html       |    4 +-
 .../juneau/microservice/sample/package-tree.html   |    4 +-
 .../juneau/{svl => microservice}/vars/ArgsVar.html |   34 +-
 .../vars/ManifestFileVar.html                      |   38 +-
 .../juneau/microservice/vars/package-frame.html    |   21 +
 .../{sample => vars}/package-summary.html          |   28 +-
 .../{sample => vars}/package-tree.html             |   40 +-
 .../org/apache/juneau/msgpack/package-summary.html |    4 +-
 .../org/apache/juneau/msgpack/package-tree.html    |    4 +-
 .../org/apache/juneau/rest/RestContextBuilder.html |  300 +-
 .../juneau/rest/annotation/ResourceSwagger.html    |   12 +-
 .../org/apache/juneau/rest/vars/FileVar.html       |    2 +-
 .../juneau/rest/vars/RequestAttributeVar.html      |    2 +-
 .../juneau/rest/vars/RequestFormDataVar.html       |    2 +-
 .../apache/juneau/rest/vars/RequestHeaderVar.html  |    2 +-
 .../apache/juneau/rest/vars/RequestPathVar.html    |    2 +-
 .../apache/juneau/rest/vars/RequestQueryVar.html   |    2 +-
 .../org/apache/juneau/rest/vars/RequestVar.html    |    2 +-
 .../org/apache/juneau/rest/vars/RestInfoVar.html   |    2 +-
 .../juneau/rest/vars/SerializedRequestAttrVar.html |    2 +-
 .../org/apache/juneau/svl/DefaultingVar.html       |   24 +-
 .../site/apidocs/org/apache/juneau/svl/MapVar.html |   17 +-
 .../apache/juneau/svl/MultipartResolvingVar.html   |   22 +-
 .../org/apache/juneau/svl/MultipartVar.html        |   23 +-
 .../org/apache/juneau/svl/ResolvingObjectMap.html  |   13 +-
 .../apidocs/org/apache/juneau/svl/SimpleVar.html   |   22 +-
 .../apidocs/org/apache/juneau/svl/StreamedVar.html |   24 +-
 .../site/apidocs/org/apache/juneau/svl/Var.html    |   39 +-
 .../apidocs/org/apache/juneau/svl/VarResolver.html |  171 +-
 .../org/apache/juneau/svl/VarResolverBuilder.html  |   23 +-
 .../org/apache/juneau/svl/VarResolverContext.html  |   23 +-
 .../org/apache/juneau/svl/VarResolverSession.html  |   30 +-
 .../org/apache/juneau/svl/package-summary.html     |  262 +-
 .../juneau/svl/vars/CoalesceAndRecurseVar.html     |   19 +-
 .../org/apache/juneau/svl/vars/CoalesceVar.html    |   21 +-
 .../apache/juneau/svl/vars/EnvVariablesVar.html    |   21 +-
 .../apidocs/org/apache/juneau/svl/vars/IfVar.html  |   25 +-
 .../org/apache/juneau/svl/vars/SwitchVar.html      |   21 +-
 .../juneau/svl/vars/SystemPropertiesVar.html       |   19 +-
 .../org/apache/juneau/svl/vars/package-frame.html  |    2 -
 .../apache/juneau/svl/vars/package-summary.html    |   18 +-
 .../org/apache/juneau/svl/vars/package-tree.html   |    2 -
 content/site/apidocs/overview-frame.html           |    2 +
 content/site/apidocs/overview-summary.html         |  559 ++-
 content/site/apidocs/overview-tree.html            |    8 +-
 content/site/apidocs/package-list                  |    2 +
 .../org/apache/juneau/ini/ConfigFileImpl.html      | 1577 +++----
 .../org/apache/juneau/ini/ConfigFileVar.html       |  141 -
 .../org/apache/juneau/ini/ConfigFileWrapped.html   |  531 +--
 .../org/apache/juneau/ini/vars/ConfigFileVar.html  |  144 +
 .../apache/juneau/microservice/Microservice.html   | 1770 ++++----
 .../org/apache/juneau/microservice/Resource.html   |    6 +-
 .../apache/juneau/microservice/ResourceGroup.html  |    6 +-
 .../juneau/microservice/ResourceJenaGroup.html     |    6 +-
 .../juneau/{svl => microservice}/vars/ArgsVar.html |    2 +-
 .../vars/ManifestFileVar.html                      |    2 +-
 .../org/apache/juneau/rest/RestContextBuilder.html | 4621 ++++++++++----------
 .../juneau/rest/annotation/ResourceSwagger.html    |    2 +-
 .../org/apache/juneau/rest/vars/FileVar.html       |    2 +-
 .../org/apache/juneau/svl/DefaultingVar.html       |   60 +-
 .../src-html/org/apache/juneau/svl/MapVar.html     |   53 +-
 .../apache/juneau/svl/MultipartResolvingVar.html   |   62 +-
 .../org/apache/juneau/svl/MultipartVar.html        |   67 +-
 .../org/apache/juneau/svl/ResolvingObjectMap.html  |   45 +-
 .../src-html/org/apache/juneau/svl/SimpleVar.html  |   48 +-
 .../org/apache/juneau/svl/StreamedVar.html         |   50 +-
 .../src-html/org/apache/juneau/svl/Var.html        |  247 +-
 .../org/apache/juneau/svl/VarResolver.html         |  345 +-
 .../org/apache/juneau/svl/VarResolverBuilder.html  |  169 +-
 .../org/apache/juneau/svl/VarResolverContext.html  |  137 +-
 .../org/apache/juneau/svl/VarResolverSession.html  |  727 +--
 .../juneau/svl/vars/CoalesceAndRecurseVar.html     |   41 +-
 .../org/apache/juneau/svl/vars/CoalesceVar.html    |   51 +-
 .../apache/juneau/svl/vars/EnvVariablesVar.html    |   45 +-
 .../src-html/org/apache/juneau/svl/vars/IfVar.html |   55 +-
 .../org/apache/juneau/svl/vars/SwitchVar.html      |   75 +-
 .../juneau/svl/vars/SystemPropertiesVar.html       |   33 +-
 95 files changed, 6934 insertions(+), 7209 deletions(-)

diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index 63bccc6..6fb85fd 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -29,7 +29,7 @@
 <li><a href="org/apache/juneau/transform/AnnotationBeanFilterBuilder.html" title="class in org.apache.juneau.transform" target="classFrame">AnnotationBeanFilterBuilder</a></li>
 <li><a href="org/apache/juneau/dto/html5/Area.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Area</a></li>
 <li><a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils" target="classFrame">Args</a></li>
-<li><a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ArgsVar</a></li>
+<li><a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars" target="classFrame">ArgsVar</a></li>
 <li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal" target="classFrame">ArrayUtils</a></li>
 <li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Article</a></li>
 <li><a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiMap</a></li>
@@ -149,7 +149,7 @@
 <li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini" target="classFrame">ConfigFileFormat</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
-<li><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileVar</a></li>
+<li><a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars" target="classFrame">ConfigFileVar</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
 <li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources" target="classFrame">ConfigResource</a></li>
 <li><a href="org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigSource</a></li>
@@ -417,7 +417,7 @@
 <li><a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html" title="class in org.apache.juneau.microservice.resources" target="classFrame">LogsResource.FileResource</a></li>
 <li><a href="org/apache/juneau/dto/html5/Main.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Main</a></li>
 <li><a href="org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils" target="classFrame">ManifestFile</a></li>
-<li><a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ManifestFileVar</a></li>
+<li><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars" target="classFrame">ManifestFileVar</a></li>
 <li><a href="org/apache/juneau/dto/html5/Map.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Map</a></li>
 <li><a href="org/apache/juneau/transform/MapSwap.html" title="class in org.apache.juneau.transform" target="classFrame">MapSwap</a></li>
 <li><a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl" target="classFrame">MapVar</a></li>
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index ab7332d..4524f66 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -29,7 +29,7 @@
 <li><a href="org/apache/juneau/transform/AnnotationBeanFilterBuilder.html" title="class in org.apache.juneau.transform">AnnotationBeanFilterBuilder</a></li>
 <li><a href="org/apache/juneau/dto/html5/Area.html" title="class in org.apache.juneau.dto.html5">Area</a></li>
 <li><a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a></li>
-<li><a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></li>
+<li><a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></li>
 <li><a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal">ArrayUtils</a></li>
 <li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5">Article</a></li>
 <li><a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal">AsciiMap</a></li>
@@ -149,7 +149,7 @@
 <li><a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></li>
-<li><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></li>
+<li><a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></li>
 <li><a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></li>
 <li><a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a></li>
 <li><a href="org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini">ConfigSource</a></li>
@@ -417,7 +417,7 @@
 <li><a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource.FileResource</a></li>
 <li><a href="org/apache/juneau/dto/html5/Main.html" title="class in org.apache.juneau.dto.html5">Main</a></li>
 <li><a href="org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a></li>
-<li><a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></li>
+<li><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></li>
 <li><a href="org/apache/juneau/dto/html5/Map.html" title="class in org.apache.juneau.dto.html5">Map</a></li>
 <li><a href="org/apache/juneau/transform/MapSwap.html" title="class in org.apache.juneau.transform">MapSwap</a></li>
 <li><a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl">MapVar</a></li>
diff --git a/content/site/apidocs/constant-values.html b/content/site/apidocs/constant-values.html
index bbe7505..b9d21d7 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -699,9 +699,11 @@
 </tbody>
 </table>
 </li>
+</ul>
+<ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -709,17 +711,17 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.ini.ConfigFileVar.NAME">
+<td class="colFirst"><a name="org.apache.juneau.ini.vars.ConfigFileVar.NAME">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/ini/ConfigFileVar.html#NAME">NAME</a></code></td>
+<td><code><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#NAME">NAME</a></code></td>
 <td class="colLast"><code>"C"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.ini.ConfigFileVar.SESSION_config">
+<td class="colFirst"><a name="org.apache.juneau.ini.vars.ConfigFileVar.SESSION_config">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></code></td>
+<td><code><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></code></td>
 <td class="colLast"><code>"config"</code></td>
 </tr>
 </tbody>
@@ -1218,6 +1220,60 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.microservice.vars.ArgsVar.NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/microservice/vars/ArgsVar.html#NAME">NAME</a></code></td>
+<td class="colLast"><code>"ARG"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.juneau.microservice.vars.ArgsVar.SESSION_args">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/microservice/vars/ArgsVar.html#SESSION_args">SESSION_args</a></code></td>
+<td class="colLast"><code>"args"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.microservice.vars.ManifestFileVar.NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#NAME">NAME</a></code></td>
+<td class="colLast"><code>"MF"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.juneau.microservice.vars.ManifestFileVar.SESSION_manifest">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></code></td>
+<td class="colLast"><code>"manifest"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.juneau.msgpack.<a href="org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack">MsgPackSerializer</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -2186,32 +2242,6 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ArgsVar.NAME">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ArgsVar.html#NAME">NAME</a></code></td>
-<td class="colLast"><code>"ARG"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ArgsVar.SESSION_args">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ArgsVar.html#SESSION_args">SESSION_args</a></code></td>
-<td class="colLast"><code>"args"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars">CoalesceAndRecurseVar</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -2288,32 +2318,6 @@
 </li>
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ManifestFileVar.NAME">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#NAME">NAME</a></code></td>
-<td class="colLast"><code>"MF"</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.apache.juneau.svl.vars.ManifestFileVar.SESSION_manifest">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></code></td>
-<td class="colLast"><code>"manifest"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index d153fba..97ac8bd 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -1487,11 +1487,11 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified argument types are valid for the specified parameter types.</div>
 </dd>
-<dt><a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a> - Class in <a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></dt>
+<dt><a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ArgsVar</span></a> - Class in <a href="org/apache/juneau/microservice/vars/package-summary.html">org.apache.juneau.microservice.vars</a></dt>
 <dd>
 <div class="block">JVM args variable resolver.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ArgsVar.html#ArgsVar--">ArgsVar()</a></span> - Constructor for class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ArgsVar.html#ArgsVar--">ArgsVar()</a></span> - Constructor for class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -5632,11 +5632,11 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileListener.html#ConfigFileListener--">ConfigFileListener()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a> - Class in <a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></dt>
+<dt><a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><span class="typeNameLink">ConfigFileVar</span></a> - Class in <a href="org/apache/juneau/ini/vars/package-summary.html">org.apache.juneau.ini.vars</a></dt>
 <dd>
 <div class="block">Config file variable resolver.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar()</a></span> - Constructor for class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar()</a></span> - Constructor for class org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -6287,6 +6287,10 @@
 <dd>
 <div class="block">Instantiates a new clean-slate <a href="org/apache/juneau/serializer/SerializerGroupBuilder.html" title="class in org.apache.juneau.serializer"><code>SerializerGroupBuilder</code></a> object.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/VarResolver.html#create--">create()</a></span> - Static method in class org.apache.juneau.svl.<a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a></dt>
+<dd>
+<div class="block">Instantiates a new clean-slate <a href="org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><code>VarResolverBuilder</code></a> object.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transform/BuilderSwap.html#create-org.apache.juneau.BeanSession-org.apache.juneau.ClassMeta-">create(BeanSession, ClassMeta&lt;?&gt;)</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>
 <div class="block">Creates a new builder object.</div>
@@ -7162,7 +7166,13 @@
 <div class="block">Default string variable resolver with support for system properties and environment variables:
  
  
-   <code>$S{key}</code>,<code>$S{key,default}</code> - System properties.</div>
+   <code>$S{key}</code>,<code>$S{key,default}</code> - <a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
+   <code>$E{key}</code>,<code>$E{key,default}</code> - <a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
+   <code>$IF{booleanValue,thenValue[,elseValue]}</code> - <a href="org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
+   <code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - <a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
+   <code>$CO{arg1[,arg2...]}</code> - <a href="org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a>
+   <code>$CR{arg1[,arg2...]}</code> - <a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a>
+ </div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transform/PropertyFilter.html#DEFAULT">DEFAULT</a></span> - Static variable in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/PropertyFilter.html" title="class in org.apache.juneau.transform">PropertyFilter</a></dt>
 <dd>
@@ -18686,11 +18696,11 @@
 <dd>
 <div class="block">Finds and loads the manifest file of the jar file that the specified class is contained within.</div>
 </dd>
-<dt><a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a> - Class in <a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></dt>
+<dt><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ManifestFileVar</span></a> - Class in <a href="org/apache/juneau/microservice/vars/package-summary.html">org.apache.juneau.microservice.vars</a></dt>
 <dd>
 <div class="block">Manifest file entries variable resolver.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar()</a></span> - Constructor for class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar()</a></span> - Constructor for class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></dt>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
@@ -19543,12 +19553,20 @@
 <dd>
 <div class="block">Same as <a href="org/apache/juneau/dto/swagger/Xml.html#setName-java.lang.String-"><code>Xml.setName(String)</code></a>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></dt>
 <dd>
 <div class="block">The name of this variable.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html#name">name</a></span> - Variable in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.FileResource.html" title="class in org.apache.juneau.microservice.resources">LogsResource.FileResource</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ArgsVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></dt>
+<dd>
+<div class="block">The name of this variable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></dt>
+<dd>
+<div class="block">The name of this variable.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/remoteable/RemoteMethodArg.html#name">name</a></span> - Variable in class org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a></dt>
 <dd>
 <div class="block">The argument name.</div>
@@ -19617,10 +19635,6 @@
 <dd>
 <div class="block">The name of this variable.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ArgsVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></dt>
-<dd>
-<div class="block">The name of this variable.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars">CoalesceAndRecurseVar</a></dt>
 <dd>
 <div class="block">The name of this variable.</div>
@@ -19637,10 +19651,6 @@
 <dd>
 <div class="block">The name of this variable.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></dt>
-<dd>
-<div class="block">The name of this variable.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/SwitchVar.html#NAME">NAME</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></dt>
 <dd>
 <div class="block">The name of this variable.</div>
@@ -21120,6 +21130,10 @@
 <dd>
 <div class="block">INI File Support</div>
 </dd>
+<dt><a href="org/apache/juneau/ini/vars/package-summary.html">org.apache.juneau.ini.vars</a> - package org.apache.juneau.ini.vars</dt>
+<dd>
+<div class="block">Predefined SVL Variables</div>
+</dd>
 <dt><a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a> - package org.apache.juneau.internal</dt>
 <dd>
 <div class="block">Internal Utilities</div>
@@ -21160,6 +21174,10 @@
 <dd>
 <div class="block">Microservice Samples</div>
 </dd>
+<dt><a href="org/apache/juneau/microservice/vars/package-summary.html">org.apache.juneau.microservice.vars</a> - package org.apache.juneau.microservice.vars</dt>
+<dd>
+<div class="block">Predefined SVL Variables</div>
+</dd>
 <dt><a href="org/apache/juneau/msgpack/package-summary.html">org.apache.juneau.msgpack</a> - package org.apache.juneau.msgpack</dt>
 <dd>
 <div class="block">MessagePack Marshalling Support</div>
@@ -23968,7 +23986,11 @@
 <dd>
 <div class="block">If this schema is a reference to another schema (i.e.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ArgsVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestParam.html#resolve-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">resolve(RestRequest, RestResponse)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a></dt>
 <dd>
@@ -24032,8 +24054,6 @@
 <dd>
 <div class="block">Convenience method for resolving variables in arbitrary objects.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ArgsVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars">CoalesceAndRecurseVar</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/CoalesceVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars">CoalesceVar</a></dt>
@@ -24042,8 +24062,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/IfVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String:A-">resolve(VarResolverSession, String[])</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars">IfVar</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">resolve(VarResolverSession, String)</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/SwitchVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String:A-">resolve(VarResolverSession, String[])</a></span> - Method in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/UriResolver.html#resolve-java.lang.Object-">resolve(Object)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a></dt>
@@ -25612,15 +25630,15 @@
 <dd>
 <div class="block">Default constructor.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ArgsVar.html#SESSION_args">SESSION_args</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ArgsVar.html#SESSION_args">SESSION_args</a></span> - Static variable in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></dt>
 <dd>
 <div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></span> - Static variable in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></span> - Static variable in class org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></dt>
 <dd>
 <div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></span> - Static variable in class org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></span> - Static variable in class org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></dt>
 <dd>
 <div class="block">The name of the session or context object that identifies the <a href="org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object.</div>
 </dd>
@@ -31599,10 +31617,6 @@ the order they are declared.</div>
 <dd>
 <div class="block">Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/svl/VarResolver.html#VarResolver-java.lang.Class:A-java.util.Map-">VarResolver(Class&lt;? extends Var&gt;[], Map&lt;String, Object&gt;)</a></span> - Constructor for class org.apache.juneau.svl.<a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a></dt>
-<dd>
-<div class="block">Constructor.</div>
-</dd>
 <dt><a href="org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">VarResolverBuilder</span></a> - Class in <a href="org/apache/juneau/svl/package-summary.html">org.apache.juneau.svl</a></dt>
 <dd>
 <div class="block">Builder class for building instances of <a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileImpl.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileImpl.html
index 2cbbfd5..1d930a6 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileImpl.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileImpl.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.36">ConfigFileImpl</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.37">ConfigFileImpl</a>
 extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></pre>
 <div class="block">Implementation class for <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>.</div>
 </li>
@@ -488,7 +488,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>ConfigFileImpl</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.86">ConfigFileImpl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;file,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.87">ConfigFileImpl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;file,
                       boolean&nbsp;readOnly,
                       <a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a>&nbsp;encoder,
                       <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html" title="class in org.apache.juneau.serializer">WriterSerializer</a>&nbsp;serializer,
@@ -527,7 +527,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>ConfigFileImpl</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.113">ConfigFileImpl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;file)
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.114">ConfigFileImpl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;file)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Constructor.
  
@@ -548,7 +548,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ConfigFileImpl</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.126">ConfigFileImpl</a>()
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.127">ConfigFileImpl</a>()
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Constructor.
  
@@ -575,7 +575,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>loadIfModified</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.131">loadIfModified</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.132">loadIfModified</a>()
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#loadIfModified--">ConfigFile</a></code></span></div>
 <div class="block">Reloads this config file object from the persisted file contents if the modified timestamp on the file has changed.</div>
@@ -595,7 +595,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>load</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.145">load</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.146">load</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load--">ConfigFile</a></code></span></div>
 <div class="block">Loads this config file object from the persisted file contents.</div>
@@ -615,7 +615,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>load</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.153">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;r)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.154">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;r)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load-java.io.Reader-">ConfigFile</a></code></span></div>
 <div class="block">Loads this config file object from the specified reader.</div>
@@ -637,7 +637,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>serialize</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.206">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.207">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
                            <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;serializer,
                            boolean&nbsp;newline)
                     throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -671,7 +671,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>parse</h4>
-<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.228">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.229">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                       <a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>&nbsp;parser,
                       <a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>...&nbsp;args)
@@ -700,7 +700,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.268">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.269">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="put-java.lang.String-org.apache.juneau.ini.Section-">
@@ -709,7 +709,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.280">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.281">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
                    <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;section)</pre>
 </li>
 </ul>
@@ -719,7 +719,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>putAll</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.301">putAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class in  [...]
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.302">putAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class in  [...]
 </li>
 </ul>
 <a name="clear--">
@@ -728,7 +728,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>clear</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.314">clear</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.315">clear</a>()</pre>
 </li>
 </ul>
 <a name="containsKey-java.lang.Object-">
@@ -737,7 +737,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>containsKey</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.328">containsKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.329">containsKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="containsValue-java.lang.Object-">
@@ -746,7 +746,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>containsValue</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.335">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.336">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 </li>
 </ul>
 <a name="entrySet--">
@@ -755,7 +755,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>entrySet</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Sec [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Sec [...]
 </li>
 </ul>
 <a name="isEmpty--">
@@ -764,7 +764,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>isEmpty</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.379">isEmpty</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.380">isEmpty</a>()</pre>
 </li>
 </ul>
 <a name="keySet--">
@@ -773,7 +773,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>keySet</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileImpl.html#line.384">keySet</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileImpl.html#line.385">keySet</a>()</pre>
 </li>
 </ul>
 <a name="size--">
@@ -782,7 +782,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.423">size</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.424">size</a>()</pre>
 </li>
 </ul>
 <a name="values--">
@@ -791,7 +791,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.428">values</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.429">values</a>()</pre>
 </li>
 </ul>
 <a name="remove-java.lang.Object-">
@@ -800,7 +800,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>remove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.464">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.465">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="get-java.lang.String-java.lang.String-">
@@ -809,7 +809,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.488">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.489">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#get-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Retrieves an entry value from this config file.</div>
@@ -830,7 +830,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.498">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.499">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
                   <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;serializer,
@@ -863,7 +863,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.506">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.507">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value,
                   boolean&nbsp;encoded)</pre>
@@ -888,7 +888,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>remove</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.513">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.514">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#remove-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes an entry from this config file.</div>
@@ -909,7 +909,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addLines</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.522">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.523">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;lines)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addLines-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
 <div class="block">Adds arbitrary lines to the specified config file section.
@@ -944,7 +944,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addHeaderComments</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.535">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.536">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headerComments)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addHeaderComments-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
 <div class="block">Adds header comments to the specified section.
@@ -982,7 +982,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>clearHeaderComments</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.548">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.549">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#clearHeaderComments-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes any header comments from the specified section.</div>
 <dl>
@@ -1001,7 +1001,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.561">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.562">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Gets the section with the specified name.</div>
 <dl>
@@ -1020,7 +1020,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.566">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.567">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                           boolean&nbsp;create)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-boolean-">ConfigFile</a></code></span></div>
 <div class="block">Gets the section with the specified name and optionally creates it if it's not there.</div>
@@ -1041,7 +1041,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.581">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.582">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Appends a section to this config file if it does not already exist.
  
@@ -1063,7 +1063,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>setSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.592">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.593">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                              <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;contents)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#setSection-java.lang.String-java.util.Map-">ConfigFile</a></code></span></div>
 <div class="block">Creates or overwrites the specified section.</div>
@@ -1084,7 +1084,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>removeSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.603">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.604">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#removeSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes the section with the specified name.</div>
 <dl>
@@ -1103,7 +1103,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSectionKeys</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileImpl.html#line.618">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=tr [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileImpl.html#line.619">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=tr [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSectionKeys-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Returns the current set of keys in the specified section.</div>
 <dl>
@@ -1122,7 +1122,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>isEncoded</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.626">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.627">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#isEncoded-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Returns <jk>true</jk> if the encoding flag is set on the specified entry.</div>
 <dl>
@@ -1141,7 +1141,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>save</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.636">save</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.637">save</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--">ConfigFile</a></code></span></div>
 <div class="block">Saves this config file to disk.</div>
@@ -1161,7 +1161,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>serializeTo</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.655">serializeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini">ConfigFileImpl</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.656">serializeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
                                   <a href="../../../../org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a>&nbsp;format)
                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#serializeTo-java.io.Writer-org.apache.juneau.ini.ConfigFileFormat-">ConfigFile</a></code></span></div>
@@ -1185,7 +1185,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.675">toString</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.676">toString</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toString--">ConfigFile</a></code></span></div>
 <div class="block">Returns the config file contents as a string.
  
@@ -1203,7 +1203,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addListener</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.686">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a>&nbsp;listener)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.687">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a>&nbsp;listener)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addListener-org.apache.juneau.ini.ConfigFileListener-">ConfigFile</a></code></span></div>
 <div class="block">Add a listener to this config file to react to modification events.</div>
 <dl>
@@ -1222,7 +1222,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>toWritable</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.702">toWritable</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.703">toWritable</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toWritable--">ConfigFile</a></code></span></div>
 <div class="block">Wraps this config file in a <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> interface that renders it as plain text.</div>
 <dl>
@@ -1239,7 +1239,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>merge</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.707">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.708">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#merge-org.apache.juneau.ini.ConfigFile-">ConfigFile</a></code></span></div>
 <div class="block">Merges the contents of the specified config file into this config file.
  
@@ -1262,7 +1262,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanSession</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.731">getBeanSession</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.732">getBeanSession</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getBeanSession--">ConfigFile</a></code></span></div>
 <div class="block">Returns the reusable bean session associated with this config file.
  
@@ -1282,7 +1282,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>readLock</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.736">readLock</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.737">readLock</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readLock--">ConfigFile</a></code></span></div>
 <div class="block">Places a read lock on this config file.</div>
 <dl>
@@ -1297,7 +1297,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>readUnlock</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.741">readUnlock</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.742">readUnlock</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readUnlock--">ConfigFile</a></code></span></div>
 <div class="block">Removes the read lock on this config file.</div>
 <dl>
@@ -1312,7 +1312,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.757">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;vr)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.758">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;vr)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolver-">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
  specified <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
@@ -1332,7 +1332,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.763">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;vs)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.764">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;vs)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolverSession-">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
  specified <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a>.</div>
@@ -1352,7 +1352,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.769">getResolving</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileImpl.html#line.770">getResolving</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving--">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by a
  default <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
index 7860521..afc80f3 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileListener.html" target="_top">Frames</a></li>
@@ -283,7 +283,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileListener.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html
deleted file mode 100644
index 812f8db..0000000
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileVar.html
+++ /dev/null
@@ -1,418 +0,0 @@
-<!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>ConfigFileVar (Apache Juneau 7.1.0-SNAPSHOT)</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="ConfigFileVar (Apache Juneau 7.1.0-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":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>
-</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/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileVar.html" target="_top">Frames</a></li>
-<li><a href="ConfigFileVar.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="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</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.ini</div>
-<h2 title="Class ConfigFileVar" class="title">Class ConfigFileVar</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/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><a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.ini.ConfigFileVar</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.48">ConfigFileVar</a>
-extends <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
-<div class="block">Config file variable resolver.
- 
- <p>
- The format for this var is <js>"$C{key[,defaultValue]}"</js>.
- See <a href="../../../../org/apache/juneau/ini/ConfigFile.html#getString-java.lang.String-"><code>ConfigFile.getString(String)</code></a> for the format of the key.
- 
- <p>
- This variable resolver requires that a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object be set as a context object on the resolver or a
- session object on the resolver session.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <jc>// Create a config file object.</jc>
-   ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
- 
-   <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)
-      .addContextObject(<jsf>SESSION_config</jsf>, configFile);
- 
-   <jc>// Use it!</jc>
-   System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
- </p>
- 
- <p>
- Since this is a <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>, 
-<a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#NAME">NAME</a></span></code>
-<div class="block">The name of this variable.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#SESSION_config">SESSION_config</a></span></code>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== 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/ini/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar</a></span>()</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>
-<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><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.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/7/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>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.svl.DefaultingVar">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></h3>
-<code><a href="../../../../org/apache/juneau/svl/DefaultingVar.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</a></code></li>
-</ul>
-<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#getName--">getName</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http:/ [...]
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="SESSION_config">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>SESSION_config</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.53">SESSION_config</a></pre>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.apache.juneau.ini.ConfigFileVar.SESSION_config">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="NAME">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.56">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.ini.ConfigFileVar.NAME">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ConfigFileVar--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ConfigFileVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.61">ConfigFileVar</a>()</pre>
-<div class="block">Constructor.</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileVar.html#line.66">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</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>
-<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>
-<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>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The resolved value.</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/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/ini/ConfigFileVar.html" target="_top">Frames</a></li>
-<li><a href="ConfigFileVar.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="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
index d5e175c..370da7c 100644
--- a/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
+++ b/content/site/apidocs/org/apache/juneau/ini/ConfigFileWrapped.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.37">ConfigFileWrapped</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.38">ConfigFileWrapped</a>
 extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></pre>
 <div class="block">Wraps an instance of <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will automatically replace <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>
  variables.
@@ -462,7 +462,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>clear</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.57">clear</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.58">clear</a>()</pre>
 </li>
 </ul>
 <a name="containsKey-java.lang.Object-">
@@ -471,7 +471,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>containsKey</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.62">containsKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.63">containsKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="containsValue-java.lang.Object-">
@@ -480,7 +480,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>containsValue</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.67">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.68">containsValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 </li>
 </ul>
 <a name="entrySet--">
@@ -489,7 +489,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>entrySet</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Sec [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/ini/Sec [...]
 </li>
 </ul>
 <a name="get-java.lang.Object-">
@@ -498,7 +498,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.77">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.78">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="isEmpty--">
@@ -507,7 +507,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>isEmpty</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.82">isEmpty</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.83">isEmpty</a>()</pre>
 </li>
 </ul>
 <a name="keySet--">
@@ -516,7 +516,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>keySet</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileWrapped.html#line.87">keySet</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileWrapped.html#line.88">keySet</a>()</pre>
 </li>
 </ul>
 <a name="put-java.lang.String-org.apache.juneau.ini.Section-">
@@ -525,7 +525,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.92">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.93">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
                    <a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;value)</pre>
 </li>
 </ul>
@@ -535,7 +535,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>putAll</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.97">putAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class i [...]
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.98">putAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../../org/apache/juneau/ini/Section.html" title="class i [...]
 </li>
 </ul>
 <a name="remove-java.lang.Object-">
@@ -544,7 +544,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>remove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.102">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.103">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 </li>
 </ul>
 <a name="size--">
@@ -553,7 +553,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.107">size</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.108">size</a>()</pre>
 </li>
 </ul>
 <a name="values--">
@@ -562,7 +562,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.112">values</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.113">values</a>()</pre>
 </li>
 </ul>
 <a name="loadIfModified--">
@@ -571,7 +571,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>loadIfModified</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.117">loadIfModified</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.118">loadIfModified</a>()
                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#loadIfModified--">ConfigFile</a></code></span></div>
 <div class="block">Reloads this config file object from the persisted file contents if the modified timestamp on the file has changed.</div>
@@ -591,7 +591,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>load</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.123">load</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.124">load</a>()
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load--">ConfigFile</a></code></span></div>
 <div class="block">Loads this config file object from the persisted file contents.</div>
@@ -611,7 +611,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>load</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.129">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;r)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.130">load</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;r)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#load-java.io.Reader-">ConfigFile</a></code></span></div>
 <div class="block">Loads this config file object from the specified reader.</div>
@@ -633,7 +633,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>isEncoded</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.136">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.137">isEncoded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#isEncoded-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Returns <jk>true</jk> if the encoding flag is set on the specified entry.</div>
 <dl>
@@ -652,7 +652,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addLines</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.141">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.142">addLines</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;lines)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addLines-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
 <div class="block">Adds arbitrary lines to the specified config file section.
@@ -687,7 +687,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addHeaderComments</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.147">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.148">addHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headerComments)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addHeaderComments-java.lang.String-java.lang.String...-">ConfigFile</a></code></span></div>
 <div class="block">Adds header comments to the specified section.
@@ -725,7 +725,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>clearHeaderComments</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.153">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.154">clearHeaderComments</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#clearHeaderComments-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes any header comments from the specified section.</div>
 <dl>
@@ -744,7 +744,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.159">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.160">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Gets the section with the specified name.</div>
 <dl>
@@ -763,7 +763,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.164">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.165">getSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                           boolean&nbsp;create)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSection-java.lang.String-boolean-">ConfigFile</a></code></span></div>
 <div class="block">Gets the section with the specified name and optionally creates it if it's not there.</div>
@@ -784,7 +784,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.169">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.170">addSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Appends a section to this config file if it does not already exist.
  
@@ -806,7 +806,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>setSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.175">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.176">setSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                              <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;contents)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#setSection-java.lang.String-java.util.Map-">ConfigFile</a></code></span></div>
 <div class="block">Creates or overwrites the specified section.</div>
@@ -827,7 +827,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>removeSection</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.181">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.182">removeSection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#removeSection-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes the section with the specified name.</div>
 <dl>
@@ -846,7 +846,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>save</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.187">save</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.188">save</a>()
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--">ConfigFile</a></code></span></div>
 <div class="block">Saves this config file to disk.</div>
@@ -866,7 +866,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>serializeTo</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.193">serializeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.194">serializeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
                               <a href="../../../../org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini">ConfigFileFormat</a>&nbsp;format)
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#serializeTo-java.io.Writer-org.apache.juneau.ini.ConfigFileFormat-">ConfigFile</a></code></span></div>
@@ -890,7 +890,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.199">toString</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.200">toString</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toString--">ConfigFile</a></code></span></div>
 <div class="block">Returns the config file contents as a string.
  
@@ -908,7 +908,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.204">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;varResolver)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.205">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;varResolver)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolver-">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
  specified <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
@@ -928,7 +928,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.210">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;varSession)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.211">getResolving</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;varSession)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving-org.apache.juneau.svl.VarResolverSession-">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by the
  specified <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a>.</div>
@@ -948,7 +948,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getResolving</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.216">getResolving</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.217">getResolving</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getResolving--">ConfigFile</a></code></span></div>
 <div class="block">Returns a wrapped instance of this config file where calls to getters have their values first resolved by a
  default <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
@@ -976,7 +976,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>addListener</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.221">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a>&nbsp;listener)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.222">addListener</a>(<a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini">ConfigFileListener</a>&nbsp;listener)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#addListener-org.apache.juneau.ini.ConfigFileListener-">ConfigFile</a></code></span></div>
 <div class="block">Add a listener to this config file to react to modification events.</div>
 <dl>
@@ -995,7 +995,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>toWritable</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.227">toWritable</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau">Writable</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.228">toWritable</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#toWritable--">ConfigFile</a></code></span></div>
 <div class="block">Wraps this config file in a <a href="../../../../org/apache/juneau/Writable.html" title="interface in org.apache.juneau"><code>Writable</code></a> interface that renders it as plain text.</div>
 <dl>
@@ -1012,7 +1012,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>merge</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.232">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;newCf)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.233">merge</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;newCf)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#merge-org.apache.juneau.ini.ConfigFile-">ConfigFile</a></code></span></div>
 <div class="block">Merges the contents of the specified config file into this config file.
  
@@ -1035,7 +1035,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanSession</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.238">getBeanSession</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.239">getBeanSession</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getBeanSession--">ConfigFile</a></code></span></div>
 <div class="block">Returns the reusable bean session associated with this config file.
  
@@ -1055,7 +1055,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.243">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.244">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#get-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Retrieves an entry value from this config file.</div>
@@ -1076,7 +1076,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.248">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.249">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value,
                   boolean&nbsp;encoded)</pre>
@@ -1101,7 +1101,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.253">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.254">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey,
                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
                   <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;serializer,
@@ -1134,7 +1134,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>remove</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.259">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.260">remove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionName,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sectionKey)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#remove-java.lang.String-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Removes an entry from this config file.</div>
@@ -1155,7 +1155,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>getSectionKeys</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileWrapped.html#line.264">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/ini/ConfigFileWrapped.html#line.265">getSectionKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#getSectionKeys-java.lang.String-">ConfigFile</a></code></span></div>
 <div class="block">Returns the current set of keys in the specified section.</div>
 <dl>
@@ -1174,7 +1174,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>readLock</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.269">readLock</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.270">readLock</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readLock--">ConfigFile</a></code></span></div>
 <div class="block">Places a read lock on this config file.</div>
 <dl>
@@ -1189,7 +1189,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>readUnlock</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.274">readUnlock</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.275">readUnlock</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ini/ConfigFile.html#readUnlock--">ConfigFile</a></code></span></div>
 <div class="block">Removes the read lock on this config file.</div>
 <dl>
@@ -1204,7 +1204,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>serialize</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.279">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.280">serialize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o,
                            <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>&nbsp;s,
                            boolean&nbsp;newline)
                     throws <a href="../../../../org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer">SerializeException</a></pre>
@@ -1238,7 +1238,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>parse</h4>
-<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.284">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>protected&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/ini/ConfigFileWrapped.html#line.285">parse</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                       <a href="../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>&nbsp;parser,
                       <a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>...&nbsp;args)
@@ -1288,7 +1288,7 @@ extends <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/ini/ConfigFileListener.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-frame.html b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
index 0416503..aedf5cd 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-frame.html
@@ -22,7 +22,6 @@
 <li><a href="ConfigFileContext.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileContext</a></li>
 <li><a href="ConfigFileImpl.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileImpl</a></li>
 <li><a href="ConfigFileListener.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileListener</a></li>
-<li><a href="ConfigFileVar.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileVar</a></li>
 <li><a href="ConfigFileWrapped.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigFileWrapped</a></li>
 <li><a href="ConfigSource.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigSource</a></li>
 <li><a href="ConfigSourceFile.html" title="class in org.apache.juneau.ini" target="classFrame">ConfigSourceFile</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-summary.html b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
index 6fe1179..a5df28e 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-summary.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/httppart/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../org/apache/juneau/internal/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/package-summary.html" target="_top">Frames</a></li>
@@ -133,67 +133,61 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a></td>
-<td class="colLast">
-<div class="block">Config file variable resolver.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></td>
 <td class="colLast">
 <div class="block">Wraps an instance of <a href="../../../../org/apache/juneau/ini/ConfigFileImpl.html" title="class in org.apache.juneau.ini"><code>ConfigFileImpl</code></a> in an interface that will automatically replace <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>
  variables.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini">ConfigSource</a></td>
 <td class="colLast">
 <div class="block">Represents a storage location of a configuration file.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigSourceFile.html" title="class in org.apache.juneau.ini">ConfigSourceFile</a></td>
 <td class="colLast">
 <div class="block">Implementation of a configuration source that's a file on the local file system.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigSourceMemory.html" title="class in org.apache.juneau.ini">ConfigSourceMemory</a></td>
 <td class="colLast">
 <div class="block">Implementation of a configuration source entirely in memory.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigSourceSettings.html" title="class in org.apache.juneau.ini">ConfigSourceSettings</a></td>
 <td class="colLast">
 <div class="block">Configuration settings for the <a href="../../../../org/apache/juneau/ini/ConfigSource.html" title="class in org.apache.juneau.ini"><code>ConfigSource</code></a> class.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/ConfigUtils.html" title="class in org.apache.juneau.ini">ConfigUtils</a></td>
 <td class="colLast">
 <div class="block">Internal utility methods.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/EntryListener.html" title="class in org.apache.juneau.ini">EntryListener</a></td>
 <td class="colLast">
 <div class="block">Listener that can be used to listen for change events for a specific entry in a config file.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a></td>
 <td class="colLast">
 <div class="block">Defines a section in a config file.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/SectionListener.html" title="class in org.apache.juneau.ini">SectionListener</a></td>
 <td class="colLast">
 <div class="block">Listener that can be used to listen for change events for a specific section in a config file.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini">XorEncoder</a></td>
 <td class="colLast">
 <div class="block">Simply XOR+Base64 encoder for obscuring passwords and other sensitive data in INI config files.</div>
@@ -866,7 +860,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/httppart/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../org/apache/juneau/internal/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/package-summary.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/ini/package-tree.html b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
index 452dfa4..663a02f 100644
--- a/content/site/apidocs/org/apache/juneau/ini/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/ini/package-tree.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/httppart/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/juneau/internal/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/package-tree.html" target="_top">Frames</a></li>
@@ -107,19 +107,6 @@
 </ul>
 </li>
 <li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">Section</span></a> (implements java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;K,V&gt;)</li>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">Var</span></a>
-<ul>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">SimpleVar</span></a>
-<ul>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
-<ul>
-<li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
 <li type="circle">org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/XorEncoder.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">XorEncoder</span></a> (implements org.apache.juneau.ini.<a href="../../../../org/apache/juneau/ini/Encoder.html" title="interface in org.apache.juneau.ini">Encoder</a>)</li>
 </ul>
 </li>
@@ -162,7 +149,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/httppart/package-tree.html">Prev</a></li>
-<li><a href="../../../../org/apache/juneau/internal/package-tree.html">Next</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/ini/package-tree.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html b/content/site/apidocs/org/apache/juneau/ini/vars/ConfigFileVar.html
similarity index 81%
copy from content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
copy to content/site/apidocs/org/apache/juneau/ini/vars/ConfigFileVar.html
index cbedf4c..a4166a2 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
+++ b/content/site/apidocs/org/apache/juneau/ini/vars/ConfigFileVar.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ArgsVar (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<title>ConfigFileVar (Apache Juneau 7.1.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ArgsVar (Apache Juneau 7.1.0-SNAPSHOT)";
+            parent.document.title="ConfigFileVar (Apache Juneau 7.1.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -49,11 +49,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
-<li><a href="ArgsVar.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/ConfigFileVar.html" target="_top">Frames</a></li>
+<li><a href="ConfigFileVar.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,8 +91,8 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.svl.vars</div>
-<h2 title="Class ArgsVar" class="title">Class ArgsVar</h2>
+<div class="subTitle">org.apache.juneau.ini.vars</div>
+<h2 title="Class ConfigFileVar" class="title">Class ConfigFileVar</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.svl.vars.ArgsVar</li>
+<li>org.apache.juneau.ini.vars.ConfigFileVar</li>
 </ul>
 </li>
 </ul>
@@ -123,38 +123,39 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.48">ArgsVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/ini/vars/ConfigFileVar.html#line.51">ConfigFileVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
-<div class="block">JVM args variable resolver.
+<div class="block">Config file variable resolver.
  
  <p>
- The format for this var is <js>"$ARG{argNameOrNum}"</js> or <js>"$ARG{argNameOrNum,defaultValue}"</js>
+ The format for this var is <js>"$C{key[,defaultValue]}"</js>.
+ See <a href="../../../../../org/apache/juneau/ini/ConfigFile.html#getString-java.lang.String-"><code>ConfigFile.getString(String)</code></a> for the format of the key.
  
  <p>
- This variable resolver requires that an <a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object be set as a context object on the resolver or a
+ This variable resolver requires that a <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object be set as a context object on the resolver or a
  session object on the resolver session.
  
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
-   <jc>// Create an args object from the main(String[]) method.</jc>
-   Args args = new Args(argv);
+   <jc>// Create a config file object.</jc>
+   ConfigFile configFile = new ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);
  
-   <jc>// Create a variable resolver that resolves JVM arguments (e.g. "$ARG{1}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(ArgsVar.<js>class</js>)
-      .addContextObject(<jsf>SESSION_args</jsf>, args);
+   <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
+   VarResolver r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)
+      .addContextObject(<jsf>SESSION_config</jsf>, configFile);
  
    <jc>// Use it!</jc>
-   System.<jsf>out</jsf>.println(r.resolve(<js>"Arg #1 is set to $ARG{1}"</js>));
+   System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
  </p>
  
  <p>
  Since this is a <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a>, 
-<a href="../../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.VarResolvers">Overview &gt; juneau-svl &gt; VarResolvers and VarResolverSessions</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -175,14 +176,14 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#NAME">NAME</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html#NAME">NAME</a></span></code>
 <div class="block">The name of this variable.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#SESSION_args">SESSION_args</a></span></code>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html#SESSION_config">SESSION_config</a></span></code>
+<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
 </td>
 </tr>
 </table>
@@ -200,7 +201,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.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/svl/vars/ArgsVar.html#ArgsVar--">ArgsVar</a></span>()</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html#ConfigFileVar--">ConfigFileVar</a></span>()</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -221,7 +222,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.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,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.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/7/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>
@@ -269,17 +270,17 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="SESSION_args">
+<a name="SESSION_config">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>SESSION_args</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.53">SESSION_args</a></pre>
-<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
+<h4>SESSION_config</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/ini/vars/ConfigFileVar.html#line.56">SESSION_config</a></pre>
+<div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ArgsVar.SESSION_args">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.ini.vars.ConfigFileVar.SESSION_config">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -289,11 +290,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.56">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/ini/vars/ConfigFileVar.html#line.59">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.svl.vars.ArgsVar.NAME">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.ini.vars.ConfigFileVar.NAME">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -305,13 +306,13 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ArgsVar--">
+<a name="ConfigFileVar--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ArgsVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.61">ArgsVar</a>()</pre>
+<h4>ConfigFileVar</h4>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/ini/vars/ConfigFileVar.html#line.64">ConfigFileVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -329,7 +330,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.66">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/ini/vars/ConfigFileVar.html#line.69">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</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>
@@ -372,11 +373,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
-<li><a href="ArgsVar.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/ConfigFileVar.html" target="_top">Frames</a></li>
+<li><a href="ConfigFileVar.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/org/apache/juneau/ini/vars/package-frame.html b/content/site/apidocs/org/apache/juneau/ini/vars/package-frame.html
new file mode 100644
index 0000000..15be824
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/ini/vars/package-frame.html
@@ -0,0 +1,20 @@
+<!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>org.apache.juneau.ini.vars (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/apache/juneau/ini/vars/package-summary.html" target="classFrame">org.apache.juneau.ini.vars</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ConfigFileVar.html" title="class in org.apache.juneau.ini.vars" target="classFrame">ConfigFileVar</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html b/content/site/apidocs/org/apache/juneau/ini/vars/package-summary.html
similarity index 70%
copy from content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
copy to content/site/apidocs/org/apache/juneau/ini/vars/package-summary.html
index a368ef9..60ced35 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/ini/vars/package-summary.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.microservice.sample (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<title>org.apache.juneau.ini.vars (Apache Juneau 7.1.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.juneau.microservice.sample (Apache Juneau 7.1.0-SNAPSHOT)";
+            parent.document.title="org.apache.juneau.ini.vars (Apache Juneau 7.1.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/ini/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/internal/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,9 +69,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.apache.juneau.microservice.sample</h1>
+<h1 title="Package" class="title">Package&nbsp;org.apache.juneau.ini.vars</h1>
 <div class="docSummary">
-<div class="block">Microservice Samples</div>
+<div class="block">Predefined SVL Variables</div>
 </div>
 <p>See:&nbsp;<a href="#package.description">Description</a></p>
 </div>
@@ -86,15 +86,9 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a></td>
 <td class="colLast">
-<div class="block">Sample REST resource that prints out a simple "Hello world!" message.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a></td>
-<td class="colLast">
-<div class="block">Root microservice page.</div>
+<div class="block">Config file variable resolver.</div>
 </td>
 </tr>
 </tbody>
@@ -104,8 +98,8 @@
 <a name="package.description">
 <!--   -->
 </a>
-<h2 title="Package org.apache.juneau.microservice.sample Description">Package org.apache.juneau.microservice.sample Description</h2>
-<div class="block">Microservice Samples</div>
+<h2 title="Package org.apache.juneau.ini.vars Description">Package org.apache.juneau.ini.vars Description</h2>
+<div class="block">Predefined SVL Variables</div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
@@ -127,11 +121,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/ini/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/internal/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html b/content/site/apidocs/org/apache/juneau/ini/vars/package-tree.html
similarity index 61%
copy from content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
copy to content/site/apidocs/org/apache/juneau/ini/vars/package-tree.html
index 1fa3bfe..b1ce896 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/ini/vars/package-tree.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.svl.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<title>org.apache.juneau.ini.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.juneau.svl.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)";
+            parent.document.title="org.apache.juneau.ini.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/transform/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/ini/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/internal/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package org.apache.juneau.svl.vars</h1>
+<h1 class="title">Hierarchy For Package org.apache.juneau.ini.vars</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -86,26 +86,7 @@
 <ul>
 <li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
 <ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MapVar</span></a>
-<ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">SystemPropertiesVar</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MultipartResolvingVar</span></a>
-<ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">CoalesceAndRecurseVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">CoalesceVar</span></a></li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MultipartVar</span></a>
-<ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">IfVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">SwitchVar</span></a></li>
+<li type="circle">org.apache.juneau.ini.vars.<a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
 </ul>
 </li>
 </ul>
@@ -136,11 +117,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/transform/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/ini/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/internal/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/ini/vars/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-summary.html b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
index c101e4e..2d2e9d6 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/juneau/jena/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
@@ -370,7 +370,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/juneau/jena/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-tree.html b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
index 1fd7718..d2e36f6 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/juneau/jena/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
@@ -214,7 +214,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/ini/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/ini/vars/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/juneau/jena/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
index 7f6403d..a0b211d 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/Microservice.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.108">Microservice</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.110">Microservice</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Parent class for all microservices.
  
@@ -433,7 +433,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Microservice</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.146">Microservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;args)
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.148">Microservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;args)
                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -458,7 +458,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.134">getInstance</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.136">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.  
@@ -475,7 +475,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setConfig</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.181">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;cfPath,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.183">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;cfPath,
                               boolean&nbsp;create)
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Specifies the path of the config file for this microservice.
@@ -508,7 +508,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setConfig</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.202">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.204">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
 <div class="block">Specifies the config file for this microservice.
  
  <p>
@@ -526,7 +526,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setManifest</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.220">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a>&nbsp;mf)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.222">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a>&nbsp;mf)</pre>
 <div class="block">Specifies the manifest file of the jar file this microservice is contained within.
  
  <p>
@@ -549,7 +549,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setManifestContents</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.231">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;contents)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.233">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;contents)
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Convenience method for specifying the manifest contents directly.</div>
 <dl>
@@ -568,7 +568,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setManifest</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.243">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;f)
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.245">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;f)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
 <dl>
@@ -585,7 +585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setManifest</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.254">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;c)
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.256">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;c)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the  
  specified class is contained within.</div>
@@ -603,7 +603,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createVarResolver</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.307">createVarResolver</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.309">createVarResolver</a>()</pre>
 <div class="block">Creates the <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> used to resolve variables in the config file returned by <a href="../../../../org/apache/juneau/microservice/Microservice.html#getConfig--"><code>getConfig()</code></a>.
  
  <p>
@@ -661,7 +661,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getArgs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.329">getArgs</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.331">getArgs</a>()</pre>
 <div class="block">Returns the command-line arguments passed into the application.
  
  <p>
@@ -681,7 +681,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfig</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.426">getConfig</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.428">getConfig</a>()</pre>
 <div class="block">Returns the external INI-style configuration file that can be used to configure your microservice.
  
  <p>
@@ -783,7 +783,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getManifest</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.450">getManifest</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.452">getManifest</a>()</pre>
 <div class="block">Returns the main jar manifest file contents as a simple <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a>.
  
  <p>
@@ -812,7 +812,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getVarResolver</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.461">getVarResolver</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.463">getVarResolver</a>()</pre>
 <div class="block">Returns the variable resolver for resolving variables in strings and files.
  <p>
  See the <a href="../../../../org/apache/juneau/microservice/Microservice.html#createVarResolver--"><code>createVarResolver()</code></a> method for the list of available resolution variables.</div>
@@ -828,7 +828,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getLogger</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging">Logger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.470">getLogger</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging">Logger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.472">getLogger</a>()</pre>
 <div class="block">Returns the logger for this microservice.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -842,7 +842,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>start</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.491">start</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.493">start</a>()
                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Start this application.
  
@@ -865,7 +865,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>startConsole</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.618">startConsole</a>()
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.620">startConsole</a>()
                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Start the console for this application.
  
@@ -885,7 +885,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>initLogging</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.737">initLogging</a>()
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.739">initLogging</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Initialize the logging for this microservice.
  
@@ -968,7 +968,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.777">join</a>()
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.779">join</a>()
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Joins the application with the current thread.
  
@@ -988,7 +988,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>stop</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.792">stop</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.794">stop</a>()</pre>
 <div class="block">Stop this application.
  
  <p>
@@ -1008,7 +1008,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>kill</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.800">kill</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.802">kill</a>()</pre>
 <div class="block">Kill the JVM by calling <code>System.exit(2);</code>.</div>
 </li>
 </ul>
@@ -1018,7 +1018,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>onStart</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.817">onStart</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.819">onStart</a>()</pre>
 <div class="block">Called at the beginning of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#start--"><code>start()</code></a> call.
  
  <p>
@@ -1031,7 +1031,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>onStop</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.825">onStop</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.827">onStop</a>()</pre>
 <div class="block">Called at the end of the <a href="../../../../org/apache/juneau/microservice/Microservice.html#stop--"><code>stop()</code></a> call.
  
  <p>
@@ -1044,7 +1044,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>onConfigSave</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.835">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.837">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf)</pre>
 <div class="block">Called if the <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.
  
  <p>
@@ -1061,7 +1061,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>onConfigChange</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.846">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.848">onConfigChange</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;cf,
                               <a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;changes)</pre>
 <div class="block">Called if one or more changes occur in the config file.
  
@@ -1080,7 +1080,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getConsoleCommands</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/microservice/console/ConsoleCommand.html" title="class in org.apache.juneau.microservice.console">ConsoleCommand</a>&gt;&nbsp;<a href="../../../../src- [...]
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/microservice/console/ConsoleCommand.html" title="class in org.apache.juneau.microservice.console">ConsoleCommand</a>&gt;&nbsp;<a href="../../../../src- [...]
 <div class="block">Returns the console commands associated with this microservice.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1094,7 +1094,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createConsoleCommands</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/microservice/console/ConsoleCommand.html" title="class in org.apache.juneau.microservice.console">ConsoleCommand</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.875">createConsoleCommands</a>()
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/microservice/console/ConsoleCommand.html" title="class in org.apache.juneau.microservice.console">ConsoleCommand</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.877">createConsoleCommands</a>()
                                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Constructs the list of available console commands.
  
@@ -1118,7 +1118,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getConsoleReader</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Scanner.html?is-external=true" title="class or interface in java.util">Scanner</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.890">getConsoleReader</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Scanner.html?is-external=true" title="class or interface in java.util">Scanner</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.892">getConsoleReader</a>()</pre>
 <div class="block">Returns the console reader.
  
  <p>
@@ -1135,7 +1135,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getConsoleWriter</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.902">getConsoleWriter</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.904">getConsoleWriter</a>()</pre>
 <div class="block">Returns the console writer.
  
  <p>
@@ -1152,7 +1152,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.916">out</a>(<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;mb,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.918">out</a>(<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;mb,
                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;messageKey,
                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Prints a localized message to the console writer.
@@ -1173,7 +1173,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>err</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.931">err</a>(<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;mb,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Microservice.html#line.933">err</a>(<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;mb,
                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;messageKey,
                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;args)</pre>
 <div class="block">Prints a localized message to STDERR.
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
index a368ef9..019d8f1 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
@@ -128,7 +128,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
index c2b47e1..b9cf2ee 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
@@ -135,7 +135,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html b/content/site/apidocs/org/apache/juneau/microservice/vars/ArgsVar.html
similarity index 90%
rename from content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
rename to content/site/apidocs/org/apache/juneau/microservice/vars/ArgsVar.html
index cbedf4c..85b39ba 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/vars/ArgsVar.html
@@ -49,10 +49,10 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ArgsVar.html" target="_top">Frames</a></li>
 <li><a href="ArgsVar.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.svl.vars</div>
+<div class="subTitle">org.apache.juneau.microservice.vars</div>
 <h2 title="Class ArgsVar" class="title">Class ArgsVar</h2>
 </div>
 <div class="contentContainer">
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.svl.vars.ArgsVar</li>
+<li>org.apache.juneau.microservice.vars.ArgsVar</li>
 </ul>
 </li>
 </ul>
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.48">ArgsVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.48">ArgsVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
 <div class="block">JVM args variable resolver.
  
@@ -175,13 +175,13 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#NAME">NAME</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html#NAME">NAME</a></span></code>
 <div class="block">The name of this variable.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#SESSION_args">SESSION_args</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html#SESSION_args">SESSION_args</a></span></code>
 <div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
 </td>
 </tr>
@@ -200,7 +200,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.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/svl/vars/ArgsVar.html#ArgsVar--">ArgsVar</a></span>()</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html#ArgsVar--">ArgsVar</a></span>()</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -221,7 +221,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.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,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.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/7/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>
@@ -275,11 +275,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>SESSION_args</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.53">SESSION_args</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.53">SESSION_args</a></pre>
 <div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ArgsVar.SESSION_args">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.microservice.vars.ArgsVar.SESSION_args">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -289,11 +289,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.56">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.56">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.svl.vars.ArgsVar.NAME">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.microservice.vars.ArgsVar.NAME">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -311,7 +311,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ArgsVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.61">ArgsVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.61">ArgsVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -329,7 +329,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.66">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.66">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</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>
@@ -372,10 +372,10 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ArgsVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ArgsVar.html" target="_top">Frames</a></li>
 <li><a href="ArgsVar.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html b/content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html
similarity index 88%
rename from content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
rename to content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html
index 545fe30..32dc31e 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html
@@ -48,11 +48,11 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ManifestFileVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ManifestFileVar.html" target="_top">Frames</a></li>
 <li><a href="ManifestFileVar.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.juneau.svl.vars</div>
+<div class="subTitle">org.apache.juneau.microservice.vars</div>
 <h2 title="Class ManifestFileVar" class="title">Class ManifestFileVar</h2>
 </div>
 <div class="contentContainer">
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">org.apache.juneau.svl.DefaultingVar</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.svl.vars.ManifestFileVar</li>
+<li>org.apache.juneau.microservice.vars.ManifestFileVar</li>
 </ul>
 </li>
 </ul>
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.48">ManifestFileVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.48">ManifestFileVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
 <div class="block">Manifest file entries variable resolver.
  
@@ -175,13 +175,13 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html#NAME">NAME</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html#NAME">NAME</a></span></code>
 <div class="block">The name of this variable.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html#SESSION_manifest">SESSION_manifest</a></span></code>
 <div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object.</div>
 </td>
 </tr>
@@ -200,7 +200,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.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/svl/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar</a></span>()</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar</a></span>()</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -221,7 +221,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.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,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.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/7/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>
@@ -275,11 +275,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>SESSION_manifest</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.53">SESSION_manifest</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.53">SESSION_manifest</a></pre>
 <div class="block">The name of the session or context object that identifies the <a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ManifestFileVar.SESSION_manifest">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.microservice.vars.ManifestFileVar.SESSION_manifest">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -289,11 +289,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.56">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.56">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.svl.vars.ManifestFileVar.NAME">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.microservice.vars.ManifestFileVar.NAME">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -311,7 +311,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ManifestFileVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.61">ManifestFileVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.61">ManifestFileVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -329,7 +329,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.66">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.66">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</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>
@@ -371,11 +371,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/svl/vars/ManifestFileVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ManifestFileVar.html" target="_top">Frames</a></li>
 <li><a href="ManifestFileVar.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/microservice/vars/package-frame.html b/content/site/apidocs/org/apache/juneau/microservice/vars/package-frame.html
new file mode 100644
index 0000000..a0d546c
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/microservice/vars/package-frame.html
@@ -0,0 +1,21 @@
+<!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>org.apache.juneau.microservice.vars (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/apache/juneau/microservice/vars/package-summary.html" target="classFrame">org.apache.juneau.microservice.vars</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ArgsVar.html" title="class in org.apache.juneau.microservice.vars" target="classFrame">ArgsVar</a></li>
+<li><a href="ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars" target="classFrame">ManifestFileVar</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/vars/package-summary.html
similarity index 80%
copy from content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
copy to content/site/apidocs/org/apache/juneau/microservice/vars/package-summary.html
index a368ef9..ca28556 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/sample/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/vars/package-summary.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.microservice.sample (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<title>org.apache.juneau.microservice.vars (Apache Juneau 7.1.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.juneau.microservice.sample (Apache Juneau 7.1.0-SNAPSHOT)";
+            parent.document.title="org.apache.juneau.microservice.vars (Apache Juneau 7.1.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,9 +69,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.apache.juneau.microservice.sample</h1>
+<h1 title="Package" class="title">Package&nbsp;org.apache.juneau.microservice.vars</h1>
 <div class="docSummary">
-<div class="block">Microservice Samples</div>
+<div class="block">Predefined SVL Variables</div>
 </div>
 <p>See:&nbsp;<a href="#package.description">Description</a></p>
 </div>
@@ -86,15 +86,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">HelloWorldResource</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a></td>
 <td class="colLast">
-<div class="block">Sample REST resource that prints out a simple "Hello world!" message.</div>
+<div class="block">JVM args variable resolver.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars">ManifestFileVar</a></td>
 <td class="colLast">
-<div class="block">Root microservice page.</div>
+<div class="block">Manifest file entries variable resolver.</div>
 </td>
 </tr>
 </tbody>
@@ -104,8 +104,8 @@
 <a name="package.description">
 <!--   -->
 </a>
-<h2 title="Package org.apache.juneau.microservice.sample Description">Package org.apache.juneau.microservice.sample Description</h2>
-<div class="block">Microservice Samples</div>
+<h2 title="Package org.apache.juneau.microservice.vars Description">Package org.apache.juneau.microservice.vars Description</h2>
+<div class="block">Predefined SVL Variables</div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
@@ -127,11 +127,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../../org/apache/juneau/msgpack/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/vars/package-tree.html
similarity index 64%
copy from content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
copy to content/site/apidocs/org/apache/juneau/microservice/vars/package-tree.html
index c2b47e1..bd9e6b9 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/sample/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/vars/package-tree.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.apache.juneau.microservice.sample Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)</title>
+<title>org.apache.juneau.microservice.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.juneau.microservice.sample Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)";
+            parent.document.title="org.apache.juneau.microservice.vars Class Hierarchy (Apache Juneau 7.1.0-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
 <li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package org.apache.juneau.microservice.sample</h1>
+<h1 class="title">Hierarchy For Package org.apache.juneau.microservice.vars</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -80,30 +80,14 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">javax.servlet.GenericServlet (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.Servlet, javax.servlet.ServletConfig)
+<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">Var</span></a>
 <ul>
-<li type="circle">javax.servlet.http.HttpServlet
+<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">SimpleVar</span></a>
 <ul>
-<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
+<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
 <ul>
-<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Resource</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.sample.<a href="../../../../../org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">HelloWorldResource</span></a></li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletGroupDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceGroup</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.sample.<a href="../../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">RootResources</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
+<li type="circle">org.apache.juneau.microservice.vars.<a href="../../../../../org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ArgsVar</span></a></li>
+<li type="circle">org.apache.juneau.microservice.vars.<a href="../../../../../org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
 </ul>
 </li>
 </ul>
@@ -134,11 +118,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/microservice/resources/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
 <li><a href="../../../../../org/apache/juneau/msgpack/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/sample/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html b/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
index 1a2f721..63fb985 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/package-summary.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/vars/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/juneau/parser/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
@@ -184,7 +184,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/sample/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/vars/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/juneau/parser/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html b/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
index faf4b9a..a1e2760 100644
--- a/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/msgpack/package-tree.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/vars/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/juneau/parser/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
@@ -184,7 +184,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/sample/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/juneau/microservice/vars/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/juneau/parser/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestContextBuilder.html b/content/site/apidocs/org/apache/juneau/rest/RestContextBuilder.html
index c743d61..6c8d5ff 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestContextBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestContextBuilder.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.87">RestContextBuilder</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.88">RestContextBuilder</a>
 extends <a href="../../../../org/apache/juneau/BeanContextBuilder.html" title="class in org.apache.juneau">BeanContextBuilder</a>
 implements javax.servlet.ServletConfig</pre>
 <div class="block">Defines the initial configuration of a <code>RestServlet</code> or <code>@RestResource</code> annotated object.
@@ -1154,7 +1154,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RestContextBuilder</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.120">RestContextBuilder</a>(javax.servlet.ServletConfig&nbsp;config,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.121">RestContextBuilder</a>(javax.servlet.ServletConfig&nbsp;config,
                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;resourceClass)
                    throws javax.servlet.ServletException</pre>
 <div class="block">Constructor for top-level servlets when using dependency injection.
@@ -1184,7 +1184,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>vars</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.338">vars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;vars)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.339">vars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;vars)</pre>
 <div class="block">Adds the specified <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> classes to this config.
  
  <p>
@@ -1207,7 +1207,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>varContextObject</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.363">varContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.364">varContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object)</pre>
 <div class="block">Adds a var context object to this config.
  
@@ -1216,8 +1216,8 @@ implements javax.servlet.ServletConfig</pre>
  information.
  
  <p>
- For example, the <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a> needs access to this resource's <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> through the
- <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html#SESSION_config"><code>ConfigFileVar.SESSION_config</code></a> object that can be specified as either a session object (temporary) or
+ For example, the <a href="../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>ConfigFileVar</code></a> needs access to this resource's <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> through the
+ <a href="../../../../org/apache/juneau/ini/vars/ConfigFileVar.html#SESSION_config"><code>ConfigFileVar.SESSION_config</code></a> object that can be specified as either a session object (temporary) or
  context object (permanent).
  In this case, we call the following code to add it to the context map:
  <p class='bcode'>
@@ -1238,7 +1238,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>configFile</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.379">configFile</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;configFile)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.380">configFile</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;configFile)</pre>
 <div class="block">Overwrites the default config file with a custom config file.
  
  <p>
@@ -1259,7 +1259,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getHtmlDocBuilder</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/HtmlDocBuilder.html" title="class in org.apache.juneau.rest">HtmlDocBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.389">getHtmlDocBuilder</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/HtmlDocBuilder.html" title="class in org.apache.juneau.rest">HtmlDocBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.390">getHtmlDocBuilder</a>()</pre>
 <div class="block">Returns an instance of an HTMLDOC builder for setting HTMLDOC-related properties.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1273,7 +1273,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createPropertyStore</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/PropertyStoreBuilder.html" title="class in org.apache.juneau">PropertyStoreBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.398">createPropertyStore</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/PropertyStoreBuilder.html" title="class in org.apache.juneau">PropertyStoreBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.399">createPropertyStore</a>()</pre>
 <div class="block">Creates a new <a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><code>PropertyStore</code></a> object initialized with the properties defined in this config.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1287,7 +1287,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfigFile</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.425">getConfigFile</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.426">getConfigFile</a>()</pre>
 <div class="block">Returns the external configuration file for this resource.
  
  <p>
@@ -1314,7 +1314,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextProperties.html" title="class in org.apache.juneau.rest">RestContextProperties</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.447">getProperties</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextProperties.html" title="class in org.apache.juneau.rest">RestContextProperties</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.448">getProperties</a>()</pre>
 <div class="block">Returns the configuration properties for this resource.
  
  <p>
@@ -1341,7 +1341,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVarResolverBuilder</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.470">getVarResolverBuilder</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.471">getVarResolverBuilder</a>()</pre>
 <div class="block">Creates the variable resolver for this resource.
  
  <p>
@@ -1349,7 +1349,7 @@ implements javax.servlet.ServletConfig</pre>
  <ul>
    <li><a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
    <li><a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
-   <li><a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a>
+   <li><a href="../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>ConfigFileVar</code></a>
    <li><a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
    <li><a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
  </ul>
@@ -1369,7 +1369,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>allowBodyParam</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.501">allowBodyParam</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.502">allowBodyParam</a>(boolean&nbsp;value)</pre>
 <div class="block">Configuration property:  Allow body URL parameter.
  
  <p>
@@ -1400,7 +1400,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>allowedMethodParams</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.528">allowedMethodParams</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.529">allowedMethodParams</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;value)</pre>
 <div class="block">Configuration property:  Allowed method parameters.
  
  <p>
@@ -1432,7 +1432,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>allowHeaderParams</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.554">allowHeaderParams</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.555">allowHeaderParams</a>(boolean&nbsp;value)</pre>
 <div class="block">Configuration property:  Allow header URL parameters.
  
  <p>
@@ -1463,7 +1463,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>callHandler</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.575">callHandler</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="interface  [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.576">callHandler</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="interface  [...]
 <div class="block">Configuration property:  REST call handler.
  
  <p>
@@ -1489,7 +1489,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>callHandler</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.595">callHandler</a>(<a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="interface in org.apache.juneau.rest">RestCallHandler</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.596">callHandler</a>(<a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="interface in org.apache.juneau.rest">RestCallHandler</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  REST call handler.
  
  <p>
@@ -1514,7 +1514,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>children</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.617">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.618">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Children.
  
  <p>
@@ -1542,7 +1542,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>children</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.635">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.636">children</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Children.
  
  <p>
@@ -1566,7 +1566,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>child</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.657">child</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.658">child</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;child)</pre>
 <div class="block">Configuration property:  Children.
  
@@ -1595,7 +1595,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>classpathResourceFinder</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.677">classpathResourceFinder</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/utils/ClasspathResourceFinder.ht [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.678">classpathResourceFinder</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/utils/ClasspathResourceFinder.ht [...]
 <div class="block">Configuration property:  Classpath resource finder. 
  
  <p>
@@ -1620,7 +1620,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>classpathResourceFinder</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.697">classpathResourceFinder</a>(<a href="../../../../org/apache/juneau/utils/ClasspathResourceFinder.html" title="interface in org.apache.juneau.utils">ClasspathResourceFinder</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.698">classpathResourceFinder</a>(<a href="../../../../org/apache/juneau/utils/ClasspathResourceFinder.html" title="interface in org.apache.juneau.utils">ClasspathResourceFinder</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Classpath resource finder. 
  
  <p>
@@ -1645,7 +1645,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>clientVersionHeader</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.721">clientVersionHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.722">clientVersionHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Client version header.
  
  <p>
@@ -1674,7 +1674,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>contextPath</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.743">contextPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.744">contextPath</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Resource context path. 
  
  <p>
@@ -1702,7 +1702,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>converters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.763">converters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.764">converters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Class-level response converters.
  
  <p>
@@ -1726,7 +1726,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>converters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.781">converters</a>(<a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.782">converters</a>(<a href="../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Response converters.
  
  <p>
@@ -1750,7 +1750,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultCharset</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.801">defaultCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.802">defaultCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Default character encoding.
  
  <p>
@@ -1775,7 +1775,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultCharset</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.821">defaultCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.822">defaultCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Default character encoding.
  
  <p>
@@ -1800,7 +1800,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultRequestHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.840">defaultRequestHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.841">defaultRequestHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
                                          throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
 <div class="block">Configuration property:  Default request headers.
  
@@ -1827,7 +1827,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultRequestHeader</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.865">defaultRequestHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.866">defaultRequestHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Default request headers.
  
@@ -1853,7 +1853,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultResponseHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.884">defaultResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.885">defaultResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
                                           throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
 <div class="block">Configuration property:  Default response headers.
  
@@ -1880,7 +1880,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultResponseHeader</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.909">defaultResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.910">defaultResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Default response headers.
  
@@ -1906,7 +1906,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>encoders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.927">encoders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.928">encoders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Compression encoders. 
  
  <p>
@@ -1930,7 +1930,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>encoders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.945">encoders</a>(<a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.946">encoders</a>(<a href="../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Compression encoders. 
  
  <p>
@@ -1954,7 +1954,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>guards</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.963">guards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.964">guards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Class-level guards.
  
  <p>
@@ -1978,7 +1978,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>guards</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.981">guards</a>(<a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.982">guards</a>(<a href="../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Class-level guards.
  
  <p>
@@ -2002,7 +2002,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>infoProvider</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1001">infoProvider</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interfa [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1002">infoProvider</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interfa [...]
 <div class="block">Configuration property:  REST info provider. 
  
  <p>
@@ -2027,7 +2027,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>infoProvider</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1021">infoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1022">infoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  REST info provider. 
  
  <p>
@@ -2052,7 +2052,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>logger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1042">logger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.ap [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1043">logger</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.ap [...]
 <div class="block">Configuration property:  REST logger.
  
  <p>
@@ -2078,7 +2078,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>logger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1063">logger</a>(<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.apache.juneau.rest">RestLogger</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1064">logger</a>(<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.apache.juneau.rest">RestLogger</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  REST logger.
  
  <p>
@@ -2104,7 +2104,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>maxInput</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1084">maxInput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1085">maxInput</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  The maximum allowed input size (in bytes) on HTTP requests.
  
  <p>
@@ -2130,7 +2130,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>messages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1102">messages</a>(<a href="../../../../org/apache/juneau/rest/MessageBundleLocation.html" title="class in org.apache.juneau.rest">MessageBundleLocation</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1103">messages</a>(<a href="../../../../org/apache/juneau/rest/MessageBundleLocation.html" title="class in org.apache.juneau.rest">MessageBundleLocation</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Messages. 
  
  <p>
@@ -2154,7 +2154,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>messages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1124">messages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1125">messages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;bundlePath)</pre>
 <div class="block">Configuration property:  Messages. 
  
@@ -2182,7 +2182,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>messages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1142">messages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;bundlePath)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1143">messages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;bundlePath)</pre>
 <div class="block">Configuration property:  Messages. 
  
  <p>
@@ -2206,7 +2206,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mimeTypes</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1160">mimeTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1161">mimeTypes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  MIME types. 
  
  <p>
@@ -2230,7 +2230,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>paramResolvers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1181">paramResolvers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestParam.html" title="class in org [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1182">paramResolvers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestParam.html" title="class in org [...]
 <div class="block">Configuration property:  Java method parameter resolvers.
  
  <p>
@@ -2256,7 +2256,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>paramResolvers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1199">paramResolvers</a>(<a href="../../../../org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1200">paramResolvers</a>(<a href="../../../../org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Java method parameter resolvers.
  
  <p>
@@ -2280,7 +2280,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>parserListener</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1217">parserListener</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1218">parserListener</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/parser/ParserListener.html" title="class [...]
 <div class="block">Configuration property:  Parser listener.
  
  <p>
@@ -2304,7 +2304,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>parsers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1235">parsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1236">parsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Parsers. 
  
  <p>
@@ -2328,7 +2328,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>parsers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1255">parsers</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1256">parsers</a>(boolean&nbsp;append,
                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Parsers. 
  
@@ -2354,7 +2354,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>parsers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1277">parsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1278">parsers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Parsers. 
  
  <p>
@@ -2382,7 +2382,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>partParser</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1297">partParser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/httppart/HttpPartParser.html" title="interfa [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1298">partParser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/httppart/HttpPartParser.html" title="interfa [...]
 <div class="block">Configuration property:  HTTP part parser. 
  
  <p>
@@ -2407,7 +2407,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>partParser</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1317">partParser</a>(<a href="../../../../org/apache/juneau/httppart/HttpPartParser.html" title="interface in org.apache.juneau.httppart">HttpPartParser</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1318">partParser</a>(<a href="../../../../org/apache/juneau/httppart/HttpPartParser.html" title="interface in org.apache.juneau.httppart">HttpPartParser</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  HTTP part parser. 
  
  <p>
@@ -2432,7 +2432,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>partSerializer</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1337">partSerializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/httppart/HttpPartSerializer.html" title= [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1338">partSerializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/httppart/HttpPartSerializer.html" title= [...]
 <div class="block">Configuration property:  HTTP part serializer. 
  
  <p>
@@ -2457,7 +2457,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>partSerializer</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1357">partSerializer</a>(<a href="../../../../org/apache/juneau/httppart/HttpPartSerializer.html" title="interface in org.apache.juneau.httppart">HttpPartSerializer</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1358">partSerializer</a>(<a href="../../../../org/apache/juneau/httppart/HttpPartSerializer.html" title="interface in org.apache.juneau.httppart">HttpPartSerializer</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  HTTP part serializer. 
  
  <p>
@@ -2482,7 +2482,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>path</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1375">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1376">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Resource path.   
  
  <p>
@@ -2506,7 +2506,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>renderResponseStackTraces</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1398">renderResponseStackTraces</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1399">renderResponseStackTraces</a>(boolean&nbsp;value)</pre>
 <div class="block">Configuration property:  Render response stack traces in responses.
  
  <p>
@@ -2531,7 +2531,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>renderResponseStackTraces</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1415">renderResponseStackTraces</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1416">renderResponseStackTraces</a>()</pre>
 <div class="block">Configuration property:  Render response stack traces in responses.
  
  <p>
@@ -2553,7 +2553,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>resourceResolver</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1438">resourceResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title= [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1439">resourceResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title= [...]
 <div class="block">REST resource resolver.
  
  <p>
@@ -2581,7 +2581,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>resourceResolver</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1458">resourceResolver</a>(<a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1459">resourceResolver</a>(<a href="../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>&nbsp;value)</pre>
 <div class="block">REST resource resolver.
  
  <p>
@@ -2606,7 +2606,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>responseHandlers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1477">responseHandlers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1478">responseHandlers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Response handlers.
  
  <p>
@@ -2631,7 +2631,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>responseHandlers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1495">responseHandlers</a>(<a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1496">responseHandlers</a>(<a href="../../../../org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest">ResponseHandler</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Response handlers.
  
  <p>
@@ -2655,7 +2655,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>serializerListener</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1513">serializerListener</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/serializer/SerializerListener.html"  [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1514">serializerListener</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/serializer/SerializerListener.html"  [...]
 <div class="block">Configuration property:  Serializer listener.
  
  <p>
@@ -2679,7 +2679,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>serializers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1531">serializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1532">serializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block">Configuration property:  Serializers. 
  
  <p>
@@ -2703,7 +2703,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>serializers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1551">serializers</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1552">serializers</a>(boolean&nbsp;append,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Serializers. 
  
@@ -2729,7 +2729,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>serializers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1573">serializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1574">serializers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Serializers. 
  
  <p>
@@ -2757,7 +2757,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFileResponseHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1595">staticFileResponseHeaders</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1596">staticFileResponseHeaders</a>(boolean&nbsp;append,
                                                     <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;headers)</pre>
 <div class="block">Configuration property:  Static file response headers. 
  
@@ -2784,7 +2784,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFileResponseHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1615">staticFileResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1616">staticFileResponseHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;headers)
                                              throws <a href="../../../../org/apache/juneau/rest/RestServletException.html" title="class in org.apache.juneau.rest">RestServletException</a></pre>
 <div class="block">Configuration property:  Static file response headers. 
  
@@ -2812,7 +2812,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFileResponseHeader</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1640">staticFileResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1641">staticFileResponseHeader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block">Configuration property:  Static file response headers. 
  
@@ -2838,7 +2838,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFiles</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1658">staticFiles</a>(<a href="../../../../org/apache/juneau/rest/StaticFileMapping.html" title="class in org.apache.juneau.rest">StaticFileMapping</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1659">staticFiles</a>(<a href="../../../../org/apache/juneau/rest/StaticFileMapping.html" title="class in org.apache.juneau.rest">StaticFileMapping</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Static file mappings. 
  
  <p>
@@ -2862,7 +2862,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFiles</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1683">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;mappingString)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1684">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;mappingString)</pre>
 <div class="block">Configuration property:  Static file mappings. 
  
  <p>
@@ -2893,7 +2893,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFiles</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1711">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1712">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;mappingString)</pre>
 <div class="block">Configuration property:  Static file mappings. 
  
@@ -2927,7 +2927,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFiles</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1734">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1735">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;location)</pre>
 <div class="block">Configuration property:  Static file mappings. 
  
@@ -2955,7 +2955,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>staticFiles</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1760">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1761">staticFiles</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;baseClass,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;location)</pre>
 <div class="block">Configuration property:  Static file mappings. 
@@ -2986,7 +2986,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>produces</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1780">produces</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1781">produces</a>(boolean&nbsp;append,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Supported accept media types.
  
@@ -3012,7 +3012,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>produces</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1800">produces</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1801">produces</a>(boolean&nbsp;append,
                                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Supported accept media types.
  
@@ -3038,7 +3038,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>consumes</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1820">consumes</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1821">consumes</a>(boolean&nbsp;append,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Supported content media types.
  
@@ -3064,7 +3064,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>consumes</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1840">consumes</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1841">consumes</a>(boolean&nbsp;append,
                                    <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  Supported content media types.
  
@@ -3090,7 +3090,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>useClasspathResourceCaching</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1861">useClasspathResourceCaching</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1862">useClasspathResourceCaching</a>(boolean&nbsp;value)</pre>
 <div class="block">Configuration property:  Use classpath resource caching. 
  
  <p>
@@ -3116,7 +3116,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>useStackTraceHashes</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1882">useStackTraceHashes</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1883">useStackTraceHashes</a>(boolean&nbsp;value)</pre>
 <div class="block">Configuration property:  Use stack trace hashes.
  
  <p>
@@ -3142,7 +3142,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>widgets</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1902">widgets</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.ap [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1903">widgets</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.ap [...]
 <div class="block">Configuration property:  HTML Widgets. 
  
  <p>
@@ -3167,7 +3167,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>widgets</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1920">widgets</a>(<a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1921">widgets</a>(<a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  HTML Widgets. 
  
  <p>
@@ -3191,7 +3191,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>widgets</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1941">widgets</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1942">widgets</a>(boolean&nbsp;append,
                                   <a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>...&nbsp;values)</pre>
 <div class="block">Configuration property:  HTML Widgets. 
  
@@ -3218,7 +3218,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireDefaultConstructor</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1946">beansRequireDefaultConstructor</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1947">beansRequireDefaultConstructor</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireDefaultConstructor-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require no-arg constructors.
  
@@ -3247,7 +3247,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireDefaultConstructor</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1952">beansRequireDefaultConstructor</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1953">beansRequireDefaultConstructor</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireDefaultConstructor--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require no-arg constructors.
  
@@ -3272,7 +3272,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSerializable</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1958">beansRequireSerializable</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1959">beansRequireSerializable</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireSerializable-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require Serializable interface.
  
@@ -3301,7 +3301,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSerializable</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1964">beansRequireSerializable</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1965">beansRequireSerializable</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireSerializable--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require Serializable interface.
  
@@ -3326,7 +3326,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSettersForGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1970">beansRequireSettersForGetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1971">beansRequireSettersForGetters</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireSettersForGetters-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require setters for getters.
  
@@ -3355,7 +3355,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSettersForGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1976">beansRequireSettersForGetters</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1977">beansRequireSettersForGetters</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireSettersForGetters--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require setters for getters.
  
@@ -3380,7 +3380,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beansRequireSomeProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1982">beansRequireSomeProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1983">beansRequireSomeProperties</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beansRequireSomeProperties-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Beans require at least one property.
  
@@ -3409,7 +3409,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanMapPutReturnsOldValue</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1988">beanMapPutReturnsOldValue</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1989">beanMapPutReturnsOldValue</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanMapPutReturnsOldValue-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  BeanMap.put() returns old property value.
  
@@ -3439,7 +3439,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanMapPutReturnsOldValue</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1994">beanMapPutReturnsOldValue</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.1995">beanMapPutReturnsOldValue</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanMapPutReturnsOldValue--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  BeanMap.put() returns old property value.
  
@@ -3464,7 +3464,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanConstructorVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2000">beanConstructorVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2001">beanConstructorVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanConstructorVisibility-org.apache.juneau.Visibility-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Minimum bean constructor visibility.
  
@@ -3492,7 +3492,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanClassVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2006">beanClassVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2007">beanClassVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanClassVisibility-org.apache.juneau.Visibility-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Minimum bean class visibility.
  
@@ -3524,7 +3524,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFieldVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2012">beanFieldVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2013">beanFieldVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanFieldVisibility-org.apache.juneau.Visibility-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Minimum bean field visibility.
  
@@ -3552,7 +3552,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanMethodVisibility</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2018">beanMethodVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2019">beanMethodVisibility</a>(<a href="../../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanMethodVisibility-org.apache.juneau.Visibility-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Minimum bean method visibility.
  
@@ -3580,7 +3580,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>useJavaBeanIntrospector</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2024">useJavaBeanIntrospector</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2025">useJavaBeanIntrospector</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#useJavaBeanIntrospector-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Use Java Introspector.
  
@@ -3613,7 +3613,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>useJavaBeanIntrospector</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2030">useJavaBeanIntrospector</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2031">useJavaBeanIntrospector</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#useJavaBeanIntrospector--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Use Java Introspector.
  
@@ -3638,7 +3638,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>useInterfaceProxies</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2036">useInterfaceProxies</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2037">useInterfaceProxies</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#useInterfaceProxies-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Use interface proxies.
  
@@ -3667,7 +3667,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreUnknownBeanProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2042">ignoreUnknownBeanProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2043">ignoreUnknownBeanProperties</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreUnknownBeanProperties-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore unknown properties.
  
@@ -3696,7 +3696,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreUnknownBeanProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2048">ignoreUnknownBeanProperties</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2049">ignoreUnknownBeanProperties</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreUnknownBeanProperties--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore unknown properties.
  
@@ -3721,7 +3721,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreUnknownNullBeanProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2054">ignoreUnknownNullBeanProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2055">ignoreUnknownNullBeanProperties</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreUnknownNullBeanProperties-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore unknown properties with null values.
  
@@ -3750,7 +3750,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignorePropertiesWithoutSetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2060">ignorePropertiesWithoutSetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2061">ignorePropertiesWithoutSetters</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignorePropertiesWithoutSetters-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore properties without setters.
  
@@ -3779,7 +3779,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2066">ignoreInvocationExceptionsOnGetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2067">ignoreInvocationExceptionsOnGetters</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreInvocationExceptionsOnGetters-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore invocation errors on getters.
  
@@ -3808,7 +3808,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnGetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2072">ignoreInvocationExceptionsOnGetters</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2073">ignoreInvocationExceptionsOnGetters</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreInvocationExceptionsOnGetters--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore invocation errors on getters.
  
@@ -3833,7 +3833,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnSetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2078">ignoreInvocationExceptionsOnSetters</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2079">ignoreInvocationExceptionsOnSetters</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreInvocationExceptionsOnSetters-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore invocation errors on setters.
  
@@ -3862,7 +3862,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ignoreInvocationExceptionsOnSetters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2084">ignoreInvocationExceptionsOnSetters</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2085">ignoreInvocationExceptionsOnSetters</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#ignoreInvocationExceptionsOnSetters--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Ignore invocation errors on setters.
  
@@ -3887,7 +3887,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>sortProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2090">sortProperties</a>(boolean&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2091">sortProperties</a>(boolean&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#sortProperties-boolean-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Sort bean properties.
  
@@ -3916,7 +3916,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>sortProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2096">sortProperties</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2097">sortProperties</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#sortProperties--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Sort bean properties.
  
@@ -3941,7 +3941,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2102">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2103">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanPackages-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean package exclusions.
  
@@ -3970,7 +3970,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2108">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2109">notBeanPackages</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanPackages-java.lang.String...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean package exclusions.
  
@@ -3994,7 +3994,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanPackages</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2114">notBeanPackages</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2115">notBeanPackages</a>(boolean&nbsp;append,
                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanPackages-boolean-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean package exclusions.
@@ -4029,7 +4029,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanPackagesRemove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2120">notBeanPackagesRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2121">notBeanPackagesRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanPackagesRemove-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean package exclusions.
  
@@ -4058,7 +4058,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2126">notBeanClasses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2127">notBeanClasses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanClasses-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean class exclusions.
  
@@ -4091,7 +4091,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2132">notBeanClasses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2133">notBeanClasses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanClasses-java.lang.Class...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean class exclusions.
  
@@ -4119,7 +4119,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2138">notBeanClasses</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2139">notBeanClasses</a>(boolean&nbsp;append,
                                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanClasses-boolean-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean class exclusions.
@@ -4155,7 +4155,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>notBeanClassesRemove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2144">notBeanClassesRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2145">notBeanClassesRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#notBeanClassesRemove-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean class exclusions.
  
@@ -4184,7 +4184,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2150">beanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2151">beanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanFilters-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean filters.
  
@@ -4220,7 +4220,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2156">beanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2157">beanFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanFilters-java.lang.Class...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean filters.
  
@@ -4247,7 +4247,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFilters</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2162">beanFilters</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2163">beanFilters</a>(boolean&nbsp;append,
                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanFilters-boolean-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean filters.
@@ -4283,7 +4283,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanFiltersRemove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2168">beanFiltersRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2169">beanFiltersRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanFiltersRemove-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean filters.
  
@@ -4317,7 +4317,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2174">pojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2175">pojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#pojoSwaps-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  POJO swaps.
  
@@ -4347,7 +4347,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2180">pojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2181">pojoSwaps</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#pojoSwaps-java.lang.Class...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  POJO swaps.
  
@@ -4371,7 +4371,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwaps</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2186">pojoSwaps</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2187">pojoSwaps</a>(boolean&nbsp;append,
                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#pojoSwaps-boolean-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  POJO swaps.
@@ -4410,7 +4410,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>pojoSwapsRemove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2192">pojoSwapsRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2193">pojoSwapsRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#pojoSwapsRemove-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  POJO swaps.
  
@@ -4440,7 +4440,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>implClasses</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2198">implClasses</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title= [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2199">implClasses</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title= [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#implClasses-java.util.Map-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Implementation classes.
  
@@ -4469,7 +4469,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>implClass</h4>
-<pre>public&nbsp;&lt;T&gt;&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2204">implClass</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;interfaceClass,
+<pre>public&nbsp;&lt;T&gt;&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2205">implClass</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;interfaceClass,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends T&gt;&nbsp;implClass)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#implClass-java.lang.Class-java.lang.Class-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Implementation classes.
@@ -4497,7 +4497,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2210">beanDictionary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2211">beanDictionary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanDictionary-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean dictionary.
  
@@ -4524,7 +4524,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2216">beanDictionary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2217">beanDictionary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanDictionary-java.lang.Class...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean dictionary.
  
@@ -4551,7 +4551,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionary</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2222">beanDictionary</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2223">beanDictionary</a>(boolean&nbsp;append,
                                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanDictionary-boolean-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean dictionary.
@@ -4580,7 +4580,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanDictionaryRemove</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2228">beanDictionaryRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2229">beanDictionaryRemove</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>...&nbsp;values)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanDictionaryRemove-java.lang.Object...-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean dictionary.
  
@@ -4607,7 +4607,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>beanTypePropertyName</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2234">beanTypePropertyName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2235">beanTypePropertyName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#beanTypePropertyName-java.lang.String-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Bean type property name.
  
@@ -4636,7 +4636,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>locale</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2240">locale</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2241">locale</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#locale-java.util.Locale-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Locale.
  
@@ -4663,7 +4663,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>timeZone</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2246">timeZone</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2247">timeZone</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#timeZone-java.util.TimeZone-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  TimeZone.
  
@@ -4687,7 +4687,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mediaType</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2252">mediaType</a>(<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2253">mediaType</a>(<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#mediaType-org.apache.juneau.http.MediaType-">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Media type.
  
@@ -4714,7 +4714,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>debug</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2258">debug</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2259">debug</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/BeanContextBuilder.html#debug--">BeanContextBuilder</a></code></span></div>
 <div class="block">Configuration property:  Debug mode.
  
@@ -4739,7 +4739,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>set</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2264">set</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2265">set</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#set-java.lang.String-java.lang.Object-">ContextBuilder</a></code></span></div>
 <div class="block">Sets a configuration property on this object.</div>
@@ -4762,7 +4762,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>set</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2271">set</a>(boolean&nbsp;append,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2272">set</a>(boolean&nbsp;append,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#set-boolean-java.lang.String-java.lang.Object-">ContextBuilder</a></code></span></div>
@@ -4787,7 +4787,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>set</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2277">set</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class o [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2278">set</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class o [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#set-java.util.Map-">ContextBuilder</a></code></span></div>
 <div class="block">Sets multiple configuration properties on this object.</div>
 <dl>
@@ -4808,7 +4808,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>add</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2285">add</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class o [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2286">add</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class o [...]
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#add-java.util.Map-">ContextBuilder</a></code></span></div>
 <div class="block">Adds multiple configuration properties on this object.</div>
 <dl>
@@ -4829,7 +4829,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addTo</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2291">addTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2292">addTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#addTo-java.lang.String-java.lang.Object-">ContextBuilder</a></code></span></div>
 <div class="block">Adds a value to a SET or LIST property.</div>
@@ -4850,7 +4850,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addTo</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2297">addTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2298">addTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#addTo-java.lang.String-java.lang.String-java.lang.Object-">ContextBuilder</a></code></span></div>
@@ -4873,7 +4873,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>removeFrom</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2303">removeFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2304">removeFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#removeFrom-java.lang.String-java.lang.Object-">ContextBuilder</a></code></span></div>
 <div class="block">Removes a value from a SET, LIST, or MAP property.</div>
@@ -4894,7 +4894,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>apply</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2309">apply</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a>&nbsp;copyFrom)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2310">apply</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a>&nbsp;copyFrom)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#apply-org.apache.juneau.PropertyStore-">ContextBuilder</a></code></span></div>
 <div class="block">Copies the settings from the specified property store into this builder.</div>
 <dl>
@@ -4913,7 +4913,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInitParameter</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2320">getInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2321">getInitParameter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getInitParameter</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletConfig</code></dd>
@@ -4926,7 +4926,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInitParameterNames</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2325">getInitParameterNames</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2326">getInitParameterNames</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getInitParameterNames</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletConfig</code></dd>
@@ -4939,7 +4939,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletContext</h4>
-<pre>public&nbsp;javax.servlet.ServletContext&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2330">getServletContext</a>()</pre>
+<pre>public&nbsp;javax.servlet.ServletContext&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2331">getServletContext</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getServletContext</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletConfig</code></dd>
@@ -4952,7 +4952,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2335">getServletName</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2336">getServletName</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getServletName</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletConfig</code></dd>
@@ -4965,7 +4965,7 @@ implements javax.servlet.ServletConfig</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>build</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2340">build</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestContextBuilder.html#line.2341">build</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/ContextBuilder.html#build--">ContextBuilder</a></code></span></div>
 <div class="block">Build the object.</div>
 <dl>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html b/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
index cb8d334..2ce091b 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
@@ -206,7 +206,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
@@ -275,7 +275,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
@@ -344,7 +344,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
@@ -419,7 +419,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
@@ -469,7 +469,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
@@ -519,7 +519,7 @@
  
  <p>
  Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>$C</code></a> 
+ <a href="../../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>$C</code></a> 
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>$CR</code></a>
  <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/FileVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/FileVar.html
index 1057325..586e982 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/FileVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/FileVar.html
@@ -169,7 +169,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
  
  <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>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-rest-server &gt; SVL Variables</a>
  </ul></div>
 </li>
 </ul>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestAttributeVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestAttributeVar.html
index b92a392..d60f089 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestAttributeVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestAttributeVar.html
@@ -374,7 +374,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestFormDataVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestFormDataVar.html
index 9252572..ba0e0f8 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestFormDataVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestFormDataVar.html
@@ -374,7 +374,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestHeaderVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestHeaderVar.html
index 534600c..127c024 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestHeaderVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestHeaderVar.html
@@ -374,7 +374,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestPathVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestPathVar.html
index e28d14a..fd82f35 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestPathVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestPathVar.html
@@ -375,7 +375,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestQueryVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestQueryVar.html
index 6a7d363..f31e5b2 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestQueryVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestQueryVar.html
@@ -375,7 +375,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RequestVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RequestVar.html
index 1ac059a..f1f5427 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RequestVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RequestVar.html
@@ -389,7 +389,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/RestInfoVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/RestInfoVar.html
index 45ae72f..7c5c2f3 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/RestInfoVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/RestInfoVar.html
@@ -390,7 +390,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html b/content/site/apidocs/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html
index 9cb148c..11cb7f5 100644
--- a/content/site/apidocs/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html
+++ b/content/site/apidocs/org/apache/juneau/rest/vars/SerializedRequestAttrVar.html
@@ -356,7 +356,7 @@ extends <a href="../../../../../org/apache/juneau/svl/StreamedVar.html" title="c
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html b/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
index 8e0b314..cda45d5 100644
--- a/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/DefaultingVar.html
@@ -118,11 +118,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a>, <a href="../../../../org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini">ConfigFileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a>, <a href="../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars">FileV [...]
+<dd><a href="../../../../org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars">ArgsVar</a>, <a href="../../../../org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars">ConfigFileVar</a>, <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a>, <a href="../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.ap [...]
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.29">DefaultingVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.35">DefaultingVar</a>
 extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></pre>
 <div class="block">Interface for the resolution of vars with a default value if the <code>resolve()</code> method returns <jk>null</jk>.
  
@@ -131,11 +131,15 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
  property doesn't exist: <js>"$S{myProperty,not found}"</js>
  
  <p>
- Subclasses must implement the <a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a> method.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Subclasses must implement the following method:
+ <ul>
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a> 
+ </ul>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -222,7 +226,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DefaultingVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.36">DefaultingVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.42">DefaultingVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -244,7 +248,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doResolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.41">doResolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/DefaultingVar.html#line.47">doResolve</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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
@@ -252,7 +256,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
  
  <p>
  Can be overridden to intercept the request and do special handling.
- Default implementation simply calls resolve(String).</div>
+ <br>Default implementation simply calls resolve(String).</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</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>
diff --git a/content/site/apidocs/org/apache/juneau/svl/MapVar.html b/content/site/apidocs/org/apache/juneau/svl/MapVar.html
index 6b649a8..2a99570 100644
--- a/content/site/apidocs/org/apache/juneau/svl/MapVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/MapVar.html
@@ -127,13 +127,14 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.27">MapVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.30">MapVar</a>
 extends <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
-<div class="block">A subclass of <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><code>DefaultingVar</code></a> that simply pulls values from a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+<div class="block">A subclass of <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><code>DefaultingVar</code></a> that simply pulls values from a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -228,7 +229,7 @@ extends <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="cl
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MapVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.37">MapVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.40">MapVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
               <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;m)</pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -252,7 +253,7 @@ extends <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="cl
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.45">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MapVar.html#line.48">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;varVal)</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>
diff --git a/content/site/apidocs/org/apache/juneau/svl/MultipartResolvingVar.html b/content/site/apidocs/org/apache/juneau/svl/MultipartResolvingVar.html
index d852727..245ba87 100644
--- a/content/site/apidocs/org/apache/juneau/svl/MultipartResolvingVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/MultipartResolvingVar.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.29">MultipartResolvingVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.35">MultipartResolvingVar</a>
 extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></pre>
 <div class="block">Interface for the resolution of vars that can have one or more keys where the first non-null resolution is returned.
  
@@ -131,11 +131,15 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
  property doesn't exist: <js>"$S{myProperty1,myProperty2}"</js>
  
  <p>
- Subclasses must implement the <a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a> method.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Subclasses must implement the following method:
+ <ul>
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a>
+ </ul>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -222,7 +226,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MultipartResolvingVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.36">MultipartResolvingVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.42">MultipartResolvingVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -244,7 +248,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doResolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.41">doResolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartResolvingVar.html#line.47">doResolve</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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
@@ -252,7 +256,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
  
  <p>
  Can be overridden to intercept the request and do special handling.
- Default implementation simply calls resolve(String).</div>
+ <br>Default implementation simply calls resolve(String).</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../org/apache/juneau/svl/Var.html#doResolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">doResolve</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>
diff --git a/content/site/apidocs/org/apache/juneau/svl/MultipartVar.html b/content/site/apidocs/org/apache/juneau/svl/MultipartVar.html
index 672342b..615a4f2 100644
--- a/content/site/apidocs/org/apache/juneau/svl/MultipartVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/MultipartVar.html
@@ -122,16 +122,19 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.25">MultipartVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.30">MultipartVar</a>
 extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl">SimpleVar</a></pre>
 <div class="block">Interface for the resolution of vars that consist of a comma-delimited list.
  
- <p>
- (e.g. <js>"$X{foo, bar, baz}"</js>)</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ <h5 class='figure'>Example:</h5>
+ <p class='bcode'>
+   <js>"$X{foo, bar, baz}"</js>
+ </p>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -225,7 +228,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MultipartVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.32">MultipartVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.37">MultipartVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -247,7 +250,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.43">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.48">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 <div class="block">The interface that needs to be implemented for this interface.</div>
 <dl>
@@ -265,7 +268,7 @@ extends <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.46">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/MultipartVar.html#line.51">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</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>
diff --git a/content/site/apidocs/org/apache/juneau/svl/ResolvingObjectMap.html b/content/site/apidocs/org/apache/juneau/svl/ResolvingObjectMap.html
index d78a52b..f4550c2 100644
--- a/content/site/apidocs/org/apache/juneau/svl/ResolvingObjectMap.html
+++ b/content/site/apidocs/org/apache/juneau/svl/ResolvingObjectMap.html
@@ -136,7 +136,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.33">ResolvingObjectMap</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.38">ResolvingObjectMap</a>
 extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a></pre>
 <div class="block">Subclass of an <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a> that automatically resolves any SVL variables in values.
  
@@ -150,7 +150,12 @@ extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
  </ul>
  
  <p>
- All other data types are left as-is.</div>
+ All other data types are left as-is.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../serialized-form.html#org.apache.juneau.svl.ResolvingObjectMap">Serialized Form</a></dd>
@@ -289,7 +294,7 @@ extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ResolvingObjectMap</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.42">ResolvingObjectMap</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;varResolver)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.47">ResolvingObjectMap</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;varResolver)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -311,7 +316,7 @@ extends <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in o
 <ul class="blockListLast">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.48">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/ResolvingObjectMap.html#line.53">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true#get-java.lang.Object-" title="class or interface in java.util">get</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="h [...]
diff --git a/content/site/apidocs/org/apache/juneau/svl/SimpleVar.html b/content/site/apidocs/org/apache/juneau/svl/SimpleVar.html
index 54bec85..d5f6ba5 100644
--- a/content/site/apidocs/org/apache/juneau/svl/SimpleVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/SimpleVar.html
@@ -117,21 +117,25 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.30">SimpleVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.36">SimpleVar</a>
 extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></pre>
 <div class="block">Abstract superclass of all Simple Var Language variables that resolve to simple returned string values.
  
  <p>
  Note the difference between this class and <a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a> that streams values to writers.
- Unlike the <a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a> class, the returned value from this class can contain nested variables that will be
+ <br>Unlike the <a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a> class, the returned value from this class can contain nested variables that will be
  recursively resolved by <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
  
  <p>
- Subclasses must implement the <a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a> method.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Subclasses must implement the following method:
+ <ul>
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>Var.resolve(VarResolverSession, String)</code></a>
+ </ul>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -214,7 +218,7 @@ extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SimpleVar</h4>
-<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.37">SimpleVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>protected&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.43">SimpleVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -236,7 +240,7 @@ extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolveTo</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.42">resolveTo</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/SimpleVar.html#line.48">resolveTo</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/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
diff --git a/content/site/apidocs/org/apache/juneau/svl/StreamedVar.html b/content/site/apidocs/org/apache/juneau/svl/StreamedVar.html
index 0d9a073..e52f594 100644
--- a/content/site/apidocs/org/apache/juneau/svl/StreamedVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/StreamedVar.html
@@ -117,22 +117,26 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.29">StreamedVar</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.35">StreamedVar</a>
 extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a></pre>
 <div class="block">Abstract superclass of all Simple Var Language variables that write their values directly to a writer.
  
  <p>
  Note the difference between this class and <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a> that returns simple string values.
- Unlike the <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a> class, the output from this class cannot contain nested variables.
- However, this class can be more efficient for variables that produce large amounts of output so that the creation
+ <br>Unlike the <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a> class, the output from this class cannot contain nested variables.
+ <br>However, this class can be more efficient for variables that produce large amounts of output so that the creation
  of large in-memory strings is avoided.
  
  <p>
- Subclasses must implement the <a href="../../../../org/apache/juneau/svl/Var.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-"><code>Var.resolveTo(VarResolverSession, java.io.Writer, String)</code></a> method.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Subclasses must implement the following method:
+ <ul>
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-"><code>Var.resolveTo(VarResolverSession, java.io.Writer, String)</code></a>
+ </ul>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -212,7 +216,7 @@ extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StreamedVar</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.36">StreamedVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.42">StreamedVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -234,7 +238,7 @@ extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.41">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/StreamedVar.html#line.47">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
diff --git a/content/site/apidocs/org/apache/juneau/svl/Var.html b/content/site/apidocs/org/apache/juneau/svl/Var.html
index e8222d5..aae0d03 100644
--- a/content/site/apidocs/org/apache/juneau/svl/Var.html
+++ b/content/site/apidocs/org/apache/juneau/svl/Var.html
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.47">Var</a>
+<pre>public abstract class <a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.50">Var</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Abstract superclass of all Simple Var Language variables.
  
@@ -123,25 +123,26 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
  <p>
  Subclasses must implement one of the following two methods:
  <ul>
-   <li><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>resolve(VarResolverSession,String)</code></a> - For simple vars.
-   <li><a href="../../../../org/apache/juneau/svl/Var.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-"><code>resolveTo(VarResolverSession,Writer,String)</code></a> - For streamed vars.
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-"><code>resolve(VarResolverSession,String)</code></a> - For simple vars.
+   <li class='jm'><a href="../../../../org/apache/juneau/svl/Var.html#resolveTo-org.apache.juneau.svl.VarResolverSession-java.io.Writer-java.lang.String-"><code>resolveTo(VarResolverSession,Writer,String)</code></a> - For streamed vars.
  </ul>
  
  <p>
  Subclasses MUST implement a no-arg constructor so that class names can be passed to the
  <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html#vars-java.lang.Class...-"><code>VarResolverBuilder.vars(Class...)</code></a> method.
- They must also be thread safe!
+ <br><b>They must also be thread safe!</b>
  
  <p>
  Two direct abstract subclasses are provided to differentiated between simple and streamed vars:
  <ul>
-   <li><a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>
-   <li><a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a>
+   <li class='jac'><a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>
+   <li class='jac'><a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a>
+ </ul>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
  </ul></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
 </li>
 </ul>
 </div>
@@ -248,7 +249,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Var</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.61">Var</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.64">Var</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            boolean&nbsp;streamed)</pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -274,7 +275,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.84">getName</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.87">getName</a>()</pre>
 <div class="block">Return the name of this variable.
  
  <p>
@@ -292,7 +293,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>allowNested</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.101">allowNested</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.104">allowNested</a>()</pre>
 <div class="block">Returns whether nested variables are supported by this variable.
  
  <p>
@@ -314,7 +315,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>allowRecurse</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.123">allowRecurse</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.126">allowRecurse</a>()</pre>
 <div class="block">Returns whether variables in the resolved contents of this variable should also be resolved.
  
  <p>
@@ -323,7 +324,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
@@ -341,14 +342,14 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>doResolve</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.139">doResolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.142">doResolve</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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">The method called from <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
  
  <p>
  Can be overridden to intercept the request and do special handling.
- Default implementation simply calls resolve(String).</div>
+ <br>Default implementation simply calls resolve(String).</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>session</code> - The session object used for a single instance of a string resolution.</dd>
@@ -366,7 +367,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.151">resolve</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.154">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">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>
@@ -387,7 +388,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolveTo</h4>
-<pre>public abstract&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.161">resolveTo</a>(<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public abstract&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/Var.html#line.164">resolveTo</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/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolver.html b/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
index 1516bcd..59df0d3 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolver.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -75,13 +75,13 @@ var activeTableTab = "activeTableTab";
 <li>Summary:&nbsp;</li>
 <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>Constr&nbsp;|&nbsp;</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>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.101">VarResolver</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.60">VarResolver</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.
  
@@ -138,58 +138,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
    }
  
    <jc>// Create a variable resolver that resolves system properties (e.g. "$S{java.home}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(SystemPropertiesVar.<js>class</js>);
+   VarResolver r = VarResolver.<jsm>create</jsm>().vars(SystemPropertiesVar.<jk>class</jk>).build();
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"java.home is set to $S{java.home}"</js>));
  </p>
  
- <h5 class='topic'>Context objects</h5>
- 
- Var resolvers can have zero or more context objects associated with them.
- 
- <p>
- Context objects are arbitrary objects associated with this var resolver, such as a <code>ConfigFile</code> object.
- They can be any class type.
- 
- <p>
- Context objects can be retrieved by <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> classes through the
- <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a> method.
- 
- <h5 class='topic'>Session objects</h5>
- 
- Session objects are considered more ephemeral than context objects.
- While a context object is unlikely to ever change, a session object may change on every use of the var resolver.
- For example, the server API defines various <code>Var</code> objects that use the <code>RestRequest</code>
- object as a session object for the duration of a single HTTP request.
- 
- <p>
- Session objects are used by calling the <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--"><code>createSession()</code></a> or <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>createSession(Map)</code></a> methods to create
- an instance of a <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a> object that contains <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#resolve-java.lang.String-"><code>VarResolverSession.resolve(String)</code></a>
- and <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#resolveTo-java.lang.String-java.io.Writer-"><code>VarResolverSession.resolveTo(String,Writer)</code></a> methods that are identical to
- <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolve-java.lang.String-"><code>resolve(String)</code></a> and <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolveTo-java.lang.String-java.io.Writer-"><code>resolveTo(String, Writer)</code></a> except that the
- <code>Var</code> objects have access to the session objects through the
- <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a> method.
- 
- <p>
- Session objects are specified through either the <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>createSession(Map)</code></a> method or the
- <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#sessionObject-java.lang.String-java.lang.Object-"><code>VarResolverSession.sessionObject(String, Object)</code></a> methods.
- 
- <h5 class='topic'>Cloning</h5>
- 
- Var resolvers can be cloned by using the <a href="../../../../org/apache/juneau/svl/VarResolver.html#builder--"><code>builder()</code></a> method.
- Cloning a resolver will copy it's <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> class names and context objects.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc>
-   VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(ConfigVar.<jk>class</jk>,
-      ArgsVar.<jk>class</jk>).build();
- </p></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.VarResolvers">Overview &gt; juneau-svl &gt; VarResolvers and VarResolverSessions</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -214,27 +172,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Default string variable resolver with support for system properties and environment variables:
  
  
-   <code>$S{key}</code>,<code>$S{key,default}</code> - System properties.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== 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/svl/VarResolver.html#VarResolver-java.lang.Class:A-java.util.Map-">VarResolver</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;[]&nbsp;vars,
-           <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;contextObjects)</code>
-<div class="block">Constructor.</div>
+   <code>$S{key}</code>,<code>$S{key,default}</code> - <a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
+   <code>$E{key}</code>,<code>$E{key,default}</code> - <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
+   <code>$IF{booleanValue,thenValue[,elseValue]}</code> - <a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
+   <code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - <a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
+   <code>$CO{arg1[,arg2...]}</code> - <a href="../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a>
+   <code>$CR{arg1[,arg2...]}</code> - <a href="../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a>
+ </div>
 </td>
 </tr>
 </table>
@@ -247,7 +191,7 @@ extends <a href="http://docs.oracle.com/javase/7/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="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="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></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 [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -259,30 +203,36 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#create--">create</a></span>()</code>
+<div class="block">Instantiates a new clean-slate <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><code>VarResolverBuilder</code></a> object.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--">createSession</a></span>()</code>
 <div class="block">Creates a new resolver session with no session objects.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-">createSession</a></span>(<a href="http://docs.oracle.com/javase/7/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/7/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/7/do [...]
 <div class="block">Same as <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--"><code>createSession()</code></a> except allows you to specify session objects as a map.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#getContext--">getContext</a></span>()</code>
 <div class="block">Returns the read-only properties on this variable resolver.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#resolve-java.lang.String-">resolve</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</code>
 <div class="block">Resolve variables in the specified string.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/svl/VarResolver.html#resolveTo-java.lang.String-java.io.Writer-">resolveTo</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
          <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w)</code>
@@ -317,14 +267,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DEFAULT</h4>
-<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.116">DEFAULT</a></pre>
+<pre>public static final&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a> <a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.77">DEFAULT</a></pre>
 <div class="block">Default string variable resolver with support for system properties and environment variables:
  
  <ul>
-   <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.
-   <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.
-   <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.
-   <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.
+   <li><code>$S{key}</code>,<code>$S{key,default}</code> - <a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
+   <li><code>$E{key}</code>,<code>$E{key,default}</code> - <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
+   <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - <a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
+   <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - <a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
+   <li><code>$CO{arg1[,arg2...]}</code> - <a href="../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a>
+   <li><code>$CR{arg1[,arg2...]}</code> - <a href="../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a>
  </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -335,43 +287,36 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </ul>
 </li>
 </ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="VarResolver-java.lang.Class:A-java.util.Map-">
+<h3>Method Detail</h3>
+<a name="create--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>VarResolver</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.126">VarResolver</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;[]&nbsp;vars,
-                   <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;contextObjects)</pre>
-<div class="block">Constructor.</div>
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.89">create</a>()</pre>
+<div class="block">Instantiates a new clean-slate <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><code>VarResolverBuilder</code></a> object.
+ 
+ <p>
+ This is equivalent to simply calling <code><jk>new</jk> VarResolverBuilder()</code>.</div>
 <dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>vars</code> - The var classes</dd>
-<dd><code>contextObjects</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><code>VarResolverBuilder</code></a> object.</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
 <a name="builder--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>builder</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.135">builder</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.108">builder</a>()</pre>
 <div class="block">Returns a new builder object using the settings in this resolver as a base.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -385,7 +330,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getContext</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.146">getContext</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.119">getContext</a>()</pre>
 <div class="block">Returns the read-only properties on this variable resolver.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -399,7 +344,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.159">createSession</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.132">createSession</a>()</pre>
 <div class="block">Creates a new resolver session with no session objects.
  
  <p>
@@ -417,7 +362,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.169">createSession</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.142">createSession</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or [...]
 <div class="block">Same as <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--"><code>createSession()</code></a> except allows you to specify session objects as a map.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -433,12 +378,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.184">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.157">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Resolve variables in the specified string.
  
  <p>
  This is a shortcut for calling <code>createSession(<jk>null</jk>).resolve(s);</code>.
- This method can only be used if the string doesn't contain variables that rely on the existence of session
+ <br>This method can only be used if the string doesn't contain variables that rely on the existence of session
  variables.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -454,14 +399,14 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolveTo</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.200">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolver.html#line.173">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                       <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;w)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Resolve variables in the specified string and sends the results to the specified writer.
  
  <p>
  This is a shortcut for calling <code>createSession(<jk>null</jk>).resolveTo(s, w);</code>.
- This method can only be used if the string doesn't contain variables that rely on the existence of session
+ <br>This method can only be used if the string doesn't contain variables that rely on the existence of session
  variables.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -526,13 +471,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <li>Summary:&nbsp;</li>
 <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>Constr&nbsp;|&nbsp;</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>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html b/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
index 1406182..2c9b399 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolverBuilder.html
@@ -108,9 +108,14 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.24">VarResolverBuilder</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.29">VarResolverBuilder</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-<div class="block">Builder class for building instances of <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.</div>
+<div class="block">Builder class for building instances of <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.VarResolvers">Overview &gt; juneau-svl &gt; VarResolvers and VarResolverSessions</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -205,7 +210,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>VarResolverBuilder</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.24">VarResolverBuilder</a>()</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.29">VarResolverBuilder</a>()</pre>
 </li>
 </ul>
 </li>
@@ -222,7 +227,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>build</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.34">build</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl">VarResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.39">build</a>()</pre>
 <div class="block">Create a new var resolver using the settings in this builder.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -236,7 +241,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>vars</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.47">vars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;vars)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.52">vars</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;vars)</pre>
 <div class="block">Register new variables with this resolver.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -253,7 +258,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultVars</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.69">defaultVars</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.76">defaultVars</a>()</pre>
 <div class="block">Adds the default variables to this builder.
  
  <p>
@@ -263,6 +268,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
    <li><a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
    <li><a href="../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
    <li><a href="../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
+   <li><a href="../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a>
+   <li><a href="../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a>
  </ul></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -276,7 +283,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contextObject</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.84">contextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.91">contextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object)</pre>
 <div class="block">Associates a context object with this resolver.
  
@@ -298,7 +305,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>contextObjects</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.99">contextObjects</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="c [...]
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl">VarResolverBuilder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverBuilder.html#line.106">contextObjects</a>(<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title=" [...]
 <div class="block">Associates multiple context objects with this resolver.
  
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolverContext.html b/content/site/apidocs/org/apache/juneau/svl/VarResolverContext.html
index 4fc5251..acb9b1c 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolverContext.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolverContext.html
@@ -108,16 +108,17 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.28">VarResolverContext</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.31">VarResolverContext</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Configurable properties on the <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> class.
  
  <p>
- Used to associate <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> and context objects with <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolvers</code></a>.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Used to associate <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> and context objects with <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolvers</code></a>.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.VarResolvers">Overview &gt; juneau-svl &gt; VarResolvers and VarResolverSessions</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -208,7 +209,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>VarResolverContext</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.40">VarResolverContext</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;[]&nbsp;vars,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.43">VarResolverContext</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;[]&nbsp;vars,
                           <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;contextObjects)</pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -232,7 +233,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getVarMap</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.61" [...]
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.64" [...]
 <div class="block">Returns an unmodifiable map of <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> associated with this context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -246,7 +247,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getVars</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.70">getVars</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;[]&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.73">getVars</a>()</pre>
 <div class="block">Returns an array of variables define in this variable resolver context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -260,7 +261,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getContextObject</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.80">getContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverContext.html#line.83">getContextObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the context object with the specified name.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -276,7 +277,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getContextObjects</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/ju [...]
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/ju [...]
 <div class="block">Returns the context map of this variable resolver context.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/svl/VarResolverSession.html b/content/site/apidocs/org/apache/juneau/svl/VarResolverSession.html
index e2340bc..033731c 100644
--- a/content/site/apidocs/org/apache/juneau/svl/VarResolverSession.html
+++ b/content/site/apidocs/org/apache/juneau/svl/VarResolverSession.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.41">VarResolverSession</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.44">VarResolverSession</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">A var resolver session that combines a <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> with one or more session objects.
  
@@ -123,11 +123,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
  <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>VarResolver.createSession(Map)</code></a> methods.
  
  <p>
- Instances of this class are NOT guaranteed to be thread safe.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ Instances of this class are NOT guaranteed to be thread safe.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-svl.VarResolvers">Overview &gt; juneau-svl &gt; VarResolvers and VarResolverSessions</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -233,7 +234,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>VarResolverSession</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.55">VarResolverSession</a>(<a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a>&nbsp;context,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.58">VarResolverSession</a>(<a href="../../../../org/apache/juneau/svl/VarResolverContext.html" title="class in org.apache.juneau.svl">VarResolverContext</a>&nbsp;context,
                           <a href="http://docs.oracle.com/javase/7/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/7/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/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;sessionObjects)</pre>
 <div class="block">Constructor.</div>
 <dl>
@@ -258,7 +259,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>sessionObject</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.67">sessionObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.70">sessionObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;o)</pre>
 <div class="block">Adds a session object to this session.</div>
 <dl>
@@ -276,7 +277,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.81">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.84">resolve</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s)</pre>
 <div class="block">Resolve all variables in the specified string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -295,7 +296,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.139">resolve</a>(T&nbsp;o)</pre>
+<pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.142">resolve</a>(T&nbsp;o)</pre>
 <div class="block">Convenience method for resolving variables in arbitrary objects.
  
  <p>
@@ -323,7 +324,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>resolveTo</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.256">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.259">resolveTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;s,
                         <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Resolves variables in the specified string and sends the output to the specified writer.
@@ -348,7 +349,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getSessionObject</h4>
-<pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.377">getSessionObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;c,
+<pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.382">getSessionObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;c,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the session object with the specified name.
  
@@ -359,7 +360,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <dd><code>c</code> - The class type to cast to.</dd>
 <dd><code>name</code> - The name of the session object.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The session object.  Never <jk>null</jk>.</dd>
+<dd>The session object.  
+   <br>Never <jk>null</jk>.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</a></code> - If session object with specified name does not exist.</dd>
 </dl>
@@ -371,7 +373,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getVar</h4>
-<pre>protected&nbsp;<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.401">getVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>protected&nbsp;<a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl">Var</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/svl/VarResolverSession.html#line.406">getVar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> with the specified name.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/svl/package-summary.html b/content/site/apidocs/org/apache/juneau/svl/package-summary.html
index b5d4051..7dacc07 100644
--- a/content/site/apidocs/org/apache/juneau/svl/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/svl/package-summary.html
@@ -165,267 +165,7 @@
 <!--   -->
 </a>
 <h2 title="Package org.apache.juneau.svl Description">Package org.apache.juneau.svl Description</h2>
-<div class="block"><p>Simple Variable Language</p>
-
-<script>
-   function toggle(x) {
-      var div = x.nextSibling;
-      while (div != null && div.nodeType != 1)
-         div = div.nextSibling;
-      if (div != null) {
-         var d = div.style.display;
-         if (d == 'block' || d == '') {
-            div.style.display = 'none';
-            x.className += " closed";
-         } else {
-            div.style.display = 'block';
-            x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-         }
-      }
-   }
-</script>
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-   <li><p><a class='doclink' href='#SimpleVarLanguage'>Simple Variable Language</a></p>
-      <ol>
-         <li><p><a class='doclink' href='#Vars'>Vars</a></p>
-         <li><p><a class='doclink' href='#VarResolvers'>VarResolvers and VarResolverSessions</a></p>
-         <li><p><a class='doclink' href='#OtherNotes'>Other Notes</a></p>
-      </ol>
-   </li>
-</ol>
-
-<!-- ======================================================================================================== -->
-<a id="SimpleVarLanguage"></a>
-<h2 class='topic' onclick='toggle(this)'>1 - Simple Variable Language</h2>
-<div class='topic'>
-   <p>
-      The <code>org.apache.juneau.svl</code> package defines an API for a language called "Simple Variable Language".
-      In a nutshell, Simple Variable Language (or SVL) is text that contains variables of the form <js>"$varName{varKey}"</js>.
-   </p>
-   <p>
-      Variables can be recursively nested within the varKey (e.g. <js>"$FOO{$BAR{xxx},$BAZ{xxx}}"</js>).
-      Variables can also return values that themselves contain more variables.
-   </p>
-   <p>
-      The <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> class is used to resolve variables.
-      The <a href="../../../../org/apache/juneau/svl/VarResolver.html#DEFAULT"><code>VarResolver.DEFAULT</code></a> resolver will resolve <js>"$S{systemProperty}"</js> 
-      and <js>"$E{envVariable}"</js> variables.
-   </p>
-   <p class='bcode'>
-   <jc>// Use the default variable resolver to resolve a string that contains $S (system property) variables</jc>
-   String myProperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"The Java home directory is $S{java.home}"</js>);
-   </p>
-   <p>
-      The following shows how variables can be arbitrarily nested...
-   </p>
-   <p class='bcode'>
-   <jc>// Look up a property in the following order:
-   // 1) MYPROPERTY environment variable.
-   // 2) 'my.property' system property if environment variable not found.
-   // 3) 'not found' string if system property not found.</jc>
-   String myproperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"$E{MYPROPERTY,$S{my.property,not found}}"</js>);
-   </p>
-
-   <!-- ======================================================================================================== -->
-   <a id="Vars"></a>
-   <h3 class='topic' onclick='toggle(this)'>1.1 - Vars</h3>
-   <div class='topic'>
-      <p>
-         Variables are defined through the <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> API.
-      </p>
-      <p class='bcode'>
-   <jc>// Create a var resolver that extends the default resolver and appends our own "$URLEncode{...}" variable</jc>
-   
-   <jc>// First create our var.</jc>
-   <jk>public class</jk> UrlEncodeVar <jk>extends</jk> SimpleVar {
-      
-      <jc>// Must have a no-arg constructor!</jc>
-      <jk>public</jk> UrlEncodeVar() {
-         <jk>super</jk>(<js>"URLEncode"</js>);
-      }  
-      
-      <jc>// The method we must implement</jc>
-      <ja>@Override</ja>
-      <jk>public</jk> String resolve(VarResolverSession session, String varVal) {
-         <jk>return</jk> URLEncoder.<jsm>encode</jsm>(varVal, <js>"UTF-8"</js>);
-      }
-   }
-   
-   <jc>// Next create a var resolver that extends the existing DEFAULT resolver
-   // that supports resolving system properties.</jc>
-   VarResolver r = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(UrlEncodeVar.<jk>class</jk>).build();
-   
-   <jc>// Retrieve a system property and URL-encode it if necessary.</jc>
-   String myProperty = r.resolve(<js>"$URLEncode{$S{my.property}}"</js>);
-      </p>
-      <p>
-         The following shows the class hierarchy of the <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> class and all current
-         predefined implementations.
-      </p>  
-      <ul class='doctree'>
-         <li class='jac'>
-            <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> 
-            - Superclass of all vars.
-            <ul>
-               <li class='jac'>
-                  <a href="../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a> 
-                  - Superclass of all vars that return strings.
-                  <ul>
-                     <li class='jac'>
-                        <a href="../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><code>DefaultingVar</code></a> 
-                        - Variables that define a default value if the resolve method returns null.
-                        <ul>
-                           <li class='jac'>
-                              <a href="../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><code>MapVar</code></a> 
-                              - Variables that pull values from maps.
-                              <ul>
-                                 <li class='jc'>
-                                    <a href="../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a> 
-                                    - Resolves system properties.
-                              </ul>
-                           </li>
-                           <li class='jc'>
-                              <a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><code>ArgsVar</code></a> 
-                              - Resolves variables from an <a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object.
-                           <li class='jc'>
-                              <code>ConfigFileVar</code> 
-                              - Resolves variables from a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> object.
-                           <li class='jc'>
-                              <a href="../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a> 
-                              - Resolves environment variables.
-                           <li class='jc'>
-                              <a href="../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><code>ManifestFileVar</code></a> 
-                              - Resolves variables from a <a href="../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object.
-                           <li class='jc'>
-                              <a href="../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>ServletInitParamVar</code></a> 
-                              - Resolves servlet initialization parameters.
-                        </ul>
-                     </li>
-                     <li class='jac'>
-                        <a href="../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl"><code>MultipartVar</code></a> 
-                        - Variables that consist of 2 or more comma-delimited arguments.
-                        <ul>
-                           <li class='jc'>
-                              <a href="../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>LocalizationVar</code></a> 
-                              - Resolves localized strings for an HTTP request.
-                        </ul>
-                     </li>
-                     <li class='jc'>
-                        <a href="../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestVar</code></a> 
-                        - Resolves specialized HTTP request values.
-                     <li class='jc'>
-                        <a href="../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlEncodeVar</code></a> 
-                        - URL-encodes the value inside the variable.
-                  </ul>
-               </li>
-               <li class='jac'>
-                  <a href="../../../../org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a> 
-                  - Superclass of all vars that stream their value to writers.
-                  <ul>
-                     <li class='jc'>
-                        <a href="../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>SerializedRequestAttrVar</code></a> 
-                        - Resolves HTTP request attribute values passed through a 
-                        <a href="../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a>.
-                  </ul>
-               </li>
-            </ul>
-         </li>
-      </ul>
-   </div>
-   
-   <!-- ======================================================================================================== -->
-   <a id="VarResolvers"></a>
-   <h3 class='topic' onclick='toggle(this)'>1.2 - VarResolvers and VarResolverSessions</h3>
-   <div class='topic'>
-      <p>
-         The main class for performing variable resolution is <a href="../../../../org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
-         Two methods are provided for resolving variables:
-      </p>
-      <ul class='doctree'>
-         <li class='jm'>
-            <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolve-java.lang.String-"><code>VarResolver.resolve(String)</code></a> 
-            - Resolves variables and returns the results as a simple string.
-         <li class='jm'>
-            <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolveTo-java.lang.String-java.io.Writer-"><code>VarResolver.resolveTo(String,Writer)</code></a> 
-            - Resolves variables and sends results to a writer.
-      </ul>
-      <p>
-         Var resolvers can have zero or more context objects associated with them.
-         Some <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> rely on the existence of some other object, such as an 
-         <a href="../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils"><code>Args</code></a> object
-         for <a href="../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><code>ArgsVar</code></a> or a <a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> for a 
-         <code>ConfigFileVar</code>.
-         These object dependencies are made by setting context objects on the var resolver.
-      </p>
-      <p>
-         Context objects are set through the <a href="../../../../org/apache/juneau/svl/VarResolverBuilder.html" title="class in org.apache.juneau.svl"><code>#contextObject(String,Object)</code></a> method.
-         They can be any class type.
-      </p>
-      <p>
-         Context objects are used by <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> by calling the 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a> method.
-      </p>
-      <p>
-         In addition to context objects, there are also session objects.
-         Session objects are considered more ephemeral than context objects.
-         While a context object is unlikely to ever change, a session object may change on every use of the var 
-         resolver.
-         For example, the server API defines various <code>Var</code> objects that use the <code>RestRequest</code>
-            object as a session object for the duration of a single HTTP request.
-      </p>
-      <p>
-         Session objects are used by calling the <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession--"><code>VarResolver.createSession()</code></a> or 
-         <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>VarResolver.createSession(Map)</code></a> methods to create an instance of a 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a> object that contains 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#resolve-java.lang.String-"><code>VarResolverSession.resolve(String)</code></a> and 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#resolveTo-java.lang.String-java.io.Writer-"><code>VarResolverSession.resolveTo(String,Writer)</code></a> methods that are identical to 
-         <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolve-java.lang.String-"><code>VarResolver.resolve(String)</code></a> and 
-         <a href="../../../../org/apache/juneau/svl/VarResolver.html#resolveTo-java.lang.String-java.io.Writer-"><code>VarResolver.resolveTo(String, Writer)</code></a> except that the <code>Var</code> objects
-         have access to the session objects through the 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a> method.
-         Session objects are specified through either the <a href="../../../../org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>VarResolver.createSession(Map)</code></a> 
-         method or the <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#sessionObject-java.lang.String-java.lang.Object-"><code>VarResolverSession.sessionObject(String, Object)</code></a> methods.
-      </p>
-      <p>
-         Like Context object, Session objects are used by <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Vars</code></a> by calling the 
-         <a href="../../../../org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a> method.
-      </p>
-      <p>
-         Var resolvers can be cloned and extended by using the <a href="../../../../org/apache/juneau/svl/VarResolver.html#builder--"><code>VarResolver.builder()</code></a> 
-         method.
-         Cloning a resolver will copy it's <a href="../../../../org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> class names and context objects.
-      </p>
-      
-      <h5 class='topic'>Example:</h5>
-      <p class='bcode'>
-         <jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc>
-         VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(ConfigFileVar.<jk>class</jk>, 
-            ArgsVar.<jk>class</jk>).build();
-      </p>
-   </div>   
-   
-   <!-- ======================================================================================================== -->
-   <a id="OtherNotes"></a>
-   <h3 class='topic' onclick='toggle(this)'>1.3 - Other Notes</h3>
-   <div class='topic'>
-      <ul class='spaced-list'>
-         <li>
-            The escape character <js>'\'</js> can be used when necessary to escape the following characters: 
-            <code>$ , { }</code>
-         <li>
-            <b>WARNING:</b>  It is possible to cause <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StackOverflowError.html?is-external=true" title="class or interface in java.lang"><code>StackOverflowErrors</code></a> if 
-            your nested variables result in a recursive loop (e.g. the environment variable 
-            <code>'MYPROPERTY'</code> has the value <code>'$E{MYPROPERTY}'</code>).
-            So don't do that!
-         <li>
-            As a general rule, this class tries to be as efficient as possible by not creating new strings when not 
-            needed.
-            <br>For example, calling the resolve method on a string that doesn't contain variables (e.g. 
-            <code>resolver.resolve(<js>"foobar"</js>)</code>) will simply be a no-op and return the same string.
-      </ul>
-   </div>   
-</div></div>
+<div class="block">Simple Variable Language</div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html
index ddc376b..e7d5d5a 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.28">CoalesceAndRecurseVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.33">CoalesceAndRecurseVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html" title="class in org.apache.juneau.svl">MultipartResolvingVar</a></pre>
 <div class="block">A basic variable resolver that returns the first non-null value.
  
@@ -133,7 +133,12 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  <p>
  The difference between <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> and <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a> is that the first will not resolve
  inner variables nor recursively resolve variables, and the second will.
- Use <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> when resolving user-input.</div>
+ <br>Use <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> when resolving user-input.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -248,7 +253,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.31">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.36">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -270,7 +275,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CoalesceAndRecurseVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.36">CoalesceAndRecurseVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.41">CoalesceAndRecurseVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -288,7 +293,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.41">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html#line.46">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
@@ -333,7 +338,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li><a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceVar.html
index 368fca5..5f50927 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/CoalesceVar.html
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.28">CoalesceVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.33">CoalesceVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html" title="class in org.apache.juneau.svl">MultipartResolvingVar</a></pre>
 <div class="block">A basic variable resolver that returns the first non-null value.
  
@@ -133,7 +133,12 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  <p>
  The difference between <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> and <a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a> is that the first will not resolve
  inner variables nor recursively resolve variables, and the second will.
- Use <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> when resolving user-input.</div>
+ <br>Use <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a> when resolving user-input.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -260,7 +265,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.31">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.36">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -282,7 +287,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CoalesceVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.36">CoalesceVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.41">CoalesceVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -300,7 +305,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockList">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.41">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.46">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arg)
                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/Var.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String-">Var</a></code></span></div>
@@ -324,7 +329,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockList">
 <li class="blockList">
 <h4>allowNested</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.46">allowNested</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.51">allowNested</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowNested--">Var</a></code></span></div>
 <div class="block">Returns whether nested variables are supported by this variable.
  
@@ -349,7 +354,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>allowRecurse</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.51">allowRecurse</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/CoalesceVar.html#line.56">allowRecurse</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/Var.html#allowRecurse--">Var</a></code></span></div>
 <div class="block">Returns whether variables in the resolved contents of this variable should also be resolved.
  
@@ -359,7 +364,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartResolvingVar.html
  
  <p>
  The default implementation of this method always returns <jk>true</jk>.  
- Subclasses can override this method to override the default behavior.
+ <br>Subclasses can override this method to override the default behavior.
  
  <h5 class='topic'>Important Note</h5>
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
index 829682d..9f27c4b 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/EnvVariablesVar.html
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.38">EnvVariablesVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.41">EnvVariablesVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl">DefaultingVar</a></pre>
 <div class="block">Environment variable variable resolver.
  
@@ -133,7 +133,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Create a variable resolver that resolves environment variables (e.g. "$E{PATH}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(EnvVariablesVar.<js>class</js>);
+   VarResolver r = VarResolver.<jsm>create</jsm>().vars(EnvVariablesVar.<jk>class</jk>).build();
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"Environment variable PATH is set to $E{PATH}"</js>));
@@ -141,11 +141,12 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
  
  <p>
  Since this is a <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -260,7 +261,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.41">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.44">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -282,7 +283,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>EnvVariablesVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.46">EnvVariablesVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.49">EnvVariablesVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -300,7 +301,7 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.51">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html#line.54">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;varVal)</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>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
index 1c0ce3a..2d9b406 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/IfVar.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/svl/vars/IfVar.html" target="_top">Frames</a></li>
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.50">IfVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.53">IfVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl">MultipartVar</a></pre>
 <div class="block">A basic if-else logic variable resolver.
  
@@ -143,7 +143,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Create a variable resolver that resolves system properties and $IF vars.</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(IfVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>);
+   VarResolver r = VarResolver.<jsm>create</jsm>().vars(IfVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>).build();
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"Property $IF{$S{someBooleanFlag},IS,IS NOT} set!"</js>));
@@ -151,11 +151,12 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
  
  <p>
  Since this is a <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl"><code>MultipartVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -270,7 +271,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.53">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.56">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -292,7 +293,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>IfVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.58">IfVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.61">IfVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -310,7 +311,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.63">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/IfVar.html#line.66">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/MultipartVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String:A-">MultipartVar</a></code></span></div>
 <div class="block">The interface that needs to be implemented for this interface.</div>
@@ -353,7 +354,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/svl/vars/IfVar.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
index 7a36487..dc06738 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/SwitchVar.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.51">SwitchVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.56">SwitchVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl">MultipartVar</a></pre>
 <div class="block">A basic switch/case logic variable resolver.
  
@@ -144,7 +144,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Create a variable resolver that resolves system properties and $SW vars.</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(SwitchVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>);
+   VarResolver r = VarResolver.<jsm>create</jsm>().vars(SwitchVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>).build();
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"We are running on $SW{$P{os.name},*win*,Windows,Something else}!"</js>));
@@ -152,7 +152,12 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
  
  <p>
  Since this is a <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl"><code>MultipartVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
+ <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -267,7 +272,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.54">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.59">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -289,7 +294,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SwitchVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.59">SwitchVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.64">SwitchVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -307,7 +312,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resolve</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.64">resolve</a>(<a href="../../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;session,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SwitchVar.html#line.69">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/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/juneau/svl/MultipartVar.html#resolve-org.apache.juneau.svl.VarResolverSession-java.lang.String:A-">MultipartVar</a></code></span></div>
 <div class="block">The interface that needs to be implemented for this interface.</div>
@@ -349,7 +354,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MultipartVar.html" title="
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
index dc26343..afa22b3 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/SystemPropertiesVar.html
@@ -122,7 +122,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.38">SystemPropertiesVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.41">SystemPropertiesVar</a>
 extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl">MapVar</a></pre>
 <div class="block">System property variable resolver.
  
@@ -132,7 +132,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Create a variable resolver that resolves system properties (e.g. "$S{java.home}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(SystemPropertiesVar.<js>class</js>);
+   VarResolver r = VarResolver.<jsm>create</jsm>().vars(SystemPropertiesVar.<jk>class</jk>).build();
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"java.home is set to $S{java.home}"</js>));
@@ -140,11 +140,12 @@ extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class
  
  <p>
  Since this is a <a href="../../../../../org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a>, any variables contained in the result will be recursively resolved.
- Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/apache/juneau/svl/package-summary.html"><code>org.apache.juneau.svl</code></a></dd>
-</dl>
+ <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.SvlVariables">Overview &gt; juneau-svl &gt; SVL Variables</a>
+ </ul></div>
 </li>
 </ul>
 </div>
@@ -252,7 +253,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.41">NAME</a></pre>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.44">NAME</a></pre>
 <div class="block">The name of this variable.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -274,7 +275,7 @@ extends <a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SystemPropertiesVar</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.46">SystemPropertiesVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html#line.49">SystemPropertiesVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
index fddc9e9..4713e4f 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-frame.html
@@ -13,12 +13,10 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ArgsVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ArgsVar</a></li>
 <li><a href="CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">CoalesceAndRecurseVar</a></li>
 <li><a href="CoalesceVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">CoalesceVar</a></li>
 <li><a href="EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">EnvVariablesVar</a></li>
 <li><a href="IfVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">IfVar</a></li>
-<li><a href="ManifestFileVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">ManifestFileVar</a></li>
 <li><a href="SwitchVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">SwitchVar</a></li>
 <li><a href="SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars" target="classFrame">SystemPropertiesVar</a></li>
 </ul>
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
index d2d5ddd..cb65f2c 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-summary.html
@@ -86,41 +86,29 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars">ArgsVar</a></td>
-<td class="colLast">
-<div class="block">JVM args variable resolver.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars">CoalesceAndRecurseVar</a></td>
 <td class="colLast">
 <div class="block">A basic variable resolver that returns the first non-null value.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars">CoalesceVar</a></td>
 <td class="colLast">
 <div class="block">A basic variable resolver that returns the first non-null value.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars">EnvVariablesVar</a></td>
 <td class="colLast">
 <div class="block">Environment variable variable resolver.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars">IfVar</a></td>
 <td class="colLast">
 <div class="block">A basic if-else logic variable resolver.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars">ManifestFileVar</a></td>
-<td class="colLast">
-<div class="block">Manifest file entries variable resolver.</div>
-</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars">SwitchVar</a></td>
 <td class="colLast">
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
index 1fa3bfe..c974b2a 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
@@ -86,9 +86,7 @@
 <ul>
 <li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
 <ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
 <li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
 <li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MapVar</span></a>
 <ul>
 <li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">SystemPropertiesVar</span></a></li>
diff --git a/content/site/apidocs/overview-frame.html b/content/site/apidocs/overview-frame.html
index a805ae0..73a304d 100644
--- a/content/site/apidocs/overview-frame.html
+++ b/content/site/apidocs/overview-frame.html
@@ -28,6 +28,7 @@
 <li><a href="org/apache/juneau/http/package-frame.html" target="packageFrame">org.apache.juneau.http</a></li>
 <li><a href="org/apache/juneau/httppart/package-frame.html" target="packageFrame">org.apache.juneau.httppart</a></li>
 <li><a href="org/apache/juneau/ini/package-frame.html" target="packageFrame">org.apache.juneau.ini</a></li>
+<li><a href="org/apache/juneau/ini/vars/package-frame.html" target="packageFrame">org.apache.juneau.ini.vars</a></li>
 <li><a href="org/apache/juneau/internal/package-frame.html" target="packageFrame">org.apache.juneau.internal</a></li>
 <li><a href="org/apache/juneau/jena/package-frame.html" target="packageFrame">org.apache.juneau.jena</a></li>
 <li><a href="org/apache/juneau/jena/annotation/package-frame.html" target="packageFrame">org.apache.juneau.jena.annotation</a></li>
@@ -38,6 +39,7 @@
 <li><a href="org/apache/juneau/microservice/console/package-frame.html" target="packageFrame">org.apache.juneau.microservice.console</a></li>
 <li><a href="org/apache/juneau/microservice/resources/package-frame.html" target="packageFrame">org.apache.juneau.microservice.resources</a></li>
 <li><a href="org/apache/juneau/microservice/sample/package-frame.html" target="packageFrame">org.apache.juneau.microservice.sample</a></li>
+<li><a href="org/apache/juneau/microservice/vars/package-frame.html" target="packageFrame">org.apache.juneau.microservice.vars</a></li>
 <li><a href="org/apache/juneau/msgpack/package-frame.html" target="packageFrame">org.apache.juneau.msgpack</a></li>
 <li><a href="org/apache/juneau/parser/package-frame.html" target="packageFrame">org.apache.juneau.parser</a></li>
 <li><a href="org/apache/juneau/plaintext/package-frame.html" target="packageFrame">org.apache.juneau.plaintext</a></li>
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 6c53a73..901b629 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -176,65 +176,77 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="org/apache/juneau/ini/vars/package-summary.html">org.apache.juneau.ini.vars</a></td>
+<td class="colLast">
+<div class="block">Predefined SVL Variables</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></td>
 <td class="colLast">
 <div class="block">Internal Utilities</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/jena/package-summary.html">org.apache.juneau.jena</a></td>
 <td class="colLast">
 <div class="block">RDF Marshalling Support</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="org/apache/juneau/jena/annotation/package-summary.html">org.apache.juneau.jena.annotation</a></td>
 <td class="colLast">
 <div class="block">RDF Marshalling Annotations</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/jso/package-summary.html">org.apache.juneau.jso</a></td>
 <td class="colLast">
 <div class="block">Java-Serialized-Object Marshalling Support</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="org/apache/juneau/json/package-summary.html">org.apache.juneau.json</a></td>
 <td class="colLast">
 <div class="block">JSON Marshalling Support</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/json/annotation/package-summary.html">org.apache.juneau.json.annotation</a></td>
 <td class="colLast">
 <div class="block">JSON Marshalling Annotations</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="org/apache/juneau/microservice/package-summary.html">org.apache.juneau.microservice</a></td>
 <td class="colLast">
 <div class="block">Microservice API</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/microservice/console/package-summary.html">org.apache.juneau.microservice.console</a></td>
 <td class="colLast">
 <div class="block">Microservice Console</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="org/apache/juneau/microservice/resources/package-summary.html">org.apache.juneau.microservice.resources</a></td>
 <td class="colLast">
 <div class="block">Predefined Microservice Resources</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a></td>
 <td class="colLast">
 <div class="block">Microservice Samples</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/apache/juneau/microservice/vars/package-summary.html">org.apache.juneau.microservice.vars</a></td>
+<td class="colLast">
+<div class="block">Predefined SVL Variables</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="org/apache/juneau/msgpack/package-summary.html">org.apache.juneau.msgpack</a></td>
 <td class="colLast">
@@ -496,6 +508,12 @@
       <li><p><a class='doclink' href='#juneau-dto.Swagger'>Swagger</a></p>
    </ol>
    <li><p><a class='doclink' href='#juneau-svl'><i>juneau-svl</i></a></p>
+   <ol>
+      <li><p><a class='doclink' href='#juneau-svl.SimpleVarLanguage'>Simple Variable Language</a></p>
+      <li><p><a class='doclink' href='#juneau-svl.SvlVariables'>SVL Variables</a></p>
+      <li><p><a class='doclink' href='#juneau-svl.VarResolvers'>VarResolvers and VarResolverSessions</a></p>
+      <li><p><a class='doclink' href='#juneau-svl.OtherNotes'>Other Notes</a></p>
+   </ol>
    <li><p><a class='doclink' href='#juneau-config'><i>juneau-config</i></a></p>
    <li><p><a class='doclink' href='#juneau-rest-server'><i>juneau-rest-server</i></a></p>
    <ol>
@@ -4681,44 +4699,291 @@
    org.apache.juneau.svl_7.0.0.jar 
    </p>  
 
-   <p>
-      The <code>juneau-svl</code> library defines an API for a language called "Simple Variable Language".
-      In a nutshell, Simple Variable Language (or SVL) is text that contains variables of the form
-      <js>"$varName{varKey}"</js>.
-   </p>
-   <p>
-      Variables can be recursively nested within the varKey (e.g. <js>"$FOO{$BAR{xxx},$BAZ{xxx}}"</js>).
-      Variables can also return values that themselves contain more variables.
-   </p>
-   <p class='bcode'>
+   <!-- ======================================================================================================== -->
+   <a id="juneau-svl.SimpleVarLanguage"></a>
+   <h3 class='topic' onclick='toggle(this)'>5.1 - Simple Variable Language</h3>
+   <div class='topic'>
+      <p>
+         The <l>juneau-svl</l> module defines an API for a language called <l>Simple Variable Language</l>.
+         <br>In a nutshell, Simple Variable Language (or SVL) is text that contains variables of the form <js>"$varName{varKey}"</js>.
+         <br>It is used extensively in the ConfigFile, REST and Microservice APIs.
+      </p>
+      <p>
+         Most variables can be recursively nested within the varKey (e.g. <js>"$FOO{$BAR{xxx},$BAZ{xxx}}"</js>)
+         and can return values that themselves contain more variables.
+      </p>
+      <p>
+         The <a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> class is used to resolve variables.
+         <br>The <a href="org/apache/juneau/svl/VarResolver.html#DEFAULT"><code>VarResolver.DEFAULT</code></a> resolver is a reusable instance of this class 
+         configured with the following basic variables:
+      </p>
+      <ul>
+         <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.
+         <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.
+         <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.
+         <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.
+         <li><code>$CO{arg1[,arg2...]}</code> - Coalesce variable.
+         <li><code>$CR{arg1[,arg2...]}</code> - Coalesce-and-recurse variable.
+      </ul>
+      <h5 class='figure'>Example:</h5>
+      <p class='bcode'>
    <jc>// Use the default variable resolver to resolve a string that contains $S (system property) variables</jc>
    String myProperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"The Java home directory is $S{java.home}"</js>);
-   </p>
-   <p>
-      The following shows how variables can be arbitrarily nested...
-   </p>
-   <p class='bcode'>
+      </p>
+      <p>
+         The following shows how variables can be arbitrarily nested...
+      </p>
+      <p class='bcode'>
    <jc>// Look up a property in the following order:
    // 1) MYPROPERTY environment variable.
    // 2) 'my.property' system property if environment variable not found.
    // 3) 'not found' string if system property not found.</jc>
    String myproperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"$E{MYPROPERTY,$S{my.property,not found}}"</js>);
-   </p>
-   <p>
-      SVL is a large topic on it's own. 
-      It is used extensively in the ConfigFile, REST and Microservice APIs.
-   </p>
+      </p>
+    </div>
    
-   <h5 class='toc'>Additional Information - org.apache.juneau.svl</h5>
-   <ol class='toc'>
-      <li><p><a class='doclink' href='org/apache/juneau/svl/package-summary.html#SimpleVarLanguage'>Simple Variable Language</a></p>
-         <ol>
-            <li><p><a class='doclink' href='org/apache/juneau/svl/package-summary.html#Vars'>Vars</a></p>
-            <li><p><a class='doclink' href='org/apache/juneau/svl/package-summary.html#VarResolvers'>VarResolvers and VarResolverSessions</a></p>
-            <li><p><a class='doclink' href='org/apache/juneau/svl/package-summary.html#OtherNotes'>Other Notes</a></p>
-         </ol>
-      </li>
-   </ol>
+   <!-- ======================================================================================================== -->
+   <a id="juneau-svl.SvlVariables"></a>
+   <h3 class='topic' onclick='toggle(this)'>5.2 - SVL Variables</h3>
+   <div class='topic'>
+      <p>
+         Variables are defined through the <a href="org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> API.
+         <br>The API comes with several predefined variables and is easily extensible.
+      </p>
+      <p>
+         The following is an example of a variable that performs URL-Encoding on strings.
+      </p>
+      <p class='bcode'>
+   <jc>// First create our var.</jc>
+   <jk>public class</jk> UrlEncodeVar <jk>extends</jk> SimpleVar {
+      
+      <jc>// Must have a no-arg constructor!</jc>
+      <jk>public</jk> UrlEncodeVar() {
+         <jk>super</jk>(<js>"UE"</js>);
+      }  
+      
+      <jc>// The method we must implement</jc>
+      <ja>@Override</ja>
+      <jk>public</jk> String resolve(VarResolverSession session, String key) {
+         <jk>return</jk> URLEncoder.<jsm>encode</jsm>(key, <js>"UTF-8"</js>);
+      }
+   }
+   
+   <jc>// Next create a var resolver that extends the existing DEFAULT resolver
+   // that supports resolving system properties.</jc>
+   VarResolver r = VarResolver.<jsf>DEFAULT</jsf>
+      .builder()
+      .vars(UrlEncodeVar.<jk>class</jk>)
+      .build();
+   
+   <jc>// Retrieve a system property and URL-encode it if necessary.</jc>
+   String myProperty = r.resolve(<js>"$UE{$S{my.property}}"</js>);
+      </p>
+      <p>
+         The following shows the class hierarchy of the <a href="org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> class:
+      </p>  
+      <ul class='doctree'>
+         <li class='jac'><a href="org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> - Superclass of all vars.
+         <ul>
+            <li class='jac'><a href="org/apache/juneau/svl/SimpleVar.html" title="class in org.apache.juneau.svl"><code>SimpleVar</code></a> - Superclass of all vars that return strings.
+            <ul>
+               <li class='jac'><a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><code>DefaultingVar</code></a> - Variables that define a default value if the resolve method returns null.
+               <ul>
+                  <li class='jac'><a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><code>MapVar</code></a> - Variables that pull values from maps.
+               </ul>
+               <li class='jac'><a href="org/apache/juneau/svl/MultipartVar.html" title="class in org.apache.juneau.svl"><code>MultipartVar</code></a> - Variables that consist of 2 or more comma-delimited arguments.
+            </ul>
+            <li class='jac'><a href="org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a> - Superclass of all vars that stream their value to writers.
+         </ul>
+      </ul>
+      <p>
+         The following is the list of default variables defined in all modules:
+      </p>
+      <table class='styled' style='min-width:800px;width:50%'>
+         <tr>
+            <th>Module</th><th>Class</th><th>Pattern</th>
+         </tr>
+         <tr class='dark'>
+            <td rowspan="6" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-svl</td>
+            <td><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a></td>
+            <td class='code'>$E{envVar[,defaultValue]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a></td>
+            <td class='code'>$S{systemProperty[,defaultValue]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a></td>
+            <td class='code'>$CO{arg1[,arg2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a></td>
+            <td class='code'>$CR{arg1[,arg2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a></td>
+            <td class='code'>$IF{booleanArg,thenValue[,elseValue]}</td>
+         </tr>
+         <tr class='dark dd'>
+            <td><a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a></td>
+            <td class='code'>$SW{stringArg(,pattern,thenValue)+[,elseValue]}</td>
+         </tr>
+         <tr class='light dd'>
+            <td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-config</td>
+            <td><a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>ConfigFileVar</code></a></td>
+            <td class='code'>$C{key[,defaultValue]}</td>
+         </tr>
+         <tr class='dark'>
+            <td rowspan="14" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest-server</td>
+            <td><a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>FileVar</code></a></td>
+            <td class='code'>$F{path[,defaultValue]}}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>ServletInitParamVar</code></a></td>
+            <td class='code'>$I{name[,defaultValue]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>LocalizationVar</code></a></td>
+            <td class='code'>$L{key[,args...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestAttributeVar</code></a></td>
+            <td class='code'>$RA{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestFormDataVar</code></a></td>
+            <td class='code'>$RF{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a></td>
+            <td class='code'>$RH{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a></td>
+            <td class='code'>$RI{key}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestPathVar</code></a></td>
+            <td class='code'>$RP{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestQueryVar</code></a></td>
+            <td class='code'>$RQ{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestVar</code></a></td>
+            <td class='code'>$R{key1[,key2...]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>SerializedRequestAttrVar</code></a></td>
+            <td class='code'>$SA{contentType,key[,defaultValue]}</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlVar</code></a></td>
+            <td class='code'>$U{uri}></td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlEncodeVar</code></a></td>
+            <td class='code'>$UE{uriPart}</td>
+         </tr>
+         <tr class='dark dd'>
+            <td><a href="org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>WidgetVar</code></a></td>
+            <td class='code'>$W{widgetName}</td>
+         </tr>
+         <tr class='light'>
+            <td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-microservice-server</td>
+            <td><a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><code>ArgsVar</code></a></td>
+            <td class='code'>$ARG{key[,defaultValue]}</td>
+         </tr>
+         <tr class='light dd'>
+            <td><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><code>ManifestFileVar</code></a></td>
+            <td class='code'>$MF{key[,defaultValue]}</td>
+         </tr>
+      </table>
+   </div>
+   
+   <!-- ======================================================================================================== -->
+   <a id="juneau-svl.VarResolvers"></a>
+   <h3 class='topic' onclick='toggle(this)'>5.3 - VarResolvers and VarResolverSessions</h3>
+   <div class='topic'>
+      <p>
+         The main class for performing variable resolution is <a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>.
+         <br>Two methods are provided for resolving variables:
+      </p>
+      <ul class='doctree'>
+         <li class='jc'><a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a>
+         <ul>
+            <li class='jm'><a href="org/apache/juneau/svl/VarResolver.html#resolve-java.lang.String-"><code>resolve(String)</code></a> 
+               - Resolves variables and returns the results as a simple string.
+            <li class='jm'><a href="org/apache/juneau/svl/VarResolver.html#resolveTo-java.lang.String-java.io.Writer-"><code>resolveTo(String,Writer)</code></a> 
+               - Resolves variables and sends results to a writer.
+         </ul>
+      </ul>
+      <p>
+         Var resolvers can rely on the existence of other objects.
+         <br>For example, <a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>ConfigFileVar</code></a> relies on the existence of a <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a>.
+         <br>This is accomplished through the following:
+      </p>
+      <ul class='spaced-list'>
+         <li>Context-objects - Objects set on the resolver.
+         <li>Session-objects - Objects set on the resolver session.
+      </ul>
+      <p>
+         The following two classes are identical in behavior except for which objects they can access:
+      </p>
+      <ul>
+         <li class='jc'><a href="org/apache/juneau/svl/VarResolver.html" title="class in org.apache.juneau.svl"><code>VarResolver</code></a> - Has access to context objects only.
+         <li class='jc'><a href="org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl"><code>VarResolverSession</code></a> - Has access to context and session objects.
+      </ul>
+      <p>
+         Context and session objects are set through the following methods:
+      </p>
+      <ul>
+         <li class='jm'><a href="org/apache/juneau/svl/VarResolverBuilder.html#contextObject-java.lang.String-java.lang.Object-"><code>VarResolverBuilder.contextObject(String,Object)</code></a> - Context objects.
+         <li class='jm'><a href="org/apache/juneau/svl/VarResolverSession.html#sessionObject-java.lang.String-java.lang.Object-"><code>VarResolverSession.sessionObject(String,Object)</code></a> - Session objects.
+         <li class='jm'><a href="org/apache/juneau/svl/VarResolver.html#createSession-java.util.Map-"><code>VarResolver.createSession(Map)</code></a> - Session objects.
+      </ul>
+      <p>
+         Both kinds of objects are accessible through the following method:
+      </p>
+      <ul>
+         <li class='jm'><a href="org/apache/juneau/svl/VarResolverSession.html#getSessionObject-java.lang.Class-java.lang.String-"><code>VarResolverSession.getSessionObject(Class, String)</code></a>
+      </ul>
+      <p>
+         Var resolvers can be cloned and extended by using the <a href="org/apache/juneau/svl/VarResolver.html#builder--"><code>VarResolver.builder()</code></a> method.
+         <br>Cloning a resolver will copy it's <a href="org/apache/juneau/svl/Var.html" title="class in org.apache.juneau.svl"><code>Var</code></a> class names and context objects.
+      </p>
+      
+      <h5 class='figure'>Example:</h5>
+      <p class='bcode'>
+   <jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc>
+   VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>
+      .builder()
+      .vars(ConfigFileVar.<jk>class</jk>, ArgsVar.<jk>class</jk>)
+      .build();
+      </p>
+   </div>   
+   
+   <!-- ======================================================================================================== -->
+   <a id="juneau-svl.OtherNotes"></a>
+   <h3 class='topic' onclick='toggle(this)'>5.4 - Other Notes</h3>
+   <div class='topic'>
+      <ul class='spaced-list'>
+         <li>
+            The escape character <js>'\'</js> can be used when necessary to escape the following characters: 
+            <code>$ , { }</code>
+         <li>
+            <b>WARNING:</b>  It is possible to cause <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StackOverflowError.html?is-external=true" title="class or interface in java.lang"><code>StackOverflowErrors</code></a> if 
+            your nested variables result in a recursive loop (e.g. the environment variable 
+            <code>'MYPROPERTY'</code> has the value <code>'$E{MYPROPERTY}'</code>).
+            So don't do that!
+         <li>
+            As a general rule, this class tries to be as efficient as possible by not creating new strings when not 
+            needed.
+            <br>For example, calling the resolve method on a string that doesn't contain variables (e.g. 
+            <code>resolver.resolve(<js>"foobar"</js>)</code>) will simply be a no-op and return the same string.
+      </ul>
+   </div>   
 </div>
 
 <!-- =========================================================================================================== -->
@@ -7581,68 +7846,158 @@
       <p>
          The following is the default list of supported variables.
       </p>
-      <a id="DefaultRestSvlVariables"></a>
-      <h5 class='topic'>Default REST SVL variables</h5>
-      <ul class='spaced-list'>
-         <li><b>Initialization-time variables:</b>
-         <ul>
-            <li><l>$C{key[,defaultValue]}</l> - <a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><code>ConfigFileVar</code></a>
-            <li><l>$E{envVar[,defaultValue]}</l> - <a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a>
-            <li><l>$S{systemProperty[,defaultValue]}</l> - <a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a>
-         </ul>
-         <li><b>Initialization-time construct variables:</b>
-         <ul>
-            <li><l>$CO{arg1[,arg2...]}</l> - <a href="org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a>
-            <li><l>$CR{arg1[,arg2...]}</l> - <a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a>
-            <li><l>$IF{booleanArg,thenValue[,elseValue]}</l> - <a href="org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a>
-            <li><l>$SW{stringArg(,pattern,thenValue)+[,elseValue]}</l> - <a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a>
-         </ul>
-         <li><b>Request-time variables:</b>
-         <ul>
-            <li><l>$F{path[,defaultValue]}</l> - <a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>FileVar</code></a>
-            <li><l>$I{name[,defaultValue]}</l> - <a href="org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>ServletInitParamVar</code></a>
-            <li><l>$L{key[,args...]}</l> - <a href="org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>LocalizationVar</code></a>
-            <li><l>$RA{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestAttributeVar</code></a>
-            <li><l>$RF{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestFormDataVar</code></a>
-            <li><l>$RH{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a>
-            <li><l>$RI{key}</l> - <a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a>
-               <br>Possible keys:
-               <ul>
-                  <li><l>$RI{contact}</l> - <a href="org/apache/juneau/dto/swagger/Info.html#getContact--"><code>Info.getContact()</code></a>
-                  <li><l>$RI{description}</l> - <a href="org/apache/juneau/rest/RestInfoProvider.html#getDescription-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getDescription(RestRequest)</code></a>
-                  <li><l>$RI{externalDocs}</l> - <a href="org/apache/juneau/dto/swagger/Swagger.html#getExternalDocs--"><code>Swagger.getExternalDocs()</code></a>
-                  <li><l>$RI{license}</l> - <a href="org/apache/juneau/dto/swagger/Info.html#getLicense--"><code>Info.getLicense()</code></a>
-                  <li><l>$RI{methodDescription}</l> - <a href="org/apache/juneau/rest/RestInfoProvider.html#getMethodDescription-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getMethodDescription(Method,RestRequest)</code></a>
-                  <li><l>$RI{methodSummary}</l> - <a href="org/apache/juneau/rest/RestInfoProvider.html#getMethodSummary-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getMethodSummary(Method,RestRequest)</code></a>
-                  <li><l>$RI{siteName}</l> - <a href="org/apache/juneau/rest/RestInfoProvider.html#getSiteName-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getSiteName(RestRequest)</code></a>
-                  <li><l>$RI{tags}</l> - <a href="org/apache/juneau/dto/swagger/Swagger.html#getTags--"><code>Swagger.getTags()</code></a>
-                  <li><l>$RI{termsOfService}</l> - <a href="org/apache/juneau/dto/swagger/Info.html#getTermsOfService--"><code>Info.getTermsOfService()</code></a>
-                  <li><l>$RI{title}</l> - <a href="org/apache/juneau/rest/RestInfoProvider.html#getTitle-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getTitle(RestRequest)</code></a>
-                  <li><l>$RI{version}</l> - <a href="org/apache/juneau/dto/swagger/Info.html#getVersion--"><code>Info.getVersion()</code></a>
-               </ul>
-            <li><l>$RP{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestPathVar</code></a>
-            <li><l>$RQ{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestQueryVar</code></a>
-            <li><l>$R{key1[,key2...]}</l> - <a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestVar</code></a>
-               <br>Possible keys:
-               <ul>
-                  <li><l>$R{method}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getMethod--"><code>RestRequest.getMethod()</code></a>
-                  <li><l>$R{methodSummary}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getMethodSummary--"><code>RestRequest.getMethodSummary()</code></a>
-                  <li><l>$R{methodDescription}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getMethodDescription--"><code>RestRequest.getMethodDescription()</code></a>
-                  <li><l>$R{pathInfo}</l> - <code>HttpServletRequestWrapper.getPathInfo()</code>
-                  <li><l>$R{requestParentURI}</l> - <a href="org/apache/juneau/UriContext.html#getRootRelativePathInfoParent--"><code>UriContext.getRootRelativePathInfoParent()</code></a>
-                  <li><l>$R{requestURI}</l> - <code>HttpServletRequestWrapper.getRequestURI()</code>
-                  <li><l>$R{resourceDescription}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getResourceDescription--"><code>RestRequest.getResourceDescription()</code></a>
-                  <li><l>$R{resourceTitle}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getResourceTitle--"><code>RestRequest.getResourceTitle()</code></a>
-                  <li><l>$R{servletParentURI}</l> - <a href="org/apache/juneau/UriContext.html#getRootRelativeServletPathParent--"><code>UriContext.getRootRelativeServletPathParent()</code></a>
-                  <li><l>$R{servletPath}</l> - <a href="org/apache/juneau/rest/RestRequest.html#getServletPath--"><code>RestRequest.getServletPath()</code></a>
-                  <li><l>$R{servletURI}</l> - <a href="org/apache/juneau/UriContext.html#getRootRelativeServletPath--"><code>UriContext.getRootRelativeServletPath()</code></a>
-               </ul>
-            <li><l>$SA{contentType,key[,defaultValue]}</l> - <a href="org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>SerializedRequestAttrVar</code></a>
-            <li><l>$U{uri}</l> - <a href="org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlVar</code></a>
-            <li><l>$UE{uriPart}</l> - <a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlEncodeVar</code></a>
-            <li><l>$W{widgetName}</l> - <a href="org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>WidgetVar</code></a>
-         </ul>
-      </ul>
+      <a id='DefaultRestSvlVariables'></a>
+      <h5 class='figure'>Default REST SVL Variables:</h5>
+      <table class='styled' style='min-width:800px;width:50%'>
+         <tr>
+            <th>Module</th><th>Class</th><th>Pattern</th><th>Initialization<br>time</th><th>Request<br>time</th>
+         </tr>
+         <tr class='dark'>
+            <td rowspan="6" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-svl</td>
+            <td><a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>EnvVariablesVar</code></a></td>
+            <td class='code'>$E{envVar[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>SystemPropertiesVar</code></a></td>
+            <td class='code'>$S{systemProperty[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceVar</code></a></td>
+            <td class='code'>$CO{arg1[,arg2...]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/CoalesceAndRecurseVar.html" title="class in org.apache.juneau.svl.vars"><code>CoalesceAndRecurseVar</code></a></td>
+            <td class='code'>$CR{arg1[,arg2...]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>IfVar</code></a></td>
+            <td class='code'>$IF{booleanArg,thenValue[,elseValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark dd'>
+            <td><a href="org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>SwitchVar</code></a></td>
+            <td class='code'>$SW{stringArg(,pattern,thenValue)+[,elseValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='light dd'>
+            <td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-config</td>
+            <td><a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><code>ConfigFileVar</code></a></td>
+            <td class='code'>$C{key[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td rowspan="14" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest-server</td>
+            <td><a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>FileVar</code></a></td>
+            <td class='code'>$F{path[,defaultValue]}}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>ServletInitParamVar</code></a></td>
+            <td class='code'>$I{name[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>LocalizationVar</code></a></td>
+            <td class='code'>$L{key[,args...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestAttributeVar</code></a></td>
+            <td class='code'>$RA{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestFormDataVar</code></a></td>
+            <td class='code'>$RF{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a></td>
+            <td class='code'>$RH{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestHeaderVar</code></a></td>
+            <td class='code'>$RI{key}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestPathVar</code></a></td>
+            <td class='code'>$RP{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestQueryVar</code></a></td>
+            <td class='code'>$RQ{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>RequestVar</code></a></td>
+            <td class='code'>$R{key1[,key2...]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>SerializedRequestAttrVar</code></a></td>
+            <td class='code'>$SA{contentType,key[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlVar</code></a></td>
+            <td class='code'>$U{uri}></td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark'>
+            <td><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>UrlEncodeVar</code></a></td>
+            <td class='code'>$UE{uriPart}</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='dark dd'>
+            <td><a href="org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>WidgetVar</code></a></td>
+            <td class='code'>$W{widgetName}</td>
+            <td style='text-align:center;font-weight:bold'>no</td>
+            <td style='text-align:center;font-weight:bold'>yes</td>
+         </tr>
+         <tr class='light'>
+            <td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-microservice-server</td>
+            <td><a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><code>ArgsVar</code></a></td>
+            <td class='code'>$ARG{key[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes*</td>
+            <td style='text-align:center;font-weight:bold'>yes*</td>
+         </tr>
+         <tr class='light dd'>
+            <td><a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><code>ManifestFileVar</code></a></td>
+            <td class='code'>$MF{key[,defaultValue]}</td>
+            <td style='text-align:center;font-weight:bold'>yes*</td>
+            <td style='text-align:center;font-weight:bold'>yes*</td>
+         </tr>
+      </table>
+      <p>
+         * = Only if extending from <a href="org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><code>Resource</code></a>
+      <p>
    </div>
    
    <!-- ======================================================================================================== -->
@@ -17568,7 +17923,7 @@
                <li>More consistent handling of exceptions.
                <li>More consistent method declarations.
             </ul>
-         <li>Refactored var resolver API and added them to a new package - <a class='doclink' href='org/apache/juneau/svl/package-summary.html#TOC'>org.apache.juneau.svl</a>.
+         <li>Refactored var resolver API and added them to a new package - <code>org.apache.juneau.svl</code>.
             <ul>
                <li>Support for stream-based variables - <a href="org/apache/juneau/svl/StreamedVar.html" title="class in org.apache.juneau.svl"><code>StreamedVar</code></a>.
                <li>Added support for context and session objects.
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 708a5a4..273404d 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -87,6 +87,7 @@
 <li><a href="org/apache/juneau/http/package-tree.html">org.apache.juneau.http</a>, </li>
 <li><a href="org/apache/juneau/httppart/package-tree.html">org.apache.juneau.httppart</a>, </li>
 <li><a href="org/apache/juneau/ini/package-tree.html">org.apache.juneau.ini</a>, </li>
+<li><a href="org/apache/juneau/ini/vars/package-tree.html">org.apache.juneau.ini.vars</a>, </li>
 <li><a href="org/apache/juneau/internal/package-tree.html">org.apache.juneau.internal</a>, </li>
 <li><a href="org/apache/juneau/jena/package-tree.html">org.apache.juneau.jena</a>, </li>
 <li><a href="org/apache/juneau/jena/annotation/package-tree.html">org.apache.juneau.jena.annotation</a>, </li>
@@ -97,6 +98,7 @@
 <li><a href="org/apache/juneau/microservice/console/package-tree.html">org.apache.juneau.microservice.console</a>, </li>
 <li><a href="org/apache/juneau/microservice/resources/package-tree.html">org.apache.juneau.microservice.resources</a>, </li>
 <li><a href="org/apache/juneau/microservice/sample/package-tree.html">org.apache.juneau.microservice.sample</a>, </li>
+<li><a href="org/apache/juneau/microservice/vars/package-tree.html">org.apache.juneau.microservice.vars</a>, </li>
 <li><a href="org/apache/juneau/msgpack/package-tree.html">org.apache.juneau.msgpack</a>, </li>
 <li><a href="org/apache/juneau/parser/package-tree.html">org.apache.juneau.parser</a>, </li>
 <li><a href="org/apache/juneau/plaintext/package-tree.html">org.apache.juneau.plaintext</a>, </li>
@@ -1348,11 +1350,11 @@
 <ul>
 <li type="circle">org.apache.juneau.svl.<a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
 <ul>
-<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a></li>
+<li type="circle">org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ArgsVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ArgsVar</span></a></li>
+<li type="circle">org.apache.juneau.ini.vars.<a href="org/apache/juneau/ini/vars/ConfigFileVar.html" title="class in org.apache.juneau.ini.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
 <li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
 <li type="circle">org.apache.juneau.rest.vars.<a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">FileVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
+<li type="circle">org.apache.juneau.microservice.vars.<a href="org/apache/juneau/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
 <li type="circle">org.apache.juneau.svl.<a href="org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MapVar</span></a>
 <ul>
 <li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">SystemPropertiesVar</span></a></li>
diff --git a/content/site/apidocs/package-list b/content/site/apidocs/package-list
index c836888..cdca9bf 100644
--- a/content/site/apidocs/package-list
+++ b/content/site/apidocs/package-list
@@ -13,6 +13,7 @@ org.apache.juneau.html.annotation
 org.apache.juneau.http
 org.apache.juneau.httppart
 org.apache.juneau.ini
+org.apache.juneau.ini.vars
 org.apache.juneau.internal
 org.apache.juneau.jena
 org.apache.juneau.jena.annotation
@@ -23,6 +24,7 @@ org.apache.juneau.microservice
 org.apache.juneau.microservice.console
 org.apache.juneau.microservice.resources
 org.apache.juneau.microservice.sample
+org.apache.juneau.microservice.vars
 org.apache.juneau.msgpack
 org.apache.juneau.parser
 org.apache.juneau.plaintext
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
index a6306ec..a03271d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
@@ -31,796 +31,797 @@
 <span class="sourceLineNo">023</span>import java.util.concurrent.locks.*;<a name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.juneau.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.internal.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.json.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.parser.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.serializer.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.svl.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.svl.vars.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * Implementation class for {@link ConfigFile}.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>public final class ConfigFileImpl extends ConfigFile {<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>   private final File file;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>   private final Encoder encoder;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private final WriterSerializer serializer;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   private final ReaderParser parser;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>   private final BeanSession pBeanSession;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private final Charset charset;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   final List&lt;ConfigFileListener&gt; listeners = Collections.synchronizedList(new ArrayList&lt;ConfigFileListener&gt;());<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>   Map&lt;String,Section&gt; sections;  // The actual data.<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>   private static final String DEFAULT = "default";<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>   private final boolean readOnly;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>   volatile boolean hasBeenModified = false;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   private ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>   long modifiedTimestamp;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>   /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * Constructor.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * <a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * &lt;p&gt;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * Loads the contents of the specified file into this config file.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * <a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * &lt;p&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    * If file does not initially exist, this object will start off empty.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * <a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * @param file<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    *    The INI file on disk.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, create an in-memory config file.<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * @param readOnly<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    *    Make this configuration file read-only.<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    *    Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    * @param encoder<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    *    The encoder to use for encoding sensitive values in this configuration file.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link XorEncoder#INSTANCE}.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * @param serializer<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    *    The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link JsonSerializer#DEFAULT}.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * @param parser<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    *    The parser to use for parsing POJOs in the {@link #getObject(String,Class)} method.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link JsonParser#DEFAULT}.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    * @param charset<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    *    The charset on the files.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link Charset#defaultCharset()}.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    * @throws IOException<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    */<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   public ConfigFileImpl(File file, boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser,<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         Charset charset) throws IOException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      this.file = file;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      this.encoder = encoder == null ? XorEncoder.INSTANCE : encoder;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      this.serializer = serializer == null ? JsonSerializer.DEFAULT : serializer;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      this.parser = parser == null ? JsonParser.DEFAULT : parser;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      this.charset = charset == null ? Charset.defaultCharset() : charset;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      load();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      this.readOnly = readOnly;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      if (readOnly) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         this.sections = Collections.unmodifiableMap(this.sections);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         for (Section s : sections.values())<a name="line.97"></a>
-<span class="sourceLineNo">098</span>            s.setReadOnly();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      this.pBeanSession = this.parser.createSession();<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>   /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    * Constructor.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    * <a name="line.105"></a>
-<span class="sourceLineNo">106</span>    * &lt;p&gt;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    * Shortcut for calling &lt;code&gt;&lt;jk&gt;new&lt;/jk&gt; ConfigFileImpl(file, &lt;jk&gt;false&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;,<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    * &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;);&lt;/code&gt;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    * <a name="line.109"></a>
-<span class="sourceLineNo">110</span>    * @param file The config file.  Does not need to exist.<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    * @throws IOException<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    */<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   public ConfigFileImpl(File file) throws IOException {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      this(file, false, null, null, null, null);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>   /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * Constructor.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * <a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * &lt;p&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * Shortcut for calling &lt;code&gt;&lt;jk&gt;new&lt;/jk&gt; ConfigFileImpl(&lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;false&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;,<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;);&lt;/code&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * <a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @throws IOException<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   public ConfigFileImpl() throws IOException {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      this(null);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>   @Override /* ConfigFile */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   public ConfigFileImpl loadIfModified() throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      if (file == null)<a name="line.132"></a>
-<span class="sourceLineNo">133</span>         return this;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      writeLock();<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         if (file.lastModified() &gt; modifiedTimestamp)<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            load();<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      } finally {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>         writeUnlock();<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return this;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>   @Override /* ConfigFile */<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   public ConfigFileImpl load() throws IOException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      try (Reader r = FileReaderBuilder.create(file).charset(charset).allowNoFile().build()) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>         load(r);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      return this;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>   @Override /* ConfigFile */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   public ConfigFileImpl load(Reader r) throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      assertFieldNotNull(r, "r");<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      writeLock();<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      try {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>         this.sections = Collections.synchronizedMap(new LinkedHashMap&lt;String,Section&gt;());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>         try (BufferedReader in = new BufferedReader(r)) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            writeLock();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            hasBeenModified = false;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>            try {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>               sections.clear();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>               String line = null;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>               Section section = getSection(null, true);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>               ArrayList&lt;String&gt; lines = new ArrayList&lt;&gt;();<a name="line.165"></a>
-<span class="sourceLineNo">166</span>               boolean canAppend = false;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>               while ((line = in.readLine()) != null) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>                  if (isSection(line)) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>                     section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.169"></a>
-<span class="sourceLineNo">170</span>                     lines.clear();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                     canAppend = false;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>                     String sn = replaceUnicodeSequences(line.substring(line.indexOf('[')+1, line.indexOf(']')).trim());<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                     section = getSection(sn, true).addHeaderComments(section.removeTrailingComments());<a name="line.173"></a>
-<span class="sourceLineNo">174</span>                  } else {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                     char c = line.isEmpty() ? 0 : line.charAt(0);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                     if ((c == ' ' || c == '\t') &amp;&amp; canAppend &amp;&amp; ! (isComment(line) || isAssignment(line)))<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                        lines.add(lines.remove(lines.size()-1) + '\n' + line.substring(1));<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                     else {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                        lines.add(line);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>                        if (isAssignment(line))<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                           canAppend = true;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                        else<a name="line.182"></a>
-<span class="sourceLineNo">183</span>                           canAppend = canAppend &amp;&amp; ! (StringUtils.isEmpty(line) || isComment(line));<a name="line.183"></a>
-<span class="sourceLineNo">184</span>                     }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>                  }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>               }<a name="line.186"></a>
-<span class="sourceLineNo">187</span>               section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.187"></a>
-<span class="sourceLineNo">188</span>               in.close();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>               if (hasBeenModified)  // Set when values need to be encoded.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>                  save();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>               if (file != null)<a name="line.191"></a>
-<span class="sourceLineNo">192</span>                  modifiedTimestamp = file.lastModified();<a name="line.192"></a>
-<span class="sourceLineNo">193</span>            } finally {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>               writeUnlock();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      } finally {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>         writeUnlock();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      for (ConfigFileListener l : listeners)<a name="line.200"></a>
-<span class="sourceLineNo">201</span>         l.onLoad(this);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      return this;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>   @Override /* ConfigFile */<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   protected String serialize(Object value, Serializer serializer, boolean newline) throws SerializeException {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      if (value == null)<a name="line.207"></a>
-<span class="sourceLineNo">208</span>         return "";<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      if (serializer == null)<a name="line.209"></a>
-<span class="sourceLineNo">210</span>         serializer = this.serializer;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      Class&lt;?&gt; c = value.getClass();<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      if (isSimpleType(c))<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         return value.toString();<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>      String r = null;<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      if (newline)<a name="line.216"></a>
-<span class="sourceLineNo">217</span>         r = "\n" + (String)serializer.serialize(value);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      else<a name="line.218"></a>
-<span class="sourceLineNo">219</span>         r = (String)serializer.serialize(value);<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>      if (r.startsWith("'"))<a name="line.221"></a>
-<span class="sourceLineNo">222</span>         return r.substring(1, r.length()-1);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      return r;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>   @Override /* ConfigFile */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   @SuppressWarnings({ "unchecked" })<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   protected &lt;T&gt; T parse(String s, Parser parser, Type type, Type...args) throws ParseException {<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>      if (StringUtils.isEmpty(s))<a name="line.230"></a>
-<span class="sourceLineNo">231</span>         return null;<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>      if (isSimpleType(type))<a name="line.233"></a>
-<span class="sourceLineNo">234</span>         return (T)pBeanSession.convertToType(s, (Class&lt;?&gt;)type);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>      char s1 = firstNonWhitespaceChar(s);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      if (isArray(type) &amp;&amp; s1 != '[')<a name="line.237"></a>
-<span class="sourceLineNo">238</span>         s = '[' + s + ']';<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      else if (s1 != '[' &amp;&amp; s1 != '{' &amp;&amp; ! "null".equals(s))<a name="line.239"></a>
-<span class="sourceLineNo">240</span>         s = '\'' + s + '\'';<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>      if (parser == null)<a name="line.242"></a>
-<span class="sourceLineNo">243</span>         parser = this.parser;<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>      return parser.parse(s, type, args);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>   private static boolean isSimpleType(Type t) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      if (! (t instanceof Class))<a name="line.249"></a>
-<span class="sourceLineNo">250</span>         return false;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class || c.isEnum());<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>   private static boolean isArray(Type t) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      if (! (t instanceof Class))<a name="line.256"></a>
-<span class="sourceLineNo">257</span>         return false;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      return (c.isArray());<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.ini.vars.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.internal.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.json.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.parser.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.serializer.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.svl.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.juneau.svl.vars.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Implementation class for {@link ConfigFile}.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public final class ConfigFileImpl extends ConfigFile {<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>   private final File file;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   private final Encoder encoder;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   private final WriterSerializer serializer;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private final ReaderParser parser;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>   private final BeanSession pBeanSession;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   private final Charset charset;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   final List&lt;ConfigFileListener&gt; listeners = Collections.synchronizedList(new ArrayList&lt;ConfigFileListener&gt;());<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>   Map&lt;String,Section&gt; sections;  // The actual data.<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>   private static final String DEFAULT = "default";<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>   private final boolean readOnly;<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>   volatile boolean hasBeenModified = false;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   private ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>   long modifiedTimestamp;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>   /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * Constructor.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * <a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * &lt;p&gt;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * Loads the contents of the specified file into this config file.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * <a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * &lt;p&gt;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * If file does not initially exist, this object will start off empty.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    * <a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * @param file<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    *    The INI file on disk.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, create an in-memory config file.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    * @param readOnly<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    *    Make this configuration file read-only.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    *    Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    * @param encoder<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    *    The encoder to use for encoding sensitive values in this configuration file.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link XorEncoder#INSTANCE}.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * @param serializer<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    *    The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link JsonSerializer#DEFAULT}.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    * @param parser<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    *    The parser to use for parsing POJOs in the {@link #getObject(String,Class)} method.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link JsonParser#DEFAULT}.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    * @param charset<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    *    The charset on the files.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    *    If &lt;jk&gt;null&lt;/jk&gt;, defaults to {@link Charset#defaultCharset()}.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    * @throws IOException<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   public ConfigFileImpl(File file, boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser,<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         Charset charset) throws IOException {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      this.file = file;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      this.encoder = encoder == null ? XorEncoder.INSTANCE : encoder;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      this.serializer = serializer == null ? JsonSerializer.DEFAULT : serializer;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      this.parser = parser == null ? JsonParser.DEFAULT : parser;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      this.charset = charset == null ? Charset.defaultCharset() : charset;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      load();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      this.readOnly = readOnly;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      if (readOnly) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>         this.sections = Collections.unmodifiableMap(this.sections);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         for (Section s : sections.values())<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            s.setReadOnly();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      this.pBeanSession = this.parser.createSession();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>   /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * Constructor.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    * <a name="line.106"></a>
+<span class="sourceLineNo">107</span>    * &lt;p&gt;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    * Shortcut for calling &lt;code&gt;&lt;jk&gt;new&lt;/jk&gt; ConfigFileImpl(file, &lt;jk&gt;false&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;,<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;);&lt;/code&gt;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    * <a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @param file The config file.  Does not need to exist.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    * @throws IOException<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   public ConfigFileImpl(File file) throws IOException {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      this(file, false, null, null, null, null);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>   /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    * Constructor.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    * <a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * &lt;p&gt;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * Shortcut for calling &lt;code&gt;&lt;jk&gt;new&lt;/jk&gt; ConfigFileImpl(&lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;false&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;,<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;, &lt;jk&gt;null&lt;/jk&gt;);&lt;/code&gt;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * <a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @throws IOException<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    */<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   public ConfigFileImpl() throws IOException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      this(null);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>   @Override /* ConfigFile */<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   public ConfigFileImpl loadIfModified() throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (file == null)<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         return this;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      writeLock();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      try {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>         if (file.lastModified() &gt; modifiedTimestamp)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            load();<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      } finally {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         writeUnlock();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      return this;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>   @Override /* ConfigFile */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   public ConfigFileImpl load() throws IOException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      try (Reader r = FileReaderBuilder.create(file).charset(charset).allowNoFile().build()) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>         load(r);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return this;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>   @Override /* ConfigFile */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   public ConfigFileImpl load(Reader r) throws IOException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      assertFieldNotNull(r, "r");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      writeLock();<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      try {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>         this.sections = Collections.synchronizedMap(new LinkedHashMap&lt;String,Section&gt;());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>         try (BufferedReader in = new BufferedReader(r)) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            writeLock();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            hasBeenModified = false;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>            try {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>               sections.clear();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>               String line = null;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>               Section section = getSection(null, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>               ArrayList&lt;String&gt; lines = new ArrayList&lt;&gt;();<a name="line.166"></a>
+<span class="sourceLineNo">167</span>               boolean canAppend = false;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>               while ((line = in.readLine()) != null) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>                  if (isSection(line)) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>                     section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.170"></a>
+<span class="sourceLineNo">171</span>                     lines.clear();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                     canAppend = false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                     String sn = replaceUnicodeSequences(line.substring(line.indexOf('[')+1, line.indexOf(']')).trim());<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                     section = getSection(sn, true).addHeaderComments(section.removeTrailingComments());<a name="line.174"></a>
+<span class="sourceLineNo">175</span>                  } else {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                     char c = line.isEmpty() ? 0 : line.charAt(0);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                     if ((c == ' ' || c == '\t') &amp;&amp; canAppend &amp;&amp; ! (isComment(line) || isAssignment(line)))<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                        lines.add(lines.remove(lines.size()-1) + '\n' + line.substring(1));<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                     else {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>                        lines.add(line);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                        if (isAssignment(line))<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                           canAppend = true;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                        else<a name="line.183"></a>
+<span class="sourceLineNo">184</span>                           canAppend = canAppend &amp;&amp; ! (StringUtils.isEmpty(line) || isComment(line));<a name="line.184"></a>
+<span class="sourceLineNo">185</span>                     }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>                  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>               }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>               section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.188"></a>
+<span class="sourceLineNo">189</span>               in.close();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>               if (hasBeenModified)  // Set when values need to be encoded.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>                  save();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>               if (file != null)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>                  modifiedTimestamp = file.lastModified();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>            } finally {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>               writeUnlock();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>         }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      } finally {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         writeUnlock();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      for (ConfigFileListener l : listeners)<a name="line.201"></a>
+<span class="sourceLineNo">202</span>         l.onLoad(this);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      return this;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>   @Override /* ConfigFile */<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   protected String serialize(Object value, Serializer serializer, boolean newline) throws SerializeException {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      if (value == null)<a name="line.208"></a>
+<span class="sourceLineNo">209</span>         return "";<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      if (serializer == null)<a name="line.210"></a>
+<span class="sourceLineNo">211</span>         serializer = this.serializer;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      Class&lt;?&gt; c = value.getClass();<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      if (isSimpleType(c))<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         return value.toString();<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>      String r = null;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      if (newline)<a name="line.217"></a>
+<span class="sourceLineNo">218</span>         r = "\n" + (String)serializer.serialize(value);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      else<a name="line.219"></a>
+<span class="sourceLineNo">220</span>         r = (String)serializer.serialize(value);<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>      if (r.startsWith("'"))<a name="line.222"></a>
+<span class="sourceLineNo">223</span>         return r.substring(1, r.length()-1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return r;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>   @Override /* ConfigFile */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   @SuppressWarnings({ "unchecked" })<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   protected &lt;T&gt; T parse(String s, Parser parser, Type type, Type...args) throws ParseException {<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>      if (StringUtils.isEmpty(s))<a name="line.231"></a>
+<span class="sourceLineNo">232</span>         return null;<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>      if (isSimpleType(type))<a name="line.234"></a>
+<span class="sourceLineNo">235</span>         return (T)pBeanSession.convertToType(s, (Class&lt;?&gt;)type);<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>      char s1 = firstNonWhitespaceChar(s);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      if (isArray(type) &amp;&amp; s1 != '[')<a name="line.238"></a>
+<span class="sourceLineNo">239</span>         s = '[' + s + ']';<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      else if (s1 != '[' &amp;&amp; s1 != '{' &amp;&amp; ! "null".equals(s))<a name="line.240"></a>
+<span class="sourceLineNo">241</span>         s = '\'' + s + '\'';<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>      if (parser == null)<a name="line.243"></a>
+<span class="sourceLineNo">244</span>         parser = this.parser;<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>      return parser.parse(s, type, args);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>   private static boolean isSimpleType(Type t) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      if (! (t instanceof Class))<a name="line.250"></a>
+<span class="sourceLineNo">251</span>         return false;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class || c.isEnum());<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>   private static boolean isArray(Type t) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      if (! (t instanceof Class))<a name="line.257"></a>
+<span class="sourceLineNo">258</span>         return false;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      return (c.isArray());<a name="line.260"></a>
+<span class="sourceLineNo">261</span>   }<a name="line.261"></a>
 <span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>   //--------------------------------------------------------------------------------<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   // Map methods<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   //--------------------------------------------------------------------------------<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>   @Override /* Map */<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   public Section get(Object key) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      if (StringUtils.isEmpty(key))<a name="line.269"></a>
-<span class="sourceLineNo">270</span>         key = DEFAULT;<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      readLock();<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      try {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>         return sections.get(key);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      } finally {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>         readUnlock();<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      }<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>   @Override /* Map */<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   public Section put(String key, Section section) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      Set&lt;String&gt; changes = createChanges();<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      Section old = put(key, section, changes);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      signalChanges(changes);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return old;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>   private Section put(String key, Section section, Set&lt;String&gt; changes) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      if (StringUtils.isEmpty(key))<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         key = DEFAULT;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      writeLock();<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      try {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>         Section prev = sections.put(key, section);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>         findChanges(changes, prev, section);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>         return prev;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      } finally {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>         writeUnlock();<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>   }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>   @Override /* Map */<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      Set&lt;String&gt; changes = createChanges();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      writeLock();<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      try {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>         for (Map.Entry&lt;? extends String,? extends Section&gt; e : map.entrySet())<a name="line.305"></a>
-<span class="sourceLineNo">306</span>            put(e.getKey(), e.getValue(), changes);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      } finally {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>         writeUnlock();<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      signalChanges(changes);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>   @Override /* Map */<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   public void clear() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      Set&lt;String&gt; changes = createChanges();<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      writeLock();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      try {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>         for (Section s : values())<a name="line.318"></a>
-<span class="sourceLineNo">319</span>            findChanges(changes, s, null);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>         sections.clear();<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      } finally {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>         writeUnlock();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      signalChanges(changes);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>   @Override /* Map */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   public boolean containsKey(Object key) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      if (StringUtils.isEmpty(key))<a name="line.329"></a>
-<span class="sourceLineNo">330</span>         key = DEFAULT;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      return sections.containsKey(key);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>   @Override /* Map */<a name="line.334"></a>
-<span class="sourceLineNo">335</span>   public boolean containsValue(Object value) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      return sections.containsValue(value);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>   @Override /* Map */<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   public Set&lt;Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span>      // We need to create our own set so that entries are removed correctly.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      return new AbstractSet&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>         @Override /* Map */<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         public Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; iterator() {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>            return new Iterator&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>               Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; i = sections.entrySet().iterator();<a name="line.347"></a>
-<span class="sourceLineNo">348</span>               Map.Entry&lt;String,Section&gt; i2;<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>               @Override /* Iterator */<a name="line.350"></a>
-<span class="sourceLineNo">351</span>               public boolean hasNext() {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>                  return i.hasNext();<a name="line.352"></a>
-<span class="sourceLineNo">353</span>               }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>               @Override /* Iterator */<a name="line.355"></a>
-<span class="sourceLineNo">356</span>               public Map.Entry&lt;String,Section&gt; next() {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>                  i2 = i.next();<a name="line.357"></a>
-<span class="sourceLineNo">358</span>                  return i2;<a name="line.358"></a>
-<span class="sourceLineNo">359</span>               }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>               @Override /* Iterator */<a name="line.361"></a>
-<span class="sourceLineNo">362</span>               public void remove() {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.363"></a>
-<span class="sourceLineNo">364</span>                  findChanges(changes, i2.getValue(), null);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>                  i.remove();<a name="line.365"></a>
-<span class="sourceLineNo">366</span>                  signalChanges(changes);<a name="line.366"></a>
-<span class="sourceLineNo">367</span>               }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>            };<a name="line.368"></a>
-<span class="sourceLineNo">369</span>         }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>         @Override /* Map */<a name="line.371"></a>
-<span class="sourceLineNo">372</span>         public int size() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>            return sections.size();<a name="line.373"></a>
-<span class="sourceLineNo">374</span>         }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      };<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   }<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>   @Override /* Map */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   public boolean isEmpty() {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      return sections.isEmpty();<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>   @Override /* Map */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public Set&lt;String&gt; keySet() {<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span>      // We need to create our own set so that sections are removed correctly.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      return new AbstractSet&lt;String&gt;() {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>         @Override /* Set */<a name="line.388"></a>
-<span class="sourceLineNo">389</span>         public Iterator&lt;String&gt; iterator() {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>            return new Iterator&lt;String&gt;() {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>               Iterator&lt;String&gt; i = sections.keySet().iterator();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>               String i2;<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>               @Override /* Iterator */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>               public boolean hasNext() {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>                  return i.hasNext();<a name="line.396"></a>
-<span class="sourceLineNo">397</span>               }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>               @Override /* Iterator */<a name="line.399"></a>
-<span class="sourceLineNo">400</span>               public String next() {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>                  i2 = i.next();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>                  return i2;<a name="line.402"></a>
-<span class="sourceLineNo">403</span>               }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>               @Override /* Iterator */<a name="line.405"></a>
-<span class="sourceLineNo">406</span>               public void remove() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>                  findChanges(changes, sections.get(i2), null);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>                  i.remove();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>                  signalChanges(changes);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>               }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>            };<a name="line.412"></a>
-<span class="sourceLineNo">413</span>         }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>         @Override /* Set */<a name="line.415"></a>
-<span class="sourceLineNo">416</span>         public int size() {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            return sections.size();<a name="line.417"></a>
-<span class="sourceLineNo">418</span>         }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      };<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>   @Override /* Map */<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   public int size() {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>      return sections.size();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>   @Override /* Map */<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   public Collection&lt;Section&gt; values() {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      return new AbstractCollection&lt;Section&gt;() {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>         @Override /* Collection */<a name="line.430"></a>
-<span class="sourceLineNo">431</span>         public Iterator&lt;Section&gt; iterator() {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>            return new Iterator&lt;Section&gt;() {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>               Iterator&lt;Section&gt; i = sections.values().iterator();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>               Section i2;<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span>               @Override /* Iterator */<a name="line.436"></a>
-<span class="sourceLineNo">437</span>               public boolean hasNext() {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>                  return i.hasNext();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>               }<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span>               @Override /* Iterator */<a name="line.441"></a>
-<span class="sourceLineNo">442</span>               public Section next() {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>                  i2 = i.next();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>                  return i2;<a name="line.444"></a>
-<span class="sourceLineNo">445</span>               }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>               @Override /* Iterator */<a name="line.447"></a>
-<span class="sourceLineNo">448</span>               public void remove() {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>                  findChanges(changes, i2, null);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>                  i.remove();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>                  signalChanges(changes);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>               }<a name="line.453"></a>
-<span class="sourceLineNo">454</span>            };<a name="line.454"></a>
-<span class="sourceLineNo">455</span>         }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>         @Override /* Collection */<a name="line.456"></a>
-<span class="sourceLineNo">457</span>         public int size() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>            return sections.size();<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         }<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      };<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>   @Override /* Map */<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   public Section remove(Object key) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      Set&lt;String&gt; changes = createChanges();<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      Section prev = remove(key, changes);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      signalChanges(changes);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      return prev;<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span>   private Section remove(Object key, Set&lt;String&gt; changes) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      writeLock();<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      try {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>         Section prev = sections.remove(key);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>         findChanges(changes, prev, null);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>         return prev;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      } finally {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>         writeUnlock();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>   }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>   //--------------------------------------------------------------------------------<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   // Map methods<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   //--------------------------------------------------------------------------------<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>   @Override /* Map */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   public Section get(Object key) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      if (StringUtils.isEmpty(key))<a name="line.270"></a>
+<span class="sourceLineNo">271</span>         key = DEFAULT;<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      readLock();<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      try {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>         return sections.get(key);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      } finally {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>         readUnlock();<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>   @Override /* Map */<a name="line.280"></a>
+<span class="sourceLineNo">281</span>   public Section put(String key, Section section) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      Set&lt;String&gt; changes = createChanges();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      Section old = put(key, section, changes);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      signalChanges(changes);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      return old;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>   private Section put(String key, Section section, Set&lt;String&gt; changes) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      if (StringUtils.isEmpty(key))<a name="line.289"></a>
+<span class="sourceLineNo">290</span>         key = DEFAULT;<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      writeLock();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      try {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>         Section prev = sections.put(key, section);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>         findChanges(changes, prev, section);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>         return prev;<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      } finally {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         writeUnlock();<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>   @Override /* Map */<a name="line.301"></a>
+<span class="sourceLineNo">302</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      Set&lt;String&gt; changes = createChanges();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      writeLock();<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      try {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>         for (Map.Entry&lt;? extends String,? extends Section&gt; e : map.entrySet())<a name="line.306"></a>
+<span class="sourceLineNo">307</span>            put(e.getKey(), e.getValue(), changes);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      } finally {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>         writeUnlock();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      signalChanges(changes);<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>   @Override /* Map */<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   public void clear() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      Set&lt;String&gt; changes = createChanges();<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      writeLock();<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      try {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         for (Section s : values())<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            findChanges(changes, s, null);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>         sections.clear();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      } finally {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>         writeUnlock();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      }<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      signalChanges(changes);<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>   @Override /* Map */<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   public boolean containsKey(Object key) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      if (StringUtils.isEmpty(key))<a name="line.330"></a>
+<span class="sourceLineNo">331</span>         key = DEFAULT;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      return sections.containsKey(key);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>   @Override /* Map */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   public boolean containsValue(Object value) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      return sections.containsValue(value);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>   @Override /* Map */<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   public Set&lt;Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>      // We need to create our own set so that entries are removed correctly.<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      return new AbstractSet&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>         @Override /* Map */<a name="line.345"></a>
+<span class="sourceLineNo">346</span>         public Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; iterator() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>            return new Iterator&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>               Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; i = sections.entrySet().iterator();<a name="line.348"></a>
+<span class="sourceLineNo">349</span>               Map.Entry&lt;String,Section&gt; i2;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>               @Override /* Iterator */<a name="line.351"></a>
+<span class="sourceLineNo">352</span>               public boolean hasNext() {<a name="line.352"></a>
+<span class="sourceLineNo">353</span>                  return i.hasNext();<a name="line.353"></a>
+<span class="sourceLineNo">354</span>               }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>               @Override /* Iterator */<a name="line.356"></a>
+<span class="sourceLineNo">357</span>               public Map.Entry&lt;String,Section&gt; next() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>                  i2 = i.next();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>                  return i2;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>               }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>               @Override /* Iterator */<a name="line.362"></a>
+<span class="sourceLineNo">363</span>               public void remove() {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                  findChanges(changes, i2.getValue(), null);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>                  i.remove();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>                  signalChanges(changes);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>               }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>            };<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>         @Override /* Map */<a name="line.372"></a>
+<span class="sourceLineNo">373</span>         public int size() {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>            return sections.size();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>         }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      };<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>   @Override /* Map */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   public boolean isEmpty() {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      return sections.isEmpty();<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>   @Override /* Map */<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   public Set&lt;String&gt; keySet() {<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>      // We need to create our own set so that sections are removed correctly.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      return new AbstractSet&lt;String&gt;() {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>         @Override /* Set */<a name="line.389"></a>
+<span class="sourceLineNo">390</span>         public Iterator&lt;String&gt; iterator() {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>            return new Iterator&lt;String&gt;() {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>               Iterator&lt;String&gt; i = sections.keySet().iterator();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>               String i2;<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>               @Override /* Iterator */<a name="line.395"></a>
+<span class="sourceLineNo">396</span>               public boolean hasNext() {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>                  return i.hasNext();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>               }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>               @Override /* Iterator */<a name="line.400"></a>
+<span class="sourceLineNo">401</span>               public String next() {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>                  i2 = i.next();<a name="line.402"></a>
+<span class="sourceLineNo">403</span>                  return i2;<a name="line.403"></a>
+<span class="sourceLineNo">404</span>               }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>               @Override /* Iterator */<a name="line.406"></a>
+<span class="sourceLineNo">407</span>               public void remove() {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>                  findChanges(changes, sections.get(i2), null);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>                  i.remove();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>                  signalChanges(changes);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>               }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>            };<a name="line.413"></a>
+<span class="sourceLineNo">414</span>         }<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>         @Override /* Set */<a name="line.416"></a>
+<span class="sourceLineNo">417</span>         public int size() {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>            return sections.size();<a name="line.418"></a>
+<span class="sourceLineNo">419</span>         }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      };<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>   @Override /* Map */<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   public int size() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      return sections.size();<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>   @Override /* Map */<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   public Collection&lt;Section&gt; values() {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new AbstractCollection&lt;Section&gt;() {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         @Override /* Collection */<a name="line.431"></a>
+<span class="sourceLineNo">432</span>         public Iterator&lt;Section&gt; iterator() {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>            return new Iterator&lt;Section&gt;() {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>               Iterator&lt;Section&gt; i = sections.values().iterator();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>               Section i2;<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>               @Override /* Iterator */<a name="line.437"></a>
+<span class="sourceLineNo">438</span>               public boolean hasNext() {<a name="line.438"></a>
+<span class="sourceLineNo">439</span>                  return i.hasNext();<a name="line.439"></a>
+<span class="sourceLineNo">440</span>               }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>               @Override /* Iterator */<a name="line.442"></a>
+<span class="sourceLineNo">443</span>               public Section next() {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>                  i2 = i.next();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>                  return i2;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>               }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>               @Override /* Iterator */<a name="line.448"></a>
+<span class="sourceLineNo">449</span>               public void remove() {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.450"></a>
+<span class="sourceLineNo">451</span>                  findChanges(changes, i2, null);<a name="line.451"></a>
+<span class="sourceLineNo">452</span>                  i.remove();<a name="line.452"></a>
+<span class="sourceLineNo">453</span>                  signalChanges(changes);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>               }<a name="line.454"></a>
+<span class="sourceLineNo">455</span>            };<a name="line.455"></a>
+<span class="sourceLineNo">456</span>         }<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         @Override /* Collection */<a name="line.457"></a>
+<span class="sourceLineNo">458</span>         public int size() {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            return sections.size();<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      };<a name="line.461"></a>
+<span class="sourceLineNo">462</span>   }<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span>   @Override /* Map */<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   public Section remove(Object key) {<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      Set&lt;String&gt; changes = createChanges();<a name="line.466"></a>
+<span class="sourceLineNo">467</span>      Section prev = remove(key, changes);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      signalChanges(changes);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      return prev;<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   }<a name="line.470"></a>
+<span class="sourceLineNo">471</span><a name="line.471"></a>
+<span class="sourceLineNo">472</span>   private Section remove(Object key, Set&lt;String&gt; changes) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      writeLock();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>      try {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>         Section prev = sections.remove(key);<a name="line.475"></a>
+<span class="sourceLineNo">476</span>         findChanges(changes, prev, null);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>         return prev;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>      } finally {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>         writeUnlock();<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      }<a name="line.480"></a>
+<span class="sourceLineNo">481</span>   }<a name="line.481"></a>
 <span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>   //--------------------------------------------------------------------------------<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   // API methods<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   //--------------------------------------------------------------------------------<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>   @Override /* ConfigFile */<a name="line.487"></a>
-<span class="sourceLineNo">488</span>   public String get(String sectionName, String sectionKey) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      Section s = get(sectionName);<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (s == null)<a name="line.491"></a>
-<span class="sourceLineNo">492</span>         return null;<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      Object s2 = s.get(sectionKey);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      return (s2 == null ? null : s2.toString());<a name="line.494"></a>
-<span class="sourceLineNo">495</span>   }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span>   @Override /* ConfigFile */<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.498"></a>
-<span class="sourceLineNo">499</span>         boolean newline) throws SerializeException {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.500"></a>
-<span class="sourceLineNo">501</span>      Section s = getSection(sectionName, true);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      return s.put(sectionKey, serialize(value, serializer, newline), encoded);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>   @Override /* ConfigFile */<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      Section s = getSection(sectionName, true);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      return s.put(sectionKey, value, encoded);<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>   @Override /* ConfigFile */<a name="line.512"></a>
-<span class="sourceLineNo">513</span>   public String remove(String sectionName, String sectionKey) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      Section s = getSection(sectionName, false);<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      if (s == null)<a name="line.516"></a>
-<span class="sourceLineNo">517</span>         return null;<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      return s.remove(sectionKey);<a name="line.518"></a>
-<span class="sourceLineNo">519</span>   }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>   @Override /* ConfigFile */<a name="line.521"></a>
-<span class="sourceLineNo">522</span>   public ConfigFileImpl addLines(String section, String...lines) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      Set&lt;String&gt; changes = createChanges();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      writeLock();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      try {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>         getSection(section, true).addLines(changes, lines);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      } finally {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>         writeUnlock();<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      signalChanges(changes);<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      return this;<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   }<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span>   @Override /* ConfigFile */<a name="line.534"></a>
-<span class="sourceLineNo">535</span>   public ConfigFileImpl addHeaderComments(String section, String...headerComments) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      writeLock();<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      try {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>         if (headerComments == null)<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            headerComments = new String[0];<a name="line.539"></a>
-<span class="sourceLineNo">540</span>         getSection(section, true).addHeaderComments(Arrays.asList(headerComments));<a name="line.540"></a>
-<span class="sourceLineNo">541</span>      } finally {<a name="line.541"></a>
-<span class="sourceLineNo">542</span>         writeUnlock();<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      return this;<a name="line.544"></a>
-<span class="sourceLineNo">545</span>   }<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>   @Override /* ConfigFile */<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   public ConfigFileImpl clearHeaderComments(String section) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      writeLock();<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      try {<a name="line.550"></a>
-<span class="sourceLineNo">551</span>         Section s = getSection(section, false);<a name="line.551"></a>
-<span class="sourceLineNo">552</span>         if (s != null)<a name="line.552"></a>
-<span class="sourceLineNo">553</span>            s.clearHeaderComments();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      } finally {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>         writeUnlock();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>      }<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      return this;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span>   @Override /* ConfigFile */<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   public Section getSection(String name) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      return getSection(name, false);<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   }<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span>   @Override /* ConfigFile */<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   public Section getSection(String name, boolean create) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      if (StringUtils.isEmpty(name))<a name="line.567"></a>
-<span class="sourceLineNo">568</span>         name = DEFAULT;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      Section s = sections.get(name);<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      if (s != null)<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         return s;<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      if (create) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>         s = new Section().setParent(this).setName(name);<a name="line.573"></a>
-<span class="sourceLineNo">574</span>         sections.put(name, s);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>         return s;<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      }<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      return null;<a name="line.577"></a>
-<span class="sourceLineNo">578</span>   }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span>   @Override /* ConfigFile */<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   public ConfigFileImpl addSection(String name) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      writeLock();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      try {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>         getSection(name, true);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      } finally {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>         writeUnlock();<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      }<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      return this;<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   }<a name="line.589"></a>
-<span class="sourceLineNo">590</span><a name="line.590"></a>
-<span class="sourceLineNo">591</span>   @Override /* ConfigFile */<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      writeLock();<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      try {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>         put(name, new Section(contents).setParent(this).setName(name));<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      } finally {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>         writeUnlock();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      return this;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   }<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span>   @Override /* ConfigFile */<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   public ConfigFileImpl removeSection(String name) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      Set&lt;String&gt; changes = createChanges();<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      writeLock();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      try {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>         Section prev = sections.remove(name);<a name="line.607"></a>
-<span class="sourceLineNo">608</span>         if (changes != null &amp;&amp; prev != null)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>            findChanges(changes, prev, null);<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      } finally {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>         writeUnlock();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      signalChanges(changes);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      return this;<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span>   @Override /* ConfigFile */<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      Section s = get(sectionName);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      if (s == null)<a name="line.620"></a>
-<span class="sourceLineNo">621</span>         return null;<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      return s.keySet();<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>   @Override /* ConfigFile */<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   public boolean isEncoded(String key) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      assertFieldNotNull(key, "key");<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      String section = getSectionName(key);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      Section s = getSection(section, false);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      if (s == null)<a name="line.630"></a>
-<span class="sourceLineNo">631</span>         return false;<a name="line.631"></a>
-<span class="sourceLineNo">632</span>      return s.isEncoded(getSectionKey(key));<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   }<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span>   @Override /* ConfigFile */<a name="line.635"></a>
-<span class="sourceLineNo">636</span>   public ConfigFileImpl save() throws IOException {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      writeLock();<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      try {<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         if (file == null)<a name="line.639"></a>
-<span class="sourceLineNo">640</span>            throw new UnsupportedOperationException("No backing file specified for config file.");<a name="line.640"></a>
-<span class="sourceLineNo">641</span>         try (Writer out = FileWriterBuilder.create(file).charset(charset).build()) {<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            serializeTo(out);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            hasBeenModified = false;<a name="line.643"></a>
-<span class="sourceLineNo">644</span>            modifiedTimestamp = file.lastModified();<a name="line.644"></a>
-<span class="sourceLineNo">645</span>         }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>         for (ConfigFileListener l : listeners)<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            l.onSave(this);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>         return this;<a name="line.648"></a>
-<span class="sourceLineNo">649</span>      } finally {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>         writeUnlock();<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      }<a name="line.651"></a>
-<span class="sourceLineNo">652</span>   }<a name="line.652"></a>
-<span class="sourceLineNo">653</span><a name="line.653"></a>
-<span class="sourceLineNo">654</span>   @Override /* ConfigFile */<a name="line.654"></a>
-<span class="sourceLineNo">655</span>   public ConfigFileImpl serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.655"></a>
-<span class="sourceLineNo">656</span>      readLock();<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      try {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>         PrintWriter pw = (out instanceof PrintWriter ? (PrintWriter)out : new PrintWriter(out));<a name="line.658"></a>
-<span class="sourceLineNo">659</span>         for (Section s : sections.values())<a name="line.659"></a>
-<span class="sourceLineNo">660</span>            s.writeTo(pw, format);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>         pw.flush();<a name="line.661"></a>
-<span class="sourceLineNo">662</span>         pw.close();<a name="line.662"></a>
-<span class="sourceLineNo">663</span>         out.close();<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      } finally {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>         readUnlock();<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      }<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      return this;<a name="line.667"></a>
-<span class="sourceLineNo">668</span>   }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span>   void setHasBeenModified() {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      hasBeenModified = true;<a name="line.671"></a>
-<span class="sourceLineNo">672</span>   }<a name="line.672"></a>
-<span class="sourceLineNo">673</span><a name="line.673"></a>
-<span class="sourceLineNo">674</span>   @Override /* ConfigFile */<a name="line.674"></a>
-<span class="sourceLineNo">675</span>   public String toString() {<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      try {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>         StringWriter sw = new StringWriter();<a name="line.677"></a>
-<span class="sourceLineNo">678</span>         toWritable().writeTo(sw);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>         return sw.toString();<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      } catch (IOException e) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span>         return e.getLocalizedMessage();<a name="line.681"></a>
-<span class="sourceLineNo">682</span>      }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>   }<a name="line.683"></a>
-<span class="sourceLineNo">684</span><a name="line.684"></a>
-<span class="sourceLineNo">685</span>   @Override /* ConfigFile */<a name="line.685"></a>
-<span class="sourceLineNo">686</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      assertFieldNotNull(listener, "listener");<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      writeLock();<a name="line.688"></a>
-<span class="sourceLineNo">689</span>      try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span>         this.listeners.add(listener);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>         return this;<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      } finally {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>         writeUnlock();<a name="line.693"></a>
-<span class="sourceLineNo">694</span>      }<a name="line.694"></a>
-<span class="sourceLineNo">695</span>   }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span>   List&lt;ConfigFileListener&gt; getListeners() {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      return listeners;<a name="line.698"></a>
-<span class="sourceLineNo">699</span>   }<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span>   @Override /* ConfigFile */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>   public Writable toWritable() {<a name="line.702"></a>
-<span class="sourceLineNo">703</span>      return new ConfigFileWritable(this);<a name="line.703"></a>
-<span class="sourceLineNo">704</span>   }<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span>   @Override /* ConfigFile */<a name="line.706"></a>
-<span class="sourceLineNo">707</span>   public ConfigFile merge(ConfigFile cf) {<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      assertFieldNotNull(cf, "cf");<a name="line.708"></a>
-<span class="sourceLineNo">709</span>      Set&lt;String&gt; changes = createChanges();<a name="line.709"></a>
-<span class="sourceLineNo">710</span>      writeLock();<a name="line.710"></a>
-<span class="sourceLineNo">711</span>      try {<a name="line.711"></a>
-<span class="sourceLineNo">712</span>         for (String sectionName : this.keySet())<a name="line.712"></a>
-<span class="sourceLineNo">713</span>            if (! cf.containsKey(sectionName))<a name="line.713"></a>
-<span class="sourceLineNo">714</span>               remove(sectionName, changes);<a name="line.714"></a>
-<span class="sourceLineNo">715</span><a name="line.715"></a>
-<span class="sourceLineNo">716</span>         for (Map.Entry&lt;String,Section&gt; e : cf.entrySet())<a name="line.716"></a>
-<span class="sourceLineNo">717</span>            put(e.getKey(), e.getValue(), changes);<a name="line.717"></a>
-<span class="sourceLineNo">718</span><a name="line.718"></a>
-<span class="sourceLineNo">719</span>      } finally {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>         writeUnlock();<a name="line.720"></a>
-<span class="sourceLineNo">721</span>      }<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      signalChanges(changes);<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      return this;<a name="line.723"></a>
-<span class="sourceLineNo">724</span>   }<a name="line.724"></a>
-<span class="sourceLineNo">725</span><a name="line.725"></a>
-<span class="sourceLineNo">726</span>   Encoder getEncoder() {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      return encoder;<a name="line.727"></a>
-<span class="sourceLineNo">728</span>   }<a name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span>   @Override /* ConfigFile */<a name="line.730"></a>
-<span class="sourceLineNo">731</span>   protected BeanSession getBeanSession() {<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      return pBeanSession;<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   }<a name="line.733"></a>
-<span class="sourceLineNo">734</span><a name="line.734"></a>
-<span class="sourceLineNo">735</span>   @Override /* ConfigFile */<a name="line.735"></a>
-<span class="sourceLineNo">736</span>   protected void readLock() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      lock.readLock().lock();<a name="line.737"></a>
-<span class="sourceLineNo">738</span>   }<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>   @Override /* ConfigFile */<a name="line.740"></a>
-<span class="sourceLineNo">741</span>   protected void readUnlock() {<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      lock.readLock().unlock();<a name="line.742"></a>
-<span class="sourceLineNo">743</span>   }<a name="line.743"></a>
-<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span>   private void writeLock() {<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      if (readOnly)<a name="line.746"></a>
-<span class="sourceLineNo">747</span>         throw new UnsupportedOperationException("Cannot modify read-only ConfigFile.");<a name="line.747"></a>
-<span class="sourceLineNo">748</span>      lock.writeLock().lock();<a name="line.748"></a>
-<span class="sourceLineNo">749</span>      hasBeenModified = true;<a name="line.749"></a>
-<span class="sourceLineNo">750</span>   }<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>   private void writeUnlock() {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      lock.writeLock().unlock();<a name="line.753"></a>
-<span class="sourceLineNo">754</span>   }<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
-<span class="sourceLineNo">756</span>   @Override /* ConfigFile */<a name="line.756"></a>
-<span class="sourceLineNo">757</span>   public ConfigFile getResolving(VarResolver vr) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      assertFieldNotNull(vr, "vr");<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      return new ConfigFileWrapped(this, vr);<a name="line.759"></a>
-<span class="sourceLineNo">760</span>   }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span>   @Override /* ConfigFile */<a name="line.762"></a>
-<span class="sourceLineNo">763</span>   public ConfigFile getResolving(VarResolverSession vs) {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      assertFieldNotNull(vs, "vs");<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      return new ConfigFileWrapped(this, vs);<a name="line.765"></a>
-<span class="sourceLineNo">766</span>   }<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span>   @Override /* ConfigFile */<a name="line.768"></a>
-<span class="sourceLineNo">769</span>   public ConfigFile getResolving() {<a name="line.769"></a>
-<span class="sourceLineNo">770</span>      return getResolving(<a name="line.770"></a>
-<span class="sourceLineNo">771</span>         new VarResolverBuilder()<a name="line.771"></a>
-<span class="sourceLineNo">772</span>            .vars(SystemPropertiesVar.class, EnvVariablesVar.class, SwitchVar.class, IfVar.class, ConfigFileVar.class,<a name="line.772"></a>
-<span class="sourceLineNo">773</span>               IfVar.class, SwitchVar.class)<a name="line.773"></a>
-<span class="sourceLineNo">774</span>            .contextObject(ConfigFileVar.SESSION_config, this)<a name="line.774"></a>
-<span class="sourceLineNo">775</span>            .build()<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      );<a name="line.776"></a>
-<span class="sourceLineNo">777</span>   }<a name="line.777"></a>
-<span class="sourceLineNo">778</span><a name="line.778"></a>
-<span class="sourceLineNo">779</span>   /*<a name="line.779"></a>
-<span class="sourceLineNo">780</span>    * Finds the keys that are different between the two sections and adds it to<a name="line.780"></a>
-<span class="sourceLineNo">781</span>    * the specified set.<a name="line.781"></a>
-<span class="sourceLineNo">782</span>    */<a name="line.782"></a>
-<span class="sourceLineNo">783</span>   static final void findChanges(Set&lt;String&gt; s, Section a, Section b) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      if (s == null)<a name="line.784"></a>
-<span class="sourceLineNo">785</span>         return;<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      String sname = (a == null ? b.name : a.name);<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      if (a == null) {<a name="line.787"></a>
-<span class="sourceLineNo">788</span>         for (String k : b.keySet())<a name="line.788"></a>
-<span class="sourceLineNo">789</span>            s.add(getFullKey(sname, k));<a name="line.789"></a>
-<span class="sourceLineNo">790</span>      } else if (b == null) {<a name="line.790"></a>
-<span class="sourceLineNo">791</span>         for (String k : a.keySet())<a name="line.791"></a>
-<span class="sourceLineNo">792</span>            s.add(getFullKey(sname, k));<a name="line.792"></a>
-<span class="sourceLineNo">793</span>      } else {<a name="line.793"></a>
-<span class="sourceLineNo">794</span>         for (String k : a.keySet())<a name="line.794"></a>
-<span class="sourceLineNo">795</span>            addChange(s, sname, k, a.get(k), b.get(k));<a name="line.795"></a>
-<span class="sourceLineNo">796</span>         for (String k : b.keySet())<a name="line.796"></a>
-<span class="sourceLineNo">797</span>            addChange(s, sname, k, a.get(k), b.get(k));<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      }<a name="line.798"></a>
-<span class="sourceLineNo">799</span>   }<a name="line.799"></a>
-<span class="sourceLineNo">800</span><a name="line.800"></a>
-<span class="sourceLineNo">801</span>   static final void addChange(Set&lt;String&gt; changes, String section, String key, String oldVal, String newVal) {<a name="line.801"></a>
-<span class="sourceLineNo">802</span>      if (! isEquals(oldVal, newVal))<a name="line.802"></a>
-<span class="sourceLineNo">803</span>         changes.add(getFullKey(section, key));<a name="line.803"></a>
-<span class="sourceLineNo">804</span>   }<a name="line.804"></a>
-<span class="sourceLineNo">805</span><a name="line.805"></a>
-<span class="sourceLineNo">806</span>   final Set&lt;String&gt; createChanges() {<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      return (listeners.size() &gt; 0 ? new LinkedHashSet&lt;String&gt;() : null);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>   }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>   final void signalChanges(Set&lt;String&gt; changes) {<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      if (changes != null &amp;&amp; ! changes.isEmpty())<a name="line.811"></a>
-<span class="sourceLineNo">812</span>         for (ConfigFileListener l : listeners)<a name="line.812"></a>
-<span class="sourceLineNo">813</span>            l.onChange(this, changes);<a name="line.813"></a>
-<span class="sourceLineNo">814</span>   }<a name="line.814"></a>
-<span class="sourceLineNo">815</span>}<a name="line.815"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>   //--------------------------------------------------------------------------------<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   // API methods<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   //--------------------------------------------------------------------------------<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>   @Override /* ConfigFile */<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   public String get(String sectionName, String sectionKey) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      Section s = get(sectionName);<a name="line.491"></a>
+<span class="sourceLineNo">492</span>      if (s == null)<a name="line.492"></a>
+<span class="sourceLineNo">493</span>         return null;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      Object s2 = s.get(sectionKey);<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      return (s2 == null ? null : s2.toString());<a name="line.495"></a>
+<span class="sourceLineNo">496</span>   }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>   @Override /* ConfigFile */<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.499"></a>
+<span class="sourceLineNo">500</span>         boolean newline) throws SerializeException {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      Section s = getSection(sectionName, true);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      return s.put(sectionKey, serialize(value, serializer, newline), encoded);<a name="line.503"></a>
+<span class="sourceLineNo">504</span>   }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span>   @Override /* ConfigFile */<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      Section s = getSection(sectionName, true);<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      return s.put(sectionKey, value, encoded);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>   @Override /* ConfigFile */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   public String remove(String sectionName, String sectionKey) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.515"></a>
+<span class="sourceLineNo">516</span>      Section s = getSection(sectionName, false);<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      if (s == null)<a name="line.517"></a>
+<span class="sourceLineNo">518</span>         return null;<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      return s.remove(sectionKey);<a name="line.519"></a>
+<span class="sourceLineNo">520</span>   }<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span>   @Override /* ConfigFile */<a name="line.522"></a>
+<span class="sourceLineNo">523</span>   public ConfigFileImpl addLines(String section, String...lines) {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      Set&lt;String&gt; changes = createChanges();<a name="line.524"></a>
+<span class="sourceLineNo">525</span>      writeLock();<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      try {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>         getSection(section, true).addLines(changes, lines);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      } finally {<a name="line.528"></a>
+<span class="sourceLineNo">529</span>         writeUnlock();<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      }<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      signalChanges(changes);<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      return this;<a name="line.532"></a>
+<span class="sourceLineNo">533</span>   }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span>   @Override /* ConfigFile */<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   public ConfigFileImpl addHeaderComments(String section, String...headerComments) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>      writeLock();<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      try {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>         if (headerComments == null)<a name="line.539"></a>
+<span class="sourceLineNo">540</span>            headerComments = new String[0];<a name="line.540"></a>
+<span class="sourceLineNo">541</span>         getSection(section, true).addHeaderComments(Arrays.asList(headerComments));<a name="line.541"></a>
+<span class="sourceLineNo">542</span>      } finally {<a name="line.542"></a>
+<span class="sourceLineNo">543</span>         writeUnlock();<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      }<a name="line.544"></a>
+<span class="sourceLineNo">545</span>      return this;<a name="line.545"></a>
+<span class="sourceLineNo">546</span>   }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span>   @Override /* ConfigFile */<a name="line.548"></a>
+<span class="sourceLineNo">549</span>   public ConfigFileImpl clearHeaderComments(String section) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      writeLock();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      try {<a name="line.551"></a>
+<span class="sourceLineNo">552</span>         Section s = getSection(section, false);<a name="line.552"></a>
+<span class="sourceLineNo">553</span>         if (s != null)<a name="line.553"></a>
+<span class="sourceLineNo">554</span>            s.clearHeaderComments();<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      } finally {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>         writeUnlock();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>      }<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      return this;<a name="line.558"></a>
+<span class="sourceLineNo">559</span>   }<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span>   @Override /* ConfigFile */<a name="line.561"></a>
+<span class="sourceLineNo">562</span>   public Section getSection(String name) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      return getSection(name, false);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>   }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span>   @Override /* ConfigFile */<a name="line.566"></a>
+<span class="sourceLineNo">567</span>   public Section getSection(String name, boolean create) {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      if (StringUtils.isEmpty(name))<a name="line.568"></a>
+<span class="sourceLineNo">569</span>         name = DEFAULT;<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      Section s = sections.get(name);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      if (s != null)<a name="line.571"></a>
+<span class="sourceLineNo">572</span>         return s;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>      if (create) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>         s = new Section().setParent(this).setName(name);<a name="line.574"></a>
+<span class="sourceLineNo">575</span>         sections.put(name, s);<a name="line.575"></a>
+<span class="sourceLineNo">576</span>         return s;<a name="line.576"></a>
+<span class="sourceLineNo">577</span>      }<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      return null;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>   }<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span>   @Override /* ConfigFile */<a name="line.581"></a>
+<span class="sourceLineNo">582</span>   public ConfigFileImpl addSection(String name) {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      writeLock();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      try {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>         getSection(name, true);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>      } finally {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>         writeUnlock();<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>      return this;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>   }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>   @Override /* ConfigFile */<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      writeLock();<a name="line.594"></a>
+<span class="sourceLineNo">595</span>      try {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>         put(name, new Section(contents).setParent(this).setName(name));<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      } finally {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>         writeUnlock();<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      }<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      return this;<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   }<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span>   @Override /* ConfigFile */<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   public ConfigFileImpl removeSection(String name) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      Set&lt;String&gt; changes = createChanges();<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      writeLock();<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      try {<a name="line.607"></a>
+<span class="sourceLineNo">608</span>         Section prev = sections.remove(name);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>         if (changes != null &amp;&amp; prev != null)<a name="line.609"></a>
+<span class="sourceLineNo">610</span>            findChanges(changes, prev, null);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      } finally {<a name="line.611"></a>
+<span class="sourceLineNo">612</span>         writeUnlock();<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      }<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      signalChanges(changes);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      return this;<a name="line.615"></a>
+<span class="sourceLineNo">616</span>   }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span>   @Override /* ConfigFile */<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      Section s = get(sectionName);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>      if (s == null)<a name="line.621"></a>
+<span class="sourceLineNo">622</span>         return null;<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      return s.keySet();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   }<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>   @Override /* ConfigFile */<a name="line.626"></a>
+<span class="sourceLineNo">627</span>   public boolean isEncoded(String key) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      assertFieldNotNull(key, "key");<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      String section = getSectionName(key);<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      Section s = getSection(section, false);<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      if (s == null)<a name="line.631"></a>
+<span class="sourceLineNo">632</span>         return false;<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      return s.isEncoded(getSectionKey(key));<a name="line.633"></a>
+<span class="sourceLineNo">634</span>   }<a name="line.634"></a>
+<span class="sourceLineNo">635</span><a name="line.635"></a>
+<span class="sourceLineNo">636</span>   @Override /* ConfigFile */<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   public ConfigFileImpl save() throws IOException {<a name="line.637"></a>
+<span class="sourceLineNo">638</span>      writeLock();<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      try {<a name="line.639"></a>
+<span class="sourceLineNo">640</span>         if (file == null)<a name="line.640"></a>
+<span class="sourceLineNo">641</span>            throw new UnsupportedOperationException("No backing file specified for config file.");<a name="line.641"></a>
+<span class="sourceLineNo">642</span>         try (Writer out = FileWriterBuilder.create(file).charset(charset).build()) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            serializeTo(out);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>            hasBeenModified = false;<a name="line.644"></a>
+<span class="sourceLineNo">645</span>            modifiedTimestamp = file.lastModified();<a name="line.645"></a>
+<span class="sourceLineNo">646</span>         }<a name="line.646"></a>
+<span class="sourceLineNo">647</span>         for (ConfigFileListener l : listeners)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>            l.onSave(this);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>         return this;<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      } finally {<a name="line.650"></a>
+<span class="sourceLineNo">651</span>         writeUnlock();<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      }<a name="line.652"></a>
+<span class="sourceLineNo">653</span>   }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span>   @Override /* ConfigFile */<a name="line.655"></a>
+<span class="sourceLineNo">656</span>   public ConfigFileImpl serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      readLock();<a name="line.657"></a>
+<span class="sourceLineNo">658</span>      try {<a name="line.658"></a>
+<span class="sourceLineNo">659</span>         PrintWriter pw = (out instanceof PrintWriter ? (PrintWriter)out : new PrintWriter(out));<a name="line.659"></a>
+<span class="sourceLineNo">660</span>         for (Section s : sections.values())<a name="line.660"></a>
+<span class="sourceLineNo">661</span>            s.writeTo(pw, format);<a name="line.661"></a>
+<span class="sourceLineNo">662</span>         pw.flush();<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         pw.close();<a name="line.663"></a>
+<span class="sourceLineNo">664</span>         out.close();<a name="line.664"></a>
+<span class="sourceLineNo">665</span>      } finally {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>         readUnlock();<a name="line.666"></a>
+<span class="sourceLineNo">667</span>      }<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      return this;<a name="line.668"></a>
+<span class="sourceLineNo">669</span>   }<a name="line.669"></a>
+<span class="sourceLineNo">670</span><a name="line.670"></a>
+<span class="sourceLineNo">671</span>   void setHasBeenModified() {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      hasBeenModified = true;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>   }<a name="line.673"></a>
+<span class="sourceLineNo">674</span><a name="line.674"></a>
+<span class="sourceLineNo">675</span>   @Override /* ConfigFile */<a name="line.675"></a>
+<span class="sourceLineNo">676</span>   public String toString() {<a name="line.676"></a>
+<span class="sourceLineNo">677</span>      try {<a name="line.677"></a>
+<span class="sourceLineNo">678</span>         StringWriter sw = new StringWriter();<a name="line.678"></a>
+<span class="sourceLineNo">679</span>         toWritable().writeTo(sw);<a name="line.679"></a>
+<span class="sourceLineNo">680</span>         return sw.toString();<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      } catch (IOException e) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span>         return e.getLocalizedMessage();<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      }<a name="line.683"></a>
+<span class="sourceLineNo">684</span>   }<a name="line.684"></a>
+<span class="sourceLineNo">685</span><a name="line.685"></a>
+<span class="sourceLineNo">686</span>   @Override /* ConfigFile */<a name="line.686"></a>
+<span class="sourceLineNo">687</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      assertFieldNotNull(listener, "listener");<a name="line.688"></a>
+<span class="sourceLineNo">689</span>      writeLock();<a name="line.689"></a>
+<span class="sourceLineNo">690</span>      try {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>         this.listeners.add(listener);<a name="line.691"></a>
+<span class="sourceLineNo">692</span>         return this;<a name="line.692"></a>
+<span class="sourceLineNo">693</span>      } finally {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>         writeUnlock();<a name="line.694"></a>
+<span class="sourceLineNo">695</span>      }<a name="line.695"></a>
+<span class="sourceLineNo">696</span>   }<a name="line.696"></a>
+<span class="sourceLineNo">697</span><a name="line.697"></a>
+<span class="sourceLineNo">698</span>   List&lt;ConfigFileListener&gt; getListeners() {<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      return listeners;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>   }<a name="line.700"></a>
+<span class="sourceLineNo">701</span><a name="line.701"></a>
+<span class="sourceLineNo">702</span>   @Override /* ConfigFile */<a name="line.702"></a>
+<span class="sourceLineNo">703</span>   public Writable toWritable() {<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      return new ConfigFileWritable(this);<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span>   @Override /* ConfigFile */<a name="line.707"></a>
+<span class="sourceLineNo">708</span>   public ConfigFile merge(ConfigFile cf) {<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      assertFieldNotNull(cf, "cf");<a name="line.709"></a>
+<span class="sourceLineNo">710</span>      Set&lt;String&gt; changes = createChanges();<a name="line.710"></a>
+<span class="sourceLineNo">711</span>      writeLock();<a name="line.711"></a>
+<span class="sourceLineNo">712</span>      try {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>         for (String sectionName : this.keySet())<a name="line.713"></a>
+<span class="sourceLineNo">714</span>            if (! cf.containsKey(sectionName))<a name="line.714"></a>
+<span class="sourceLineNo">715</span>               remove(sectionName, changes);<a name="line.715"></a>
+<span class="sourceLineNo">716</span><a name="line.716"></a>
+<span class="sourceLineNo">717</span>         for (Map.Entry&lt;String,Section&gt; e : cf.entrySet())<a name="line.717"></a>
+<span class="sourceLineNo">718</span>            put(e.getKey(), e.getValue(), changes);<a name="line.718"></a>
+<span class="sourceLineNo">719</span><a name="line.719"></a>
+<span class="sourceLineNo">720</span>      } finally {<a name="line.720"></a>
+<span class="sourceLineNo">721</span>         writeUnlock();<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      }<a name="line.722"></a>
+<span class="sourceLineNo">723</span>      signalChanges(changes);<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      return this;<a name="line.724"></a>
+<span class="sourceLineNo">725</span>   }<a name="line.725"></a>
+<span class="sourceLineNo">726</span><a name="line.726"></a>
+<span class="sourceLineNo">727</span>   Encoder getEncoder() {<a name="line.727"></a>
+<span class="sourceLineNo">728</span>      return encoder;<a name="line.728"></a>
+<span class="sourceLineNo">729</span>   }<a name="line.729"></a>
+<span class="sourceLineNo">730</span><a name="line.730"></a>
+<span class="sourceLineNo">731</span>   @Override /* ConfigFile */<a name="line.731"></a>
+<span class="sourceLineNo">732</span>   protected BeanSession getBeanSession() {<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      return pBeanSession;<a name="line.733"></a>
+<span class="sourceLineNo">734</span>   }<a name="line.734"></a>
+<span class="sourceLineNo">735</span><a name="line.735"></a>
+<span class="sourceLineNo">736</span>   @Override /* ConfigFile */<a name="line.736"></a>
+<span class="sourceLineNo">737</span>   protected void readLock() {<a name="line.737"></a>
+<span class="sourceLineNo">738</span>      lock.readLock().lock();<a name="line.738"></a>
+<span class="sourceLineNo">739</span>   }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span>   @Override /* ConfigFile */<a name="line.741"></a>
+<span class="sourceLineNo">742</span>   protected void readUnlock() {<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      lock.readLock().unlock();<a name="line.743"></a>
+<span class="sourceLineNo">744</span>   }<a name="line.744"></a>
+<span class="sourceLineNo">745</span><a name="line.745"></a>
+<span class="sourceLineNo">746</span>   private void writeLock() {<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      if (readOnly)<a name="line.747"></a>
+<span class="sourceLineNo">748</span>         throw new UnsupportedOperationException("Cannot modify read-only ConfigFile.");<a name="line.748"></a>
+<span class="sourceLineNo">749</span>      lock.writeLock().lock();<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      hasBeenModified = true;<a name="line.750"></a>
+<span class="sourceLineNo">751</span>   }<a name="line.751"></a>
+<span class="sourceLineNo">752</span><a name="line.752"></a>
+<span class="sourceLineNo">753</span>   private void writeUnlock() {<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      lock.writeLock().unlock();<a name="line.754"></a>
+<span class="sourceLineNo">755</span>   }<a name="line.755"></a>
+<span class="sourceLineNo">756</span><a name="line.756"></a>
+<span class="sourceLineNo">757</span>   @Override /* ConfigFile */<a name="line.757"></a>
+<span class="sourceLineNo">758</span>   public ConfigFile getResolving(VarResolver vr) {<a name="line.758"></a>
+<span class="sourceLineNo">759</span>      assertFieldNotNull(vr, "vr");<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      return new ConfigFileWrapped(this, vr);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>   }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>   @Override /* ConfigFile */<a name="line.763"></a>
+<span class="sourceLineNo">764</span>   public ConfigFile getResolving(VarResolverSession vs) {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>      assertFieldNotNull(vs, "vs");<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      return new ConfigFileWrapped(this, vs);<a name="line.766"></a>
+<span class="sourceLineNo">767</span>   }<a name="line.767"></a>
+<span class="sourceLineNo">768</span><a name="line.768"></a>
+<span class="sourceLineNo">769</span>   @Override /* ConfigFile */<a name="line.769"></a>
+<span class="sourceLineNo">770</span>   public ConfigFile getResolving() {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>      return getResolving(<a name="line.771"></a>
+<span class="sourceLineNo">772</span>         new VarResolverBuilder()<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            .vars(SystemPropertiesVar.class, EnvVariablesVar.class, SwitchVar.class, IfVar.class, ConfigFileVar.class,<a name="line.773"></a>
+<span class="sourceLineNo">774</span>               IfVar.class, SwitchVar.class)<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            .contextObject(ConfigFileVar.SESSION_config, this)<a name="line.775"></a>
+<span class="sourceLineNo">776</span>            .build()<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      );<a name="line.777"></a>
+<span class="sourceLineNo">778</span>   }<a name="line.778"></a>
+<span class="sourceLineNo">779</span><a name="line.779"></a>
+<span class="sourceLineNo">780</span>   /*<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    * Finds the keys that are different between the two sections and adds it to<a name="line.781"></a>
+<span class="sourceLineNo">782</span>    * the specified set.<a name="line.782"></a>
+<span class="sourceLineNo">783</span>    */<a name="line.783"></a>
+<span class="sourceLineNo">784</span>   static final void findChanges(Set&lt;String&gt; s, Section a, Section b) {<a name="line.784"></a>
+<span class="sourceLineNo">785</span>      if (s == null)<a name="line.785"></a>
+<span class="sourceLineNo">786</span>         return;<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      String sname = (a == null ? b.name : a.name);<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      if (a == null) {<a name="line.788"></a>
+<span class="sourceLineNo">789</span>         for (String k : b.keySet())<a name="line.789"></a>
+<span class="sourceLineNo">790</span>            s.add(getFullKey(sname, k));<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      } else if (b == null) {<a name="line.791"></a>
+<span class="sourceLineNo">792</span>         for (String k : a.keySet())<a name="line.792"></a>
+<span class="sourceLineNo">793</span>            s.add(getFullKey(sname, k));<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      } else {<a name="line.794"></a>
+<span class="sourceLineNo">795</span>         for (String k : a.keySet())<a name="line.795"></a>
+<span class="sourceLineNo">796</span>            addChange(s, sname, k, a.get(k), b.get(k));<a name="line.796"></a>
+<span class="sourceLineNo">797</span>         for (String k : b.keySet())<a name="line.797"></a>
+<span class="sourceLineNo">798</span>            addChange(s, sname, k, a.get(k), b.get(k));<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      }<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   }<a name="line.800"></a>
+<span class="sourceLineNo">801</span><a name="line.801"></a>
+<span class="sourceLineNo">802</span>   static final void addChange(Set&lt;String&gt; changes, String section, String key, String oldVal, String newVal) {<a name="line.802"></a>
+<span class="sourceLineNo">803</span>      if (! isEquals(oldVal, newVal))<a name="line.803"></a>
+<span class="sourceLineNo">804</span>         changes.add(getFullKey(section, key));<a name="line.804"></a>
+<span class="sourceLineNo">805</span>   }<a name="line.805"></a>
+<span class="sourceLineNo">806</span><a name="line.806"></a>
+<span class="sourceLineNo">807</span>   final Set&lt;String&gt; createChanges() {<a name="line.807"></a>
+<span class="sourceLineNo">808</span>      return (listeners.size() &gt; 0 ? new LinkedHashSet&lt;String&gt;() : null);<a name="line.808"></a>
+<span class="sourceLineNo">809</span>   }<a name="line.809"></a>
+<span class="sourceLineNo">810</span><a name="line.810"></a>
+<span class="sourceLineNo">811</span>   final void signalChanges(Set&lt;String&gt; changes) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span>      if (changes != null &amp;&amp; ! changes.isEmpty())<a name="line.812"></a>
+<span class="sourceLineNo">813</span>         for (ConfigFileListener l : listeners)<a name="line.813"></a>
+<span class="sourceLineNo">814</span>            l.onChange(this, changes);<a name="line.814"></a>
+<span class="sourceLineNo">815</span>   }<a name="line.815"></a>
+<span class="sourceLineNo">816</span>}<a name="line.816"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html
deleted file mode 100644
index 917faa3..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileVar.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.ini;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.svl.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
-<span class="sourceLineNo">018</span> * Config file variable resolver.<a name="line.18"></a>
-<span class="sourceLineNo">019</span> * <a name="line.19"></a>
-<span class="sourceLineNo">020</span> * &lt;p&gt;<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * The format for this var is &lt;js&gt;"$C{key[,defaultValue]}"&lt;/js&gt;.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * See {@link ConfigFile#getString(String)} for the format of the key.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;p&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * This variable resolver requires that a {@link ConfigFile} object be set as a context object on the resolver or a<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * session object on the resolver session.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <a name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * &lt;p class='bcode'&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *    &lt;jc&gt;// Create a config file object.&lt;/jc&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *    ConfigFile configFile = new ConfigFileBuilder().build(&lt;js&gt;"MyConfig.cfg"&lt;/js&gt;);<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <a name="line.32"></a>
-<span class="sourceLineNo">033</span> *    &lt;jc&gt;// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")&lt;/jc&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    VarResolver r = &lt;jk&gt;new&lt;/jk&gt; VarResolver().addVars(ConfigVar.&lt;js&gt;class&lt;/js&gt;)<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       .addContextObject(&lt;jsf&gt;SESSION_config&lt;/jsf&gt;, configFile);<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;jc&gt;// Use it!&lt;/jc&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *    System.&lt;jsf&gt;out&lt;/jsf&gt;.println(r.resolve(&lt;js&gt;"Value for myKey in section MySection is $C{MySection/myKey}"&lt;/js&gt;));<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * &lt;/p&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @see org.apache.juneau.ini.ConfigFile<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * @see org.apache.juneau.svl<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class ConfigFileVar extends DefaultingVar {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>   /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * The name of the session or context object that identifies the {@link ConfigFile} object.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   public static final String SESSION_config = "config";<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>   /** The name of this variable. */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   public static final String NAME = "C";<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>   /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * Constructor.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   public ConfigFileVar() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      super(NAME);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>   @Override /* Var */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   public String resolve(VarResolverSession session, String key) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      return session.getSessionObject(ConfigFile.class, SESSION_config).getString(key);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   }<a name="line.68"></a>
-<span class="sourceLineNo">069</span>}<a name="line.69"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
index d4c41fe..6aab64d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileWrapped.html
@@ -27,272 +27,273 @@
 <span class="sourceLineNo">019</span>import java.util.*;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import org.apache.juneau.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.parser.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.serializer.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.svl.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>/**<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * Wraps an instance of {@link ConfigFileImpl} in an interface that will automatically replace {@link VarResolver}<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * variables.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <a name="line.29"></a>
-<span class="sourceLineNo">030</span> * &lt;p&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <a name="line.32"></a>
-<span class="sourceLineNo">033</span> * &lt;p&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * All other method calls are passed through to the inner config file.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>   private final ConfigFileImpl cf;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private final VarResolverSession vs;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>   ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      this.cf = cf;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>      this.vs = vr.builder()<a name="line.44"></a>
-<span class="sourceLineNo">045</span>         .vars(ConfigFileVar.class)<a name="line.45"></a>
-<span class="sourceLineNo">046</span>         .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>         .build()<a name="line.47"></a>
-<span class="sourceLineNo">048</span>         .createSession();<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>   ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      this.cf = cf;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      this.vs = vs;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>   @Override /* ConfigFile */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   public void clear() {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      cf.clear();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>   @Override /* ConfigFile */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   public boolean containsKey(Object key) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      return cf.containsKey(key);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>   @Override /* ConfigFile */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   public boolean containsValue(Object value) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      return cf.containsValue(value);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>   @Override /* ConfigFile */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   public Set&lt;java.util.Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return cf.entrySet();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>   @Override /* ConfigFile */<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   public Section get(Object key) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      return cf.get(key);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>   @Override /* ConfigFile */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   public boolean isEmpty() {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      return cf.isEmpty();<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>   @Override /* ConfigFile */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   public Set&lt;String&gt; keySet() {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      return cf.keySet();<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>   @Override /* ConfigFile */<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   public Section put(String key, Section value) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return cf.put(key, value);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>   @Override /* ConfigFile */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      cf.putAll(map);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>   @Override /* ConfigFile */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   public Section remove(Object key) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      return cf.remove(key);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>   @Override /* ConfigFile */<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   public int size() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      return cf.size();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>   @Override /* ConfigFile */<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   public Collection&lt;Section&gt; values() {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      return cf.values();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>   @Override /* ConfigFile */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   public ConfigFile loadIfModified() throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      cf.loadIfModified();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      return this;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>   @Override /* ConfigFile */<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   public ConfigFile load() throws IOException {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      cf.load();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return this;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>   @Override /* ConfigFile */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   public ConfigFile load(Reader r) throws IOException {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      cf.load(r);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      return this;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.ini.vars.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.parser.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.serializer.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.svl.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>/**<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * Wraps an instance of {@link ConfigFileImpl} in an interface that will automatically replace {@link VarResolver}<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * variables.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <a name="line.30"></a>
+<span class="sourceLineNo">031</span> * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * The {@link ConfigFile#getResolving(VarResolver)} returns an instance of this class.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <a name="line.33"></a>
+<span class="sourceLineNo">034</span> * &lt;p&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * This class overrides the {@link #getString(String, String)} to resolve string variables.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * All other method calls are passed through to the inner config file.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public final class ConfigFileWrapped extends ConfigFile {<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>   private final ConfigFileImpl cf;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   private final VarResolverSession vs;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>   ConfigFileWrapped(ConfigFileImpl cf, VarResolver vr) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>      this.cf = cf;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      this.vs = vr.builder()<a name="line.45"></a>
+<span class="sourceLineNo">046</span>         .vars(ConfigFileVar.class)<a name="line.46"></a>
+<span class="sourceLineNo">047</span>         .contextObject(ConfigFileVar.SESSION_config, cf)<a name="line.47"></a>
+<span class="sourceLineNo">048</span>         .build()<a name="line.48"></a>
+<span class="sourceLineNo">049</span>         .createSession();<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>   ConfigFileWrapped(ConfigFileImpl cf, VarResolverSession vs) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      this.cf = cf;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      this.vs = vs;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>   @Override /* ConfigFile */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   public void clear() {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      cf.clear();<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>   @Override /* ConfigFile */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   public boolean containsKey(Object key) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      return cf.containsKey(key);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>   @Override /* ConfigFile */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   public boolean containsValue(Object value) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      return cf.containsValue(value);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>   @Override /* ConfigFile */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   public Set&lt;java.util.Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      return cf.entrySet();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>   @Override /* ConfigFile */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   public Section get(Object key) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      return cf.get(key);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>   @Override /* ConfigFile */<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   public boolean isEmpty() {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      return cf.isEmpty();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>   @Override /* ConfigFile */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   public Set&lt;String&gt; keySet() {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      return cf.keySet();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>   @Override /* ConfigFile */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   public Section put(String key, Section value) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      return cf.put(key, value);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>   @Override /* ConfigFile */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      cf.putAll(map);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>   @Override /* ConfigFile */<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   public Section remove(Object key) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      return cf.remove(key);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>   @Override /* ConfigFile */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   public int size() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      return cf.size();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>   @Override /* ConfigFile */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public Collection&lt;Section&gt; values() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      return cf.values();<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>   @Override /* ConfigFile */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   public ConfigFile loadIfModified() throws IOException {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      cf.loadIfModified();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      return this;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>   @Override /* ConfigFile */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   public ConfigFile load() throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      cf.load();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      return this;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>   @Override /* ConfigFile */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   public ConfigFile load(Reader r) throws IOException {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      cf.load(r);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return this;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   }<a name="line.133"></a>
 <span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>   @Override /* ConfigFile */<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   public boolean isEncoded(String key) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return cf.isEncoded(key);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>   @Override /* ConfigFile */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   public ConfigFile addLines(String section, String... lines) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      cf.addLines(section, lines);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      return this;<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>   @Override /* ConfigFile */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      cf.addHeaderComments(section, headerComments);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      return this;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>   @Override /* ConfigFile */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   public ConfigFile clearHeaderComments(String section) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      cf.clearHeaderComments(section);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return this;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>   @Override /* ConfigFile */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   public Section getSection(String name) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      return cf.getSection(name);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>   @Override /* ConfigFile */<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   public Section getSection(String name, boolean create) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      return cf.getSection(name, create);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>   @Override /* ConfigFile */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   public ConfigFile addSection(String name) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      cf.addSection(name);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return this;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>   @Override /* ConfigFile */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      cf.setSection(name, contents);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return this;<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>   @Override /* ConfigFile */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   public ConfigFile removeSection(String name) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      cf.removeSection(name);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      return this;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>   @Override /* ConfigFile */<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   public ConfigFile save() throws IOException {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      cf.save();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      return this;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>   @Override /* ConfigFile */<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      cf.serializeTo(out, format);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      return this;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>   @Override /* ConfigFile */<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   public String toString() {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      return cf.toString();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>   @Override /* ConfigFile */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   public ConfigFile getResolving(VarResolver varResolver) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      assertFieldNotNull(varResolver, "vr");<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      return new ConfigFileWrapped(cf, varResolver);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>   @Override /* ConfigFile */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      assertFieldNotNull(varSession, "vs");<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      return new ConfigFileWrapped(cf, varSession);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>   @Override /* ConfigFile */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   public ConfigFile getResolving() {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>   @Override /* ConfigFile */<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      cf.addListener(listener);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      return this;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>   @Override /* ConfigFile */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   public Writable toWritable() {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      return cf.toWritable();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>   @Override /* ConfigFile */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   public ConfigFile merge(ConfigFile newCf) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      cf.merge(newCf);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      return this;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>   @Override /* ConfigFile */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   protected BeanSession getBeanSession() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return cf.getBeanSession();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   }<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>   @Override /* ConfigFile */<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   public String get(String sectionName, String sectionKey) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return vs.resolve(cf.get(sectionName, sectionKey));<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>   @Override /* ConfigFile */<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      return cf.put(sectionName, sectionKey, value, encoded);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>   @Override /* ConfigFile */<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.253"></a>
-<span class="sourceLineNo">254</span>         boolean newline) throws SerializeException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      return cf.put(sectionName, sectionKey, value, serializer, encoded, newline);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   }<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>   @Override /* ConfigFile */<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   public String remove(String sectionName, String sectionKey) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return cf.remove(sectionName, sectionKey);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>   @Override /* ConfigFile */<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      return cf.getSectionKeys(sectionName);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>   @Override /* ConfigFile */<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   protected void readLock() {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      cf.readLock();<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>   @Override /* ConfigFile */<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   protected void readUnlock() {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      cf.readUnlock();<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>   @Override /* ConfigFile */<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   protected String serialize(Object o, Serializer s, boolean newline) throws SerializeException {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      return cf.serialize(o, s, newline);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   }<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span>   @Override /* ConfigFile */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   protected &lt;T&gt; T parse(String s, Parser parser, Type type, Type... args) throws ParseException {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      return cf.parse(s, parser, type, args);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>}<a name="line.287"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>   @Override /* ConfigFile */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   public boolean isEncoded(String key) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return cf.isEncoded(key);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>   @Override /* ConfigFile */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   public ConfigFile addLines(String section, String... lines) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      cf.addLines(section, lines);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      return this;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>   @Override /* ConfigFile */<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   public ConfigFile addHeaderComments(String section, String... headerComments) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      cf.addHeaderComments(section, headerComments);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return this;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>   @Override /* ConfigFile */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   public ConfigFile clearHeaderComments(String section) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      cf.clearHeaderComments(section);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return this;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>   @Override /* ConfigFile */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   public Section getSection(String name) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return cf.getSection(name);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>   @Override /* ConfigFile */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   public Section getSection(String name, boolean create) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      return cf.getSection(name, create);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>   @Override /* ConfigFile */<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   public ConfigFile addSection(String name) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      cf.addSection(name);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      return this;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>   @Override /* ConfigFile */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      cf.setSection(name, contents);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      return this;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>   @Override /* ConfigFile */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   public ConfigFile removeSection(String name) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      cf.removeSection(name);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      return this;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>   @Override /* ConfigFile */<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   public ConfigFile save() throws IOException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      cf.save();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      return this;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>   @Override /* ConfigFile */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   public ConfigFile serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      cf.serializeTo(out, format);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      return this;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>   @Override /* ConfigFile */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   public String toString() {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      return cf.toString();<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>   @Override /* ConfigFile */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   public ConfigFile getResolving(VarResolver varResolver) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      assertFieldNotNull(varResolver, "vr");<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      return new ConfigFileWrapped(cf, varResolver);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>   @Override /* ConfigFile */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   public ConfigFile getResolving(VarResolverSession varSession) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      assertFieldNotNull(varSession, "vs");<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return new ConfigFileWrapped(cf, varSession);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>   @Override /* ConfigFile */<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   public ConfigFile getResolving() {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      return new ConfigFileWrapped(cf, VarResolver.DEFAULT);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   }<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>   @Override /* ConfigFile */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      cf.addListener(listener);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return this;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>   @Override /* ConfigFile */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   public Writable toWritable() {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return cf.toWritable();<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>   @Override /* ConfigFile */<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   public ConfigFile merge(ConfigFile newCf) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      cf.merge(newCf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      return this;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>   @Override /* ConfigFile */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   protected BeanSession getBeanSession() {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      return cf.getBeanSession();<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>   @Override /* ConfigFile */<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   public String get(String sectionName, String sectionKey) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      return vs.resolve(cf.get(sectionName, sectionKey));<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>   @Override /* ConfigFile */<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      return cf.put(sectionName, sectionKey, value, encoded);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>   @Override /* ConfigFile */<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.254"></a>
+<span class="sourceLineNo">255</span>         boolean newline) throws SerializeException {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      return cf.put(sectionName, sectionKey, value, serializer, encoded, newline);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>   @Override /* ConfigFile */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>   public String remove(String sectionName, String sectionKey) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      return cf.remove(sectionName, sectionKey);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>   @Override /* ConfigFile */<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      return cf.getSectionKeys(sectionName);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>   @Override /* ConfigFile */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   protected void readLock() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      cf.readLock();<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span>   @Override /* ConfigFile */<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   protected void readUnlock() {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      cf.readUnlock();<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>   @Override /* ConfigFile */<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   protected String serialize(Object o, Serializer s, boolean newline) throws SerializeException {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      return cf.serialize(o, s, newline);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>   @Override /* ConfigFile */<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   protected &lt;T&gt; T parse(String s, Parser parser, Type type, Type... args) throws ParseException {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      return cf.parse(s, parser, type, args);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>}<a name="line.288"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/vars/ConfigFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/ini/vars/ConfigFileVar.html
new file mode 100644
index 0000000..d4d75b9
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/vars/ConfigFileVar.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
+<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
+<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
+<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
+<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
+<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
+<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
+<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
+<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
+<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
+<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
+<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
+<span class="sourceLineNo">013</span>package org.apache.juneau.ini.vars;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.ini.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.svl.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * Config file variable resolver.<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * <a name="line.20"></a>
+<span class="sourceLineNo">021</span> * &lt;p&gt;<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * The format for this var is &lt;js&gt;"$C{key[,defaultValue]}"&lt;/js&gt;.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * See {@link ConfigFile#getString(String)} for the format of the key.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;p&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * This variable resolver requires that a {@link ConfigFile} object be set as a context object on the resolver or a<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * session object on the resolver session.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <a name="line.28"></a>
+<span class="sourceLineNo">029</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * &lt;p class='bcode'&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *    &lt;jc&gt;// Create a config file object.&lt;/jc&gt;<a name="line.31"></a>
+<span class="sourceLineNo">0