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 Fri, 02 Mar 2018 00:01:13 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 71db2fb  Javadoc updates.
71db2fb is described below

commit 71db2fbb4899ed9836110793c9f63cf802606083
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Thu Mar 1 19:01:08 2018 -0500

    Javadoc updates.
---
 content/images/pexels-photo-688332b.jpeg           | Bin 0 -> 1956458 bytes
 content/images/pexels-photo-688332b.jpg            | Bin 1959322 -> 0 bytes
 .../org/apache/juneau/microservice/Resource.html   | 364 --------------------
 .../juneau/microservice/ResourceJenaGroup.html     | 376 ---------------------
 ...sourceJena.html => RestServletJenaDefault.html} |  42 ++-
 ...esourceGroup.html => RestServletJenaGroup.html} | 130 ++-----
 .../juneau/microservice/vars/package-frame.html    |  21 --
 .../juneau/microservice/vars/package-summary.html  | 158 ---------
 .../juneau/microservice/vars/package-tree.html     | 149 --------
 ...vletGroupDefault.html => RestServletGroup.html} |  34 +-
 .../juneau/{microservice => svl}/vars/ArgsVar.html |  93 ++---
 .../vars/ManifestFileVar.html                      |  89 ++---
 .../org/apache/juneau/microservice/Resource.html   | 137 --------
 .../apache/juneau/microservice/ResourceGroup.html  | 138 --------
 .../juneau/microservice/ResourceJenaGroup.html     | 162 ---------
 ...sourceJena.html => RestServletJenaDefault.html} |  42 +--
 ...ResourceJena.html => RestServletJenaGroup.html} |  42 +--
 .../apache/juneau/microservice/vars/ArgsVar.html   | 141 --------
 ...vletGroupDefault.html => RestServletGroup.html} |   2 +-
 .../org/apache/juneau/svl/vars/ArgsVar.html        | 167 +++++++++
 .../vars/ManifestFileVar.html                      |  88 ++---
 21 files changed, 412 insertions(+), 1963 deletions(-)

diff --git a/content/images/pexels-photo-688332b.jpeg b/content/images/pexels-photo-688332b.jpeg
new file mode 100644
index 0000000..18ea66c
Binary files /dev/null and b/content/images/pexels-photo-688332b.jpeg differ
diff --git a/content/images/pexels-photo-688332b.jpg b/content/images/pexels-photo-688332b.jpg
deleted file mode 100644
index 4facd63..0000000
Binary files a/content/images/pexels-photo-688332b.jpg and /dev/null differ
diff --git a/content/site/apidocs/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/org/apache/juneau/microservice/Resource.html
deleted file mode 100644
index 821d8e7..0000000
--- a/content/site/apidocs/org/apache/juneau/microservice/Resource.html
+++ /dev/null
@@ -1,364 +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>Resource (Apache Juneau 7.1.1-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="Resource (Apache Juneau 7.1.1-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/microservice/Microservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/Resource.html" target="_top">Frames</a></li>
-<li><a href="Resource.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><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.microservice</div>
-<h2 title="Class Resource" class="title">Class Resource</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>javax.servlet.GenericServlet</li>
-<li>
-<ul class="inheritance">
-<li>javax.servlet.http.HttpServlet</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.microservice.Resource</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/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</dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources">ConfigResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/DebugResource.html" title="class in org.apache.juneau.microservice.resources">DebugResource</a>, <a href="../../../../org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources">DirectoryResource</a>, < [...]
-</dl>
-<hr>
-<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/Resource.html#line.47">Resource</a>
-extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></pre>
-<div class="block">Superclass for all REST resources.
- 
- <p>
- In additional to the functionality of the <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> group,
- augments the <a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> method with the following additional variable types:
- <ul class='spaced-list'>
-   <li>
-      <code class='snippet'>$ARG{...}</code> - Command line arguments pulled from <a href="../../../../org/apache/juneau/microservice/Microservice.html#getArgs--"><code>Microservice.getArgs()</code></a>.
-      
-      <h5 class='figure'>Example:</h5>
-      <p class='bcode'>
-   String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
-   String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
-      </p>
-   <li>
-      <code class='snippet'>$MF{...}</code> - Manifest file entries pulled from <a href="../../../../org/apache/juneau/microservice/Microservice.html#getManifest--"><code>Microservice.getManifest()</code></a>.
-      
-      <h5 class='figure'>Example:</h5>
-      <p class='bcode'>
-   String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
-      </p>
- </ul></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.Resource">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Resource.html#Resource--">Resource</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="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>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/Resource.html#addConfigVars-org.apache.juneau.rest.RestContextBuilder-">addConfigVars</a></span>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)</code>
-<div class="block">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a h [...]
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;javax.servlet.http.HttpServlet</h3>
-<code>doDelete, doGet, doHead, doOptions, doPost, doPut, doTrace, getLastModified, service</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;javax.servlet.GenericServlet</h3>
-<code>getInitParameter, getInitParameterNames, getServletContext, getServletInfo, getServletName, init</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">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Resource--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Resource</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Resource.html#line.47">Resource</a>()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addConfigVars-org.apache.juneau.rest.RestContextBuilder-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>addConfigVars</h4>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation">@RestHook</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestHook.html#value--">value</a>=<a href="../../../../org/apache/juneau/rest/annotation/HookEvent.html#INIT">INIT</a>)
-public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/Resource.html#line.56">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)
-                                         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">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>builder</code> - The resource config.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><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></code></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/microservice/Microservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/Resource.html" target="_top">Frames</a></li>
-<li><a href="Resource.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><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/microservice/ResourceJenaGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
deleted file mode 100644
index bf500fa..0000000
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
+++ /dev/null
@@ -1,376 +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>ResourceJenaGroup (Apache Juneau 7.1.1-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="ResourceJenaGroup (Apache Juneau 7.1.1-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/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/ResourceJenaGroup.html" target="_top">Frames</a></li>
-<li><a href="ResourceJenaGroup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><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.microservice</div>
-<h2 title="Class ResourceJenaGroup" class="title">Class ResourceJenaGroup</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>javax.servlet.GenericServlet</li>
-<li>
-<ul class="inheritance">
-<li>javax.servlet.http.HttpServlet</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServlet</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletGroupDefault</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.microservice.ResourceJenaGroup</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/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</dd>
-</dl>
-<hr>
-<br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
-              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
-              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache. [...]
-              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.N [...]
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.72">ResourceJenaGroup</a>
-extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></pre>
-<div class="block">Superclass for all REST resource groups.
- 
- <p>
- In additional to the functionality of the <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><code>RestServletGroupDefault</code></a> group,
- augments the <a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> method with the following additional variable types:
- <ul class='spaced-list'>
-   <li>
-      <jk>$ARG{...}</jk> - Command line arguments.
-      <br>Resolves values from <a href="../../../../org/apache/juneau/microservice/Microservice.html#getArgs--"><code>Microservice.getArgs()</code></a>.
-      
-      <h5>Example:</h5>
-      <p class='bcode'>
-   String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
-   String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
-      </p>
-   <li>
-      <jk>$MF{...}</jk> - Manifest file entries.
-      
-      <h5>Example:</h5>
-      <p class='bcode'>
-   String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
-      </p>
- </ul></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.ResourceJenaGroup">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html#ResourceJenaGroup--">ResourceJenaGroup</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="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>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html#addConfigVars-org.apache.juneau.rest.RestContextBuilder-">addConfigVars</a></span>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)</code>
-<div class="block">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletGroupDefault">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServletDefault.html#getOptions-org.apache.juneau.rest.RestRequest-">getOptions</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a h [...]
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;javax.servlet.http.HttpServlet</h3>
-<code>doDelete, doGet, doHead, doOptions, doPost, doPut, doTrace, getLastModified, service</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.GenericServlet">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;javax.servlet.GenericServlet</h3>
-<code>getInitParameter, getInitParameterNames, getServletContext, getServletInfo, getServletName, init</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">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ResourceJenaGroup--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ResourceJenaGroup</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.72">ResourceJenaGroup</a>()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addConfigVars-org.apache.juneau.rest.RestContextBuilder-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>addConfigVars</h4>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation">@RestHook</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestHook.html#value--">value</a>=<a href="../../../../org/apache/juneau/rest/annotation/HookEvent.html#INIT">INIT</a>)
-public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.81">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)
-                                         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">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>builder</code> - The resource config.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><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></code></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/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/ResourceJenaGroup.html" target="_top">Frames</a></li>
-<li><a href="ResourceJenaGroup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><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/microservice/ResourceJena.html b/content/site/apidocs/org/apache/juneau/microservice/RestServletJenaDefault.html
similarity index 82%
rename from content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
rename to content/site/apidocs/org/apache/juneau/microservice/RestServletJenaDefault.html
index eb43f60..df3056d 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/RestServletJenaDefault.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceJena (Apache Juneau 7.1.1-SNAPSHOT)</title>
+<title>RestServletJenaDefault (Apache Juneau 7.1.1-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="ResourceJena (Apache Juneau 7.1.1-SNAPSHOT)";
+            parent.document.title="RestServletJenaDefault (Apache Juneau 7.1.1-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -42,12 +42,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestServletJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/ResourceJena.html" target="_top">Frames</a></li>
-<li><a href="ResourceJena.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/microservice/RestServletJenaDefault.html" target="_top">Frames</a></li>
+<li><a href="RestServletJenaDefault.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>
@@ -86,7 +86,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.juneau.microservice</div>
-<h2 title="Class ResourceJena" class="title">Class ResourceJena</h2>
+<h2 title="Class RestServletJenaDefault" class="title">Class RestServletJenaDefault</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -105,7 +105,7 @@
 <li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.microservice.ResourceJena</li>
+<li>org.apache.juneau.microservice.RestServletJenaDefault</li>
 </ul>
 </li>
 </ul>
@@ -126,16 +126,14 @@
 </dl>
 <hr>
 <br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
-              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#config--">config</a>="$S{juneau.configFile}",
-              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.juneau.jena">RdfSerializer.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html" title="class in org.apache. [...]
+<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.jun [...]
               <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.N [...]
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.48">ResourceJena</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/RestServletJenaDefault.html#line.40">RestServletJenaDefault</a>
 extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></pre>
-<div class="block">Superclass for all REST resources with RDF support.</div>
+<div class="block">Resource servlet with additional RDF support.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.ResourceJena">Serialized Form</a></dd>
+<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.RestServletJenaDefault">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -155,7 +153,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 <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/microservice/ResourceJena.html#ResourceJena--">ResourceJena</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestServletJenaDefault.html#RestServletJenaDefault--">RestServletJenaDefault</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -215,13 +213,13 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ResourceJena--">
+<a name="RestServletJenaDefault--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ResourceJena</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/ResourceJena.html#line.48">ResourceJena</a>()</pre>
+<h4>RestServletJenaDefault</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/RestServletJenaDefault.html#line.40">RestServletJenaDefault</a>()</pre>
 </li>
 </ul>
 </li>
@@ -251,12 +249,12 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestServletJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/microservice/ResourceJena.html" target="_top">Frames</a></li>
-<li><a href="ResourceJena.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/microservice/RestServletJenaDefault.html" target="_top">Frames</a></li>
+<li><a href="RestServletJenaDefault.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/microservice/ResourceGroup.html b/content/site/apidocs/org/apache/juneau/microservice/RestServletJenaGroup.html
similarity index 64%
rename from content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
rename to content/site/apidocs/org/apache/juneau/microservice/RestServletJenaGroup.html
index 4f2c5e2..13707b2 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/RestServletJenaGroup.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceGroup (Apache Juneau 7.1.1-SNAPSHOT)</title>
+<title>RestServletJenaGroup (Apache Juneau 7.1.1-SNAPSHOT)</title>
 <link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,18 +12,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResourceGroup (Apache Juneau 7.1.1-SNAPSHOT)";
+            parent.document.title="RestServletJenaGroup (Apache Juneau 7.1.1-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>
@@ -48,12 +42,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestServletJenaDefault.html" title="class in org.apache.juneau.microservice"><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/microservice/ResourceGroup.html" target="_top">Frames</a></li>
-<li><a href="ResourceGroup.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/microservice/RestServletJenaGroup.html" target="_top">Frames</a></li>
+<li><a href="RestServletJenaGroup.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>
@@ -76,13 +70,13 @@ var activeTableTab = "activeTableTab";
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.RestServletGroup">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li>Method</li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -92,7 +86,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.juneau.microservice</div>
-<h2 title="Class ResourceGroup" class="title">Class ResourceGroup</h2>
+<h2 title="Class RestServletJenaGroup" class="title">Class RestServletJenaGroup</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -111,10 +105,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletGroupDefault</a></li>
+<li><a href="../../../../org/apache/juneau/rest/RestServletGroup.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletGroup</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.microservice.ResourceGroup</li>
+<li>org.apache.juneau.microservice.RestServletJenaGroup</li>
 </ul>
 </li>
 </ul>
@@ -135,41 +129,16 @@ var activeTableTab = "activeTableTab";
 <dt>All Implemented Interfaces:</dt>
 <dd><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</dd>
 </dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a>, <a href="../../../../org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources">SampleRootResource</a></dd>
-</dl>
 <hr>
 <br>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.48">ResourceGroup</a>
-extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></pre>
-<div class="block">Superclass for all REST resource groups.
- 
- <p>
- In additional to the functionality of the <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><code>RestServletGroupDefault</code></a> group,
- augments the <a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> method with the following additional variable types:
- <ul class='spaced-list'>
-   <li>
-      <jk>$ARG{...}</jk> - Command line arguments.
-      <br>Resolves values from <a href="../../../../org/apache/juneau/microservice/Microservice.html#getArgs--"><code>Microservice.getArgs()</code></a>.
-      
-      <h5>Example:</h5>
-      <p class='bcode'>
-   String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
-   String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
-      </p>
-   <li>
-      <jk>$MF{...}</jk> - Manifest file entries.
-      
-      <h5>Example:</h5>
-      <p class='bcode'>
-   String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
-      </p>
- </ul></div>
+<pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#serializers--">serializers</a>={<a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class in org.apache.juneau.html">HtmlDocSerializer.class</a>,<a href="../../../../org/apache/juneau/jena/RdfSerializer.Xml.html" title="class in org.apache.jun [...]
+              <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/jena/RdfParser.Xml.html" title="class in org.apache.juneau.jena">RdfParser.Xml.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.Turtle.html" title="class in org.apache.juneau.jena">RdfParser.Turtle.class</a>,<a href="../../../../org/apache/juneau/jena/RdfParser.NTriple.html" title="class in org.apache.juneau.jena">RdfParser.N [...]
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/RestServletJenaGroup.html#line.40">RestServletJenaGroup</a>
+extends <a href="../../../../org/apache/juneau/rest/RestServletGroup.html" title="class in org.apache.juneau.rest">RestServletGroup</a></pre>
+<div class="block">Resource group with additional RDF support.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.ResourceGroup">Serialized Form</a></dd>
+<dd><a href="../../../../serialized-form.html#org.apache.juneau.microservice.RestServletJenaGroup">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -189,7 +158,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html#ResourceGroup--">ResourceGroup</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestServletJenaGroup.html#RestServletJenaGroup--">RestServletJenaGroup</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -200,25 +169,12 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.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>
-<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>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html#addConfigVars-org.apache.juneau.rest.RestContextBuilder-">addConfigVars</a></span>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)</code>
-<div class="block">Initializes the registry URL and rest clent.</div>
-</td>
-</tr>
-</table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletGroupDefault">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletGroup">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a></h3>
-<code><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
+<h3>Methods inherited from class&nbsp;org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServletGroup.html" title="class in org.apache.juneau.rest">RestServletGroup</a></h3>
+<code><a href="../../../../org/apache/juneau/rest/RestServletGroup.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
@@ -269,39 +225,13 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ResourceGroup--">
+<a name="RestServletJenaGroup--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ResourceGroup</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.48">ResourceGroup</a>()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addConfigVars-org.apache.juneau.rest.RestContextBuilder-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>addConfigVars</h4>
-<pre><a href="../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation">@RestHook</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestHook.html#value--">value</a>=<a href="../../../../org/apache/juneau/rest/annotation/HookEvent.html#INIT">INIT</a>)
-public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.57">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest">RestContextBuilder</a>&nbsp;builder)
-                                         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">Initializes the registry URL and rest clent.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>builder</code> - The resource config.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><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></code></dd>
-</dl>
+<h4>RestServletJenaGroup</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/microservice/RestServletJenaGroup.html#line.40">RestServletJenaGroup</a>()</pre>
 </li>
 </ul>
 </li>
@@ -331,12 +261,12 @@ public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservi
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/microservice/RestServletJenaDefault.html" title="class in org.apache.juneau.microservice"><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/microservice/ResourceGroup.html" target="_top">Frames</a></li>
-<li><a href="ResourceGroup.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/microservice/RestServletJenaGroup.html" target="_top">Frames</a></li>
+<li><a href="RestServletJenaGroup.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>
@@ -359,13 +289,13 @@ public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/microservi
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#methods.inherited.from.class.org.apache.juneau.rest.RestServletGroup">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li>Method</li>
 </ul>
 </div>
 <a name="skip.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
deleted file mode 100644
index c146337..0000000
--- a/content/site/apidocs/org/apache/juneau/microservice/vars/package-frame.html
+++ /dev/null
@@ -1,21 +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>org.apache.juneau.microservice.vars (Apache Juneau 7.1.1-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/vars/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/vars/package-summary.html
deleted file mode 100644
index 20f1daa..0000000
--- a/content/site/apidocs/org/apache/juneau/microservice/vars/package-summary.html
+++ /dev/null
@@ -1,158 +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>org.apache.juneau.microservice.vars (Apache Juneau 7.1.1-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="org.apache.juneau.microservice.vars (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>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/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/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">
-<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>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.apache.juneau.microservice.vars</h1>
-<div class="docSummary">
-<div class="block">Predefined SVL Variables</div>
-</div>
-<p>See:&nbsp;<a href="#package.description">Description</a></p>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<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">JVM args variable resolver.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<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">Manifest file entries variable resolver.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="package.description">
-<!--   -->
-</a>
-<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">
-<!--   -->
-</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 class="navBarCell1Rev">Package</li>
-<li>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/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/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">
-<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>
-<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/microservice/vars/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/vars/package-tree.html
deleted file mode 100644
index cf98314..0000000
--- a/content/site/apidocs/org/apache/juneau/microservice/vars/package-tree.html
+++ /dev/null
@@ -1,149 +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>org.apache.juneau.microservice.vars Class Hierarchy (Apache Juneau 7.1.1-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="org.apache.juneau.microservice.vars Class Hierarchy (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Tree</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/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/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">
-<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>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<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>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
-<ul>
-<li type="circle">org.apache.juneau.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.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>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= 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</li>
-<li class="navBarCell1Rev">Tree</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/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/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">
-<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>
-<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/rest/RestServletGroupDefault.html b/content/site/apidocs/org/apache/juneau/rest/RestServletGroup.html
similarity index 89%
rename from content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
rename to content/site/apidocs/org/apache/juneau/rest/RestServletGroup.html
index c5dd944..a1d6f6d 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServletGroupDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServletGroup.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RestServletGroupDefault (Apache Juneau 7.1.1-SNAPSHOT)</title>
+<title>RestServletGroup (Apache Juneau 7.1.1-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="RestServletGroupDefault (Apache Juneau 7.1.1-SNAPSHOT)";
+            parent.document.title="RestServletGroup (Apache Juneau 7.1.1-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -52,8 +52,8 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../org/apache/juneau/rest/RestUtils.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/rest/RestServletGroupDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletGroupDefault.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/rest/RestServletGroup.html" target="_top">Frames</a></li>
+<li><a href="RestServletGroup.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>
@@ -92,7 +92,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.juneau.rest</div>
-<h2 title="Class RestServletGroupDefault" class="title">Class RestServletGroupDefault</h2>
+<h2 title="Class RestServletGroup" class="title">Class RestServletGroup</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">org.apache.juneau.rest.RestServletDefault</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.rest.RestServletGroupDefault</li>
+<li>org.apache.juneau.rest.RestServletGroup</li>
 </ul>
 </li>
 </ul>
@@ -132,12 +132,12 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a>, <a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">ResourceJenaGroup</a></dd>
+<dd><a href="../../../../org/apache/juneau/microservice/RestServletJenaGroup.html" title="class in org.apache.juneau.microservice">RestServletJenaGroup</a>, <a href="../../../../org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">RootResources</a>, <a href="../../../../org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources">SampleRootResource</a></dd>
 </dl>
 <hr>
 <br>
 <pre><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation">@RestResource</a>
-public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestServletGroupDefault.html#line.36">RestServletGroupDefault</a>
+public class <a href="../../../../src-html/org/apache/juneau/rest/RestServletGroup.html#line.36">RestServletGroup</a>
 extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a></pre>
 <div class="block">Specialized subclass of <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> for showing "group" pages.
  
@@ -154,7 +154,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
  </ul></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.apache.juneau.rest.RestServletGroupDefault">Serialized Form</a></dd>
+<dd><a href="../../../../serialized-form.html#org.apache.juneau.rest.RestServletGroup">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -174,7 +174,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html#RestServletGroupDefault--">RestServletGroupDefault</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestServletGroup.html#RestServletGroup--">RestServletGroup</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -193,7 +193,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels">ChildResourceDescriptions</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RestServletGroup.html#getChildren-org.apache.juneau.rest.RestRequest-">getChildren</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">[GET /] - Get child resources.</div>
 </td>
 </tr>
@@ -247,13 +247,13 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="RestServletGroupDefault--">
+<a name="RestServletGroup--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>RestServletGroupDefault</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestServletGroupDefault.html#line.36">RestServletGroupDefault</a>()</pre>
+<h4>RestServletGroup</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestServletGroup.html#line.36">RestServletGroup</a>()</pre>
 </li>
 </ul>
 </li>
@@ -273,7 +273,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletDefault.html" tit
 <pre><a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
             <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
             <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Child resources")
-public&nbsp;<a href="../../../../org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels">ChildResourceDescriptions</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestServletGroupDefault.html#line.47">getChildren</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+public&nbsp;<a href="../../../../org/apache/juneau/rest/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.rest.labels">ChildResourceDescriptions</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestServletGroup.html#line.47">getChildren</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
                                                                                                                                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">[GET /] - Get child resources.</div>
 <dl>
@@ -317,8 +317,8 @@ public&nbsp;<a href="../../../../org/apache/juneau/rest/labels/ChildResourceDesc
 <li><a href="../../../../org/apache/juneau/rest/RestUtils.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/rest/RestServletGroupDefault.html" target="_top">Frames</a></li>
-<li><a href="RestServletGroupDefault.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/rest/RestServletGroup.html" target="_top">Frames</a></li>
+<li><a href="RestServletGroup.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/microservice/vars/ArgsVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
similarity index 80%
rename from content/site/apidocs/org/apache/juneau/microservice/vars/ArgsVar.html
rename to content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
index f573507..437d538 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/vars/ArgsVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ArgsVar.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":9,"i1":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";
@@ -49,10 +49,10 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</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>
+<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">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ArgsVar.html" target="_top">Frames</a></li>
+<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>
 </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.microservice.vars</div>
+<div class="subTitle">org.apache.juneau.svl.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.microservice.vars.ArgsVar</li>
+<li>org.apache.juneau.svl.vars.ArgsVar</li>
 </ul>
 </li>
 </ul>
@@ -123,28 +123,33 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ArgsVar.html#line.48">ArgsVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.55">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.
  
  <p>
- The format for this var is <js>"$ARG{argNameOrNum}"</js> or <js>"$ARG{argNameOrNum,defaultValue}"</js>
+ The format for this var is <js>"$A{arg[,default]}"</js>.
  
  <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
- session object on the resolver session.
+ This variable resolver requires that the command-line arguments be made available through any of the following:
+ <ul class='spaced-list'>
+   <li><js>"sun.java.command"</js> system property.
+   <li><js>"juneau.args"</js> system property.
+   <li><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#init-org.apache.juneau.utils.Args-"><code>init(Args)</code></a> has been called.
+ </ul>
  
  <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 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);
+   ArgsVar.<jsm>init</jsm>(args);
+ 
+   <jc>// Create a variable resolver that resolves JVM arguments (e.g. "$A{1}")</jc>
+   VarResolver r = <jk>new</jk> VarResolver().addVars(ArgsVar.<js>class</js>);
  
    <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>"Arg #1 is set to $A{1}"</js>));
  </p>
  
  <p>
@@ -175,16 +180,10 @@ 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/microservice/vars/ArgsVar.html#NAME">NAME</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/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/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>
 </table>
 </li>
 </ul>
@@ -200,7 +199,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/microservice/vars/ArgsVar.html#ArgsVar--">ArgsVar</a></span>()</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#ArgsVar--">ArgsVar</a></span>()</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -214,14 +213,20 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </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>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html#init-org.apache.juneau.utils.Args-">init</a></span>(<a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a>&nbsp;args)</code>
+<div class="block">Initialize the args for this variable.</div>
+</td>
+</tr>
+<tr id="i1" 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/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,
+<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,
        <a href="http://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,31 +274,17 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="SESSION_args">
-<!--   -->
-</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/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.microservice.vars.ArgsVar.SESSION_args">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/microservice/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/svl/vars/ArgsVar.html#line.58">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.microservice.vars.ArgsVar.NAME">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ArgsVar.NAME">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -311,7 +302,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/microservice/vars/ArgsVar.html#line.61">ArgsVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.76">ArgsVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -323,13 +314,27 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="init-org.apache.juneau.utils.Args-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>init</h4>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ArgsVar.html#line.67">init</a>(<a href="../../../../../org/apache/juneau/utils/Args.html" title="class in org.apache.juneau.utils">Args</a>&nbsp;args)</pre>
+<div class="block">Initialize the args for this variable.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>args</code> - The parsed command-line arguments.</dd>
+</dl>
+</li>
+</ul>
 <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/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,
+<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.92">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 +377,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/microservice/vars/ManifestFileVar.html" title="class in org.apache.juneau.microservice.vars"><span class="typeNameLink">Next&nbsp;Class</span></a></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">
-<li><a href="../../../../../index.html?org/apache/juneau/microservice/vars/ArgsVar.html" target="_top">Frames</a></li>
+<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>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html b/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
similarity index 80%
rename from content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html
rename to content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
index c94944b..a81db71 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/vars/ManifestFileVar.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/ManifestFileVar.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":9,"i1":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";
@@ -48,11 +48,11 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<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>
+<li><a href="../../../../../org/apache/juneau/svl/vars/LowerCaseVar.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/NotEmptyVar.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/microservice/vars/ManifestFileVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/svl/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.microservice.vars</div>
+<div class="subTitle">org.apache.juneau.svl.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.microservice.vars.ManifestFileVar</li>
+<li>org.apache.juneau.svl.vars.ManifestFileVar</li>
 </ul>
 </li>
 </ul>
@@ -123,25 +123,26 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html#line.48">ManifestFileVar</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.49">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.
  
  <p>
- The format for this var is <js>"$MF{key}"</js> or <js>"$MF{key,defaultValue}"</js>
+ The format for this var is <js>"$MF{key[,default]}"</js>.
  
  <p>
- This variable resolver requires that a <a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object be set as a context object on the resolver or a
- session object on the resolver session.
+ This variable resolver requires that a <a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils"><code>ManifestFile</code></a> object be made available by calling 
+ the <a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html#init-org.apache.juneau.utils.ManifestFile-"><code>init(ManifestFile)</code></a> method.
  
  <h5 class='section'>Example:</h5>
  <p class='bcode'>
    <jc>// Create a ManifestFile object that contains the manifest of the jar file containing this class.</jc>
    ManifestFile mf = <jk>new</jk> ManifestFile(<jk>this</jk>.getClass());
  
+   ManifestFileVar.<jsm>init</jsm>(mf);
+ 
    <jc>// Create a variable resolver that resolves manifest file entries (e.g. "$MF{Main-Class}")</jc>
-   VarResolver r = <jk>new</jk> VarResolver().addVars(ManifestFile.<js>class</js>)
-      .addContextObject(<jsf>SESSION_manifest</jsf>, mf);
+   VarResolver r = <jk>new</jk> VarResolver().addVars(ManifestFile.<js>class</js>);
  
    <jc>// Use it!</jc>
    System.<jsf>out</jsf>.println(r.resolve(<js>"The main class is $MF{Main-Class}"</js>));
@@ -175,16 +176,10 @@ 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/microservice/vars/ManifestFileVar.html#NAME">NAME</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/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/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>
 </table>
 </li>
 </ul>
@@ -200,7 +195,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/microservice/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar</a></span>()</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html#ManifestFileVar--">ManifestFileVar</a></span>()</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -214,14 +209,20 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </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>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html#init-org.apache.juneau.utils.ManifestFile-">init</a></span>(<a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a>&nbsp;manifestFile)</code>
+<div class="block">Initialize the manifest file for this variable.</div>
+</td>
+</tr>
+<tr id="i1" 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/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,
+<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,
        <a href="http://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,31 +270,17 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="SESSION_manifest">
-<!--   -->
-</a>
-<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/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.microservice.vars.ManifestFileVar.SESSION_manifest">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/microservice/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/svl/vars/ManifestFileVar.html#line.52">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.microservice.vars.ManifestFileVar.NAME">Constant Field Values</a></dd>
+<dd><a href="../../../../../constant-values.html#org.apache.juneau.svl.vars.ManifestFileVar.NAME">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -311,7 +298,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/microservice/vars/ManifestFileVar.html#line.61">ManifestFileVar</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.70">ManifestFileVar</a>()</pre>
 <div class="block">Constructor.</div>
 </li>
 </ul>
@@ -323,13 +310,27 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="init-org.apache.juneau.utils.ManifestFile-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>init</h4>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/svl/vars/ManifestFileVar.html#line.61">init</a>(<a href="../../../../../org/apache/juneau/utils/ManifestFile.html" title="class in org.apache.juneau.utils">ManifestFile</a>&nbsp;manifestFile)</pre>
+<div class="block">Initialize the manifest file for this variable.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>manifestFile</code> - The parsed manifest file.</dd>
+</dl>
+</li>
+</ul>
 <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/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,
+<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.76">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 +372,11 @@ extends <a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title=
 </div>
 <div class="subNav">
 <ul class="navList">
-<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>
+<li><a href="../../../../../org/apache/juneau/svl/vars/LowerCaseVar.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/NotEmptyVar.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/microservice/vars/ManifestFileVar.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/juneau/svl/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/src-html/org/apache/juneau/microservice/Resource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
deleted file mode 100644
index 42cd61b..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Resource.html
+++ /dev/null
@@ -1,137 +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.microservice;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.rest.annotation.HookEvent.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.microservice.vars.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.rest.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.rest.annotation.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Superclass for all REST resources.<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> * In additional to the functionality of the {@link RestServletDefault} group,<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * augments the {@link RestContext#getVarResolver()} method with the following additional variable types:<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;ul class='spaced-list'&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *    &lt;li&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *       &lt;code class='snippet'&gt;$ARG{...}&lt;/code&gt; - Command line arguments pulled from {@link Microservice#getArgs()}.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *       <a name="line.30"></a>
-<span class="sourceLineNo">031</span> *       &lt;h5 class='figure'&gt;Example:&lt;/h5&gt;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       &lt;p class='bcode'&gt;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *    String firstArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{0}"&lt;/js&gt;);  &lt;jc&gt;// First argument.&lt;/jc&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    String namedArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{myarg}"&lt;/js&gt;);  &lt;jc&gt;// Named argument (e.g. "myarg=foo"). &lt;/jc&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       &lt;/p&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *    &lt;li&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *       &lt;code class='snippet'&gt;$MF{...}&lt;/code&gt; - Manifest file entries pulled from {@link Microservice#getManifest()}.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       <a name="line.38"></a>
-<span class="sourceLineNo">039</span> *       &lt;h5 class='figure'&gt;Example:&lt;/h5&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *       &lt;p class='bcode'&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *    String mainClass = request.getVarResolver().resolve(&lt;js&gt;"$MF{Main-Class}"&lt;/js&gt;);  &lt;jc&gt;// Main class. &lt;/jc&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       &lt;/p&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;/ul&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@SuppressWarnings("serial")<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@RestResource<a name="line.46"></a>
-<span class="sourceLineNo">047</span>public abstract class Resource extends RestServletDefault {<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>   /**<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * Add &lt;code&gt;$ARGS&lt;/code&gt; and &lt;code&gt;$MF&lt;/code&gt; variable resolvers.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * <a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * @param builder The resource config.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * @throws Exception<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   @RestHook(INIT) <a name="line.55"></a>
-<span class="sourceLineNo">056</span>   public void addConfigVars(RestContextBuilder builder) throws Exception {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      Microservice m = Microservice.getInstance();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      if (m != null) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         builder<a name="line.59"></a>
-<span class="sourceLineNo">060</span>            .vars(ArgsVar.class, ManifestFileVar.class)<a name="line.60"></a>
-<span class="sourceLineNo">061</span>            .varContextObject(ArgsVar.SESSION_args, m.getArgs())<a name="line.61"></a>
-<span class="sourceLineNo">062</span>            .varContextObject(ManifestFileVar.SESSION_manifest, m.getManifest());<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>}<a name="line.65"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
deleted file mode 100644
index 45de815..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceGroup.html
+++ /dev/null
@@ -1,138 +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.microservice;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.rest.annotation.HookEvent.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.microservice.vars.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.rest.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.rest.annotation.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Superclass for all REST resource groups.<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> * In additional to the functionality of the {@link RestServletGroupDefault} group,<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * augments the {@link RestContext#getVarResolver()} method with the following additional variable types:<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * &lt;ul class='spaced-list'&gt;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *    &lt;li&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *       &lt;jk&gt;$ARG{...}&lt;/jk&gt; - Command line arguments.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *       &lt;br&gt;Resolves values from {@link Microservice#getArgs()}.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *       <a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       &lt;h5&gt;Example:&lt;/h5&gt;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *       &lt;p class='bcode'&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    String firstArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{0}"&lt;/js&gt;);  &lt;jc&gt;// First argument.&lt;/jc&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *    String namedArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{myarg}"&lt;/js&gt;);  &lt;jc&gt;// Named argument (e.g. "myarg=foo"). &lt;/jc&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *       &lt;/p&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;li&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       &lt;jk&gt;$MF{...}&lt;/jk&gt; - Manifest file entries.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *       <a name="line.39"></a>
-<span class="sourceLineNo">040</span> *       &lt;h5&gt;Example:&lt;/h5&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *       &lt;p class='bcode'&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *    String mainClass = request.getVarResolver().resolve(&lt;js&gt;"$MF{Main-Class}"&lt;/js&gt;);  &lt;jc&gt;// Main class. &lt;/jc&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *       &lt;/p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * &lt;/ul&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@SuppressWarnings("serial")<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@RestResource<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public abstract class ResourceGroup extends RestServletGroupDefault {<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>    * Initializes the registry URL and rest clent.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * <a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * @param builder The resource config.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * @throws Exception<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   @RestHook(INIT) <a name="line.56"></a>
-<span class="sourceLineNo">057</span>   public void addConfigVars(RestContextBuilder builder) throws Exception {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      Microservice m = Microservice.getInstance();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      if (m != null) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         builder<a name="line.60"></a>
-<span class="sourceLineNo">061</span>            .vars(ArgsVar.class, ManifestFileVar.class)<a name="line.61"></a>
-<span class="sourceLineNo">062</span>            .varContextObject(ArgsVar.SESSION_args, m.getArgs())<a name="line.62"></a>
-<span class="sourceLineNo">063</span>            .varContextObject(ManifestFileVar.SESSION_manifest, m.getManifest());<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>}<a name="line.66"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
deleted file mode 100644
index 1eb7faf..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJenaGroup.html
+++ /dev/null
@@ -1,162 +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.microservice;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.rest.annotation.HookEvent.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.html.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.jena.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.microservice.vars.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.rest.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.rest.annotation.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Superclass for all REST resource groups.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * In additional to the functionality of the {@link RestServletGroupDefault} group,<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * augments the {@link RestContext#getVarResolver()} method with the following additional variable types:<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * &lt;ul class='spaced-list'&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *    &lt;li&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *       &lt;jk&gt;$ARG{...}&lt;/jk&gt; - Command line arguments.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       &lt;br&gt;Resolves values from {@link Microservice#getArgs()}.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *       <a name="line.33"></a>
-<span class="sourceLineNo">034</span> *       &lt;h5&gt;Example:&lt;/h5&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       &lt;p class='bcode'&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *    String firstArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{0}"&lt;/js&gt;);  &lt;jc&gt;// First argument.&lt;/jc&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    String namedArg = request.getVarResolver().resolve(&lt;js&gt;"$ARG{myarg}"&lt;/js&gt;);  &lt;jc&gt;// Named argument (e.g. "myarg=foo"). &lt;/jc&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       &lt;/p&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *    &lt;li&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *       &lt;jk&gt;$MF{...}&lt;/jk&gt; - Manifest file entries.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *       <a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       &lt;h5&gt;Example:&lt;/h5&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *       &lt;p class='bcode'&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *    String mainClass = request.getVarResolver().resolve(&lt;js&gt;"$MF{Main-Class}"&lt;/js&gt;);  &lt;jc&gt;// Main class. &lt;/jc&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *       &lt;/p&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * &lt;/ul&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@SuppressWarnings("serial")<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@RestResource(<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   htmldoc=@HtmlDoc(<a name="line.50"></a>
-<span class="sourceLineNo">051</span>      navlinks={<a name="line.51"></a>
-<span class="sourceLineNo">052</span>         "up: request:/..",<a name="line.52"></a>
-<span class="sourceLineNo">053</span>         "options: servlet:/?method=OPTIONS"<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>   config="$S{juneau.configFile}",<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   serializers={<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      HtmlDocSerializer.class,  // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      RdfSerializer.Xml.class,<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      RdfSerializer.XmlAbbrev.class,<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      RdfSerializer.Turtle.class,<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      RdfSerializer.NTriple.class,<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      RdfSerializer.N3.class<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   },<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   parsers={<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      RdfParser.Xml.class,<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      RdfParser.Turtle.class,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      RdfParser.NTriple.class,<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      RdfParser.N3.class<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>public abstract class ResourceJenaGroup extends RestServletGroupDefault {<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>   /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * Add &lt;code&gt;$ARGS&lt;/code&gt; and &lt;code&gt;$MF&lt;/code&gt; variable resolvers.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * <a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @param builder The resource config.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * @throws Exception<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   @RestHook(INIT) <a name="line.80"></a>
-<span class="sourceLineNo">081</span>   public void addConfigVars(RestContextBuilder builder) throws Exception {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      Microservice m = Microservice.getInstance();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      if (m != null) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         builder<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            .vars(ArgsVar.class, ManifestFileVar.class)<a name="line.85"></a>
-<span class="sourceLineNo">086</span>            .varContextObject(ArgsVar.SESSION_args, m.getArgs())<a name="line.86"></a>
-<span class="sourceLineNo">087</span>            .varContextObject(ManifestFileVar.SESSION_manifest, m.getManifest());<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      }<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>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaDefault.html
similarity index 61%
copy from content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
copy to content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaDefault.html
index b876ebf..d60bad3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaDefault.html
@@ -26,34 +26,26 @@
 <span class="sourceLineNo">018</span>import org.apache.juneau.rest.annotation.*;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Superclass for all REST resources with RDF support.<a name="line.21"></a>
+<span class="sourceLineNo">021</span> * Resource servlet with additional RDF support.<a name="line.21"></a>
 <span class="sourceLineNo">022</span> */<a name="line.22"></a>
 <span class="sourceLineNo">023</span>@SuppressWarnings("serial")<a name="line.23"></a>
 <span class="sourceLineNo">024</span>@RestResource(<a name="line.24"></a>
-<span class="sourceLineNo">025</span>   htmldoc=@HtmlDoc(<a name="line.25"></a>
-<span class="sourceLineNo">026</span>      navlinks={<a name="line.26"></a>
-<span class="sourceLineNo">027</span>         "up: request:/..",<a name="line.27"></a>
-<span class="sourceLineNo">028</span>         "options: servlet:/?method=OPTIONS"<a name="line.28"></a>
-<span class="sourceLineNo">029</span>      },<a name="line.29"></a>
-<span class="sourceLineNo">030</span>      stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   ),<a name="line.31"></a>
-<span class="sourceLineNo">032</span>   config="$S{juneau.configFile}",<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   serializers={<a name="line.33"></a>
-<span class="sourceLineNo">034</span>      HtmlDocSerializer.class,  // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.34"></a>
-<span class="sourceLineNo">035</span>      RdfSerializer.Xml.class,<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      RdfSerializer.XmlAbbrev.class,<a name="line.36"></a>
-<span class="sourceLineNo">037</span>      RdfSerializer.Turtle.class,<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      RdfSerializer.NTriple.class,<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      RdfSerializer.N3.class<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   },<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   parsers={<a name="line.41"></a>
-<span class="sourceLineNo">042</span>      RdfParser.Xml.class,<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      RdfParser.Turtle.class,<a name="line.43"></a>
-<span class="sourceLineNo">044</span>      RdfParser.NTriple.class,<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      RdfParser.N3.class<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   }<a name="line.46"></a>
-<span class="sourceLineNo">047</span>)<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public abstract class ResourceJena extends RestServletDefault {}<a name="line.48"></a>
+<span class="sourceLineNo">025</span>   serializers={<a name="line.25"></a>
+<span class="sourceLineNo">026</span>      HtmlDocSerializer.class,  // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.26"></a>
+<span class="sourceLineNo">027</span>      RdfSerializer.Xml.class,<a name="line.27"></a>
+<span class="sourceLineNo">028</span>      RdfSerializer.XmlAbbrev.class,<a name="line.28"></a>
+<span class="sourceLineNo">029</span>      RdfSerializer.Turtle.class,<a name="line.29"></a>
+<span class="sourceLineNo">030</span>      RdfSerializer.NTriple.class,<a name="line.30"></a>
+<span class="sourceLineNo">031</span>      RdfSerializer.N3.class<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   },<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   parsers={<a name="line.33"></a>
+<span class="sourceLineNo">034</span>      RdfParser.Xml.class,<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      RdfParser.Turtle.class,<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      RdfParser.NTriple.class,<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      RdfParser.N3.class<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   }<a name="line.38"></a>
+<span class="sourceLineNo">039</span>)<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public abstract class RestServletJenaDefault extends RestServletDefault {}<a name="line.40"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaGroup.html
similarity index 61%
rename from content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
rename to content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaGroup.html
index b876ebf..6aeb99e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/RestServletJenaGroup.html
@@ -26,34 +26,26 @@
 <span class="sourceLineNo">018</span>import org.apache.juneau.rest.annotation.*;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Superclass for all REST resources with RDF support.<a name="line.21"></a>
+<span class="sourceLineNo">021</span> * Resource group with additional RDF support.<a name="line.21"></a>
 <span class="sourceLineNo">022</span> */<a name="line.22"></a>
 <span class="sourceLineNo">023</span>@SuppressWarnings("serial")<a name="line.23"></a>
 <span class="sourceLineNo">024</span>@RestResource(<a name="line.24"></a>
-<span class="sourceLineNo">025</span>   htmldoc=@HtmlDoc(<a name="line.25"></a>
-<span class="sourceLineNo">026</span>      navlinks={<a name="line.26"></a>
-<span class="sourceLineNo">027</span>         "up: request:/..",<a name="line.27"></a>
-<span class="sourceLineNo">028</span>         "options: servlet:/?method=OPTIONS"<a name="line.28"></a>
-<span class="sourceLineNo">029</span>      },<a name="line.29"></a>
-<span class="sourceLineNo">030</span>      stylesheet="$C{REST/stylesheet,servlet:/styles/devops.css}"<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   ),<a name="line.31"></a>
-<span class="sourceLineNo">032</span>   config="$S{juneau.configFile}",<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   serializers={<a name="line.33"></a>
-<span class="sourceLineNo">034</span>      HtmlDocSerializer.class,  // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.34"></a>
-<span class="sourceLineNo">035</span>      RdfSerializer.Xml.class,<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      RdfSerializer.XmlAbbrev.class,<a name="line.36"></a>
-<span class="sourceLineNo">037</span>      RdfSerializer.Turtle.class,<a name="line.37"></a>
-<span class="sourceLineNo">038</span>      RdfSerializer.NTriple.class,<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      RdfSerializer.N3.class<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   },<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   parsers={<a name="line.41"></a>
-<span class="sourceLineNo">042</span>      RdfParser.Xml.class,<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      RdfParser.Turtle.class,<a name="line.43"></a>
-<span class="sourceLineNo">044</span>      RdfParser.NTriple.class,<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      RdfParser.N3.class<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   }<a name="line.46"></a>
-<span class="sourceLineNo">047</span>)<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public abstract class ResourceJena extends RestServletDefault {}<a name="line.48"></a>
+<span class="sourceLineNo">025</span>   serializers={<a name="line.25"></a>
+<span class="sourceLineNo">026</span>      HtmlDocSerializer.class,  // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.26"></a>
+<span class="sourceLineNo">027</span>      RdfSerializer.Xml.class,<a name="line.27"></a>
+<span class="sourceLineNo">028</span>      RdfSerializer.XmlAbbrev.class,<a name="line.28"></a>
+<span class="sourceLineNo">029</span>      RdfSerializer.Turtle.class,<a name="line.29"></a>
+<span class="sourceLineNo">030</span>      RdfSerializer.NTriple.class,<a name="line.30"></a>
+<span class="sourceLineNo">031</span>      RdfSerializer.N3.class<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   },<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   parsers={<a name="line.33"></a>
+<span class="sourceLineNo">034</span>      RdfParser.Xml.class,<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      RdfParser.Turtle.class,<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      RdfParser.NTriple.class,<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      RdfParser.N3.class<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   }<a name="line.38"></a>
+<span class="sourceLineNo">039</span>)<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public abstract class RestServletJenaGroup extends RestServletGroup {}<a name="line.40"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ArgsVar.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ArgsVar.html
deleted file mode 100644
index 8312cde..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ArgsVar.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.microservice.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.svl.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.utils.*;<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> * JVM args 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;"$ARG{argNameOrNum}"&lt;/js&gt; or &lt;js&gt;"$ARG{argNameOrNum,defaultValue}"&lt;/js&gt;<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 an {@link Args} 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 an args object from the main(String[]) method.&lt;/jc&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *    Args args = new Args(argv);<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 JVM arguments (e.g. "$ARG{1}")&lt;/jc&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    VarResolver r = &lt;jk&gt;new&lt;/jk&gt; VarResolver().addVars(ArgsVar.&lt;js&gt;class&lt;/js&gt;)<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       .addContextObject(&lt;jsf&gt;SESSION_args&lt;/jsf&gt;, args);<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;"Arg #1 is set to $ARG{1}"&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.utils.Args<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 ArgsVar 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 Args} 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_args = "args";<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 = "ARG";<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 ArgsVar() {<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(Args.class, SESSION_args).getArg(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/rest/RestServletGroupDefault.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletGroup.html
similarity index 97%
rename from content/site/apidocs/src-html/org/apache/juneau/rest/RestServletGroupDefault.html
rename to content/site/apidocs/src-html/org/apache/juneau/rest/RestServletGroup.html
index 89b4f13..5c133b3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletGroupDefault.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletGroup.html
@@ -41,7 +41,7 @@
 <span class="sourceLineNo">033</span> * &lt;/ul&gt;<a name="line.33"></a>
 <span class="sourceLineNo">034</span> */<a name="line.34"></a>
 <span class="sourceLineNo">035</span>@RestResource<a name="line.35"></a>
-<span class="sourceLineNo">036</span>public abstract class RestServletGroupDefault extends RestServletDefault {<a name="line.36"></a>
+<span class="sourceLineNo">036</span>public class RestServletGroup extends RestServletDefault {<a name="line.36"></a>
 <span class="sourceLineNo">037</span>   private static final long serialVersionUID = 1L;<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
 <span class="sourceLineNo">039</span>   /**<a name="line.39"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
new file mode 100644
index 0000000..d06fae9
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
@@ -0,0 +1,167 @@
+<!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.svl.vars;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.svl.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.utils.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * JVM args variable resolver.<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * <a name="line.22"></a>
+<span class="sourceLineNo">023</span> * &lt;p&gt;<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * The format for this var is &lt;js&gt;"$A{arg[,default]}"&lt;/js&gt;.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <a name="line.25"></a>
+<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * This variable resolver requires that the command-line arguments be made available through any of the following:<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;ul class='spaced-list'&gt;<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *    &lt;li&gt;&lt;js&gt;"sun.java.command"&lt;/js&gt; system property.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *    &lt;li&gt;&lt;js&gt;"juneau.args"&lt;/js&gt; system property.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *    &lt;li&gt;{@link #init(Args)} has been called.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * &lt;/ul&gt;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <a name="line.33"></a>
+<span class="sourceLineNo">034</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;p class='bcode'&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    &lt;jc&gt;// Create an args object from the main(String[]) method.&lt;/jc&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *    Args args = new Args(argv);<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <a name="line.38"></a>
+<span class="sourceLineNo">039</span> *    ArgsVar.&lt;jsm&gt;init&lt;/jsm&gt;(args);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;jc&gt;// Create a variable resolver that resolves JVM arguments (e.g. "$A{1}")&lt;/jc&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *    VarResolver r = &lt;jk&gt;new&lt;/jk&gt; VarResolver().addVars(ArgsVar.&lt;js&gt;class&lt;/js&gt;);<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <a name="line.43"></a>
+<span class="sourceLineNo">044</span> *    &lt;jc&gt;// Use it!&lt;/jc&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *    System.&lt;jsf&gt;out&lt;/jsf&gt;.println(r.resolve(&lt;js&gt;"Arg #1 is set to $A{1}"&lt;/js&gt;));<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * &lt;/p&gt;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <a name="line.47"></a>
+<span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @see org.apache.juneau.utils.Args<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @see org.apache.juneau.svl<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class ArgsVar extends DefaultingVar {<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>   /** The name of this variable. */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   public static final String NAME = "A";<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   <a name="line.59"></a>
+<span class="sourceLineNo">060</span>   private static volatile Args ARGS;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   <a name="line.61"></a>
+<span class="sourceLineNo">062</span>   /**<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * Initialize the args for this variable.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * <a name="line.64"></a>
+<span class="sourceLineNo">065</span>    * @param args The parsed command-line arguments.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   public static void init(Args args) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      ARGS = args;<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>   private final Args args;<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>   /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * Constructor.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   public ArgsVar() {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      super(NAME);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      if (ARGS != null)<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         this.args = ARGS;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      else {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>         String s = System.getProperty("sun.java.command");<a name="line.81"></a>
+<span class="sourceLineNo">082</span>         if (! isEmpty(s)) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>            int i = s.indexOf(' ');<a name="line.83"></a>
+<span class="sourceLineNo">084</span>            args = new Args(i == -1 ? "" : s.substring(i+1));<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         } else {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            args = new Args(System.getProperty("juneau.args"));<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         }<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      }<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 /* Var */<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   public String resolve(VarResolverSession session, String key) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      return args.getArg(key);<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
similarity index 52%
rename from content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html
rename to content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
index 05318d0..d885ef2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/vars/ManifestFileVar.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
@@ -18,7 +18,7 @@
 <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.microservice.vars;<a name="line.13"></a>
+<span class="sourceLineNo">013</span>package org.apache.juneau.svl.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.svl.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span>import org.apache.juneau.utils.*;<a name="line.16"></a>
@@ -27,54 +27,64 @@
 <span class="sourceLineNo">019</span> * Manifest file entries 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;"$MF{key}"&lt;/js&gt; or &lt;js&gt;"$MF{key,defaultValue}"&lt;/js&gt;<a name="line.22"></a>
+<span class="sourceLineNo">022</span> * The format for this var is &lt;js&gt;"$MF{key[,default]}"&lt;/js&gt;.<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 ManifestFile} 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">025</span> * This variable resolver requires that a {@link ManifestFile} object be made available by calling <a name="line.25"></a>
+<span class="sourceLineNo">026</span> * the {@link #init(ManifestFile)} method.<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 ManifestFile object that contains the manifest of the jar file containing this class.&lt;/jc&gt;<a name="line.30"></a>
 <span class="sourceLineNo">031</span> *    ManifestFile mf = &lt;jk&gt;new&lt;/jk&gt; ManifestFile(&lt;jk&gt;this&lt;/jk&gt;.getClass());<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 manifest file entries (e.g. "$MF{Main-Class}")&lt;/jc&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    VarResolver r = &lt;jk&gt;new&lt;/jk&gt; VarResolver().addVars(ManifestFile.&lt;js&gt;class&lt;/js&gt;)<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       .addContextObject(&lt;jsf&gt;SESSION_manifest&lt;/jsf&gt;, mf);<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;"The main class is $MF{Main-Class}"&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.utils.ManifestFile<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 ManifestFileVar 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 ManifestFile} 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_manifest = "manifest";<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 = "MF";<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">033</span> *    ManifestFileVar.&lt;jsm&gt;init&lt;/jsm&gt;(mf);<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <a name="line.34"></a>
+<span class="sourceLineNo">035</span> *    &lt;jc&gt;// Create a variable resolver that resolves manifest file entries (e.g. "$MF{Main-Class}")&lt;/jc&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    VarResolver r = &lt;jk&gt;new&lt;/jk&gt; VarResolver().addVars(ManifestFile.&lt;js&gt;class&lt;/js&gt;);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;jc&gt;// Use it!&lt;/jc&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *    System.&lt;jsf&gt;out&lt;/jsf&gt;.println(r.resolve(&lt;js&gt;"The main class is $MF{Main-Class}"&lt;/js&gt;));<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * &lt;/p&gt;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <a name="line.41"></a>
+<span class="sourceLineNo">042</span> * &lt;p&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @see org.apache.juneau.utils.ManifestFile<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * @see org.apache.juneau.svl<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>public class ManifestFileVar extends DefaultingVar {<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>   /** The name of this variable. */<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   public static final String NAME = "MF";<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   private static volatile ManifestFile MANIFEST_FILE;<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>    * Initialize the manifest file for this variable.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * <a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * @param manifestFile The parsed manifest file.<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   public ManifestFileVar() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      super(NAME);<a name="line.62"></a>
+<span class="sourceLineNo">061</span>   public static void init(ManifestFile manifestFile) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      MANIFEST_FILE = manifestFile;<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(ManifestFile.class, SESSION_manifest).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>
+<span class="sourceLineNo">064</span>   <a name="line.64"></a>
+<span class="sourceLineNo">065</span>   private final ManifestFile manifestFile;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   <a name="line.66"></a>
+<span class="sourceLineNo">067</span>   /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    * Constructor.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   public ManifestFileVar() {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      super(NAME);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      this.manifestFile = MANIFEST_FILE;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>   @Override /* Var */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   public String resolve(VarResolverSession session, String key) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      return manifestFile == null ? "" : manifestFile.getString(key);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>}<a name="line.79"></a>
 
 
 

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message