You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/14 00:27:59 UTC
[23/25] incubator-juneau-website git commit: Add @RestHook support.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
index 4d3e47b..8f30bb6 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceGroup.html
@@ -143,7 +143,7 @@ var activeTableTab = "activeTableTab";
<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}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.55">ResourceGroup</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.58">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.
@@ -209,8 +209,8 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
</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#init-org.apache.juneau.rest.RestConfig-">init</a></span>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)</code>
-<div class="block">Resource initialization method.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceGroup.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></span>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)</code>
+<div class="block">Initializes the registry URL and rest clent.</div>
</td>
</tr>
</table>
@@ -233,7 +233,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
<!-- -->
</a>
<h3>Methods inherited from class 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#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-ja
va.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-ja
va.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
@@ -276,7 +276,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceGroup</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.55">ResourceGroup</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.58">ResourceGroup</a>()</pre>
</li>
</ul>
</li>
@@ -287,38 +287,21 @@ extends <a href="../../../../org/apache/juneau/rest/RestServletGroupDefault.html
<!-- -->
</a>
<h3>Method Detail</h3>
-<a name="init-org.apache.juneau.rest.RestConfig-">
+<a name="addConfigVars-org.apache.juneau.rest.RestConfig-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>init</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.58">init</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">RestServlet</a></code></span></div>
-<div class="block">Resource initialization method.
-
- <p>
- Identical to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true#init-javax.servlet.ServletConfig-" title="class or interface in javax.servlet"><code>Servlet.init(ServletConfig)</code></a> except the config object provides access to the external config
- file, configuration properties, and variable resolver defined for this resource.
-
- <p>
- Classes can also use <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#init--" title="class or interface in javax.servlet"><code>GenericServlet.init()</code></a> and <a href="../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--"><code>RestServlet.getServletConfig()</code></a> as well to perform
- initialization.
-
- <p>
- Note that if you override this method, you must first call <code><jk>super</jk>.init(servletConfig)</code>!
-
- <p>
- Resource classes that don't extend from <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> can add this method to their class to get access to
- the config object.</div>
+<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 void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceGroup.html#line.67">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
+ 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="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">init</a></code> in class <code><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>config</code> - The servlet configuration.</dd>
+<dd><code>config</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> - Any exception can be thrown to signal an initialization failure.</dd>
+<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
index 34a75a5..90def9e 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceJena.html
@@ -176,7 +176,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaDefault.
<!-- -->
</a>
<h3>Methods inherited from class 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#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-jav
a.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-ja
va.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html b/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
index cdbd461..1a424d9 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/ResourceJenaGroup.html
@@ -139,7 +139,7 @@ var activeTableTab = "activeTableTab";
<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}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.56">ResourceJenaGroup</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.59">ResourceJenaGroup</a>
extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a></pre>
<div class="block">Superclass for all REST resource groups.
@@ -205,8 +205,8 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
</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#init-org.apache.juneau.rest.RestConfig-">init</a></span>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)</code>
-<div class="block">Resource initialization method.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/ResourceJenaGroup.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></span>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)</code>
+<div class="block">Add <code>$ARGS</code> and <code>$MF</code> variable resolvers.</div>
</td>
</tr>
</table>
@@ -229,7 +229,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
<!-- -->
</a>
<h3>Methods inherited from class 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#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-ja
va.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#log-ja
va.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
@@ -272,7 +272,7 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
<ul class="blockListLast">
<li class="blockList">
<h4>ResourceJenaGroup</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.56">ResourceJenaGroup</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.59">ResourceJenaGroup</a>()</pre>
</li>
</ul>
</li>
@@ -283,38 +283,21 @@ extends <a href="../../../../org/apache/juneau/rest/jena/RestServletJenaGroupDef
<!-- -->
</a>
<h3>Method Detail</h3>
-<a name="init-org.apache.juneau.rest.RestConfig-">
+<a name="addConfigVars-org.apache.juneau.rest.RestConfig-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>init</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.59">init</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
- throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">RestServlet</a></code></span></div>
-<div class="block">Resource initialization method.
-
- <p>
- Identical to <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true#init-javax.servlet.ServletConfig-" title="class or interface in javax.servlet"><code>Servlet.init(ServletConfig)</code></a> except the config object provides access to the external config
- file, configuration properties, and variable resolver defined for this resource.
-
- <p>
- Classes can also use <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true#init--" title="class or interface in javax.servlet"><code>GenericServlet.init()</code></a> and <a href="../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--"><code>RestServlet.getServletConfig()</code></a> as well to perform
- initialization.
-
- <p>
- Note that if you override this method, you must first call <code><jk>super</jk>.init(servletConfig)</code>!
-
- <p>
- Resource classes that don't extend from <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> can add this method to their class to get access to
- the config object.</div>
+<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 void <a href="../../../../src-html/org/apache/juneau/microservice/ResourceJenaGroup.html#line.68">addConfigVars</a>(<a href="../../../../org/apache/juneau/rest/RestConfig.html" title="class in org.apache.juneau.rest">RestConfig</a> config)
+ 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="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">init</a></code> in class <code><a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>config</code> - The servlet configuration.</dd>
+<dd><code>config</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> - Any exception can be thrown to signal an initialization failure.</dd>
+<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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html b/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
index 1ea90db..dad42fa 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/RestMicroservice.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":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";
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.79">RestMicroservice</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.74">RestMicroservice</a>
extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></pre>
<div class="block">Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.
@@ -226,84 +226,84 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</td>
</tr>
<tr id="i6" class="altColor">
-<td class="colFirst"><code>org.eclipse.jetty.servlet.ServletContextHandler</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#getServletContextHandler--">getServletContextHandler</a></span>()</code>
-<div class="block">Returns the underlying servlet context handler.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#getURI--">getURI</a></span>()</code>
<div class="block">Returns the URI where this microservice is listening on.</div>
</td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#initLogging--">initLogging</a></span>()</code>
<div class="block">Initialize the logging for this microservice.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#join--">join</a></span>()</code>
<div class="block">Joins the application with the current thread.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#main-java.lang.String:A-">main</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)</code>
<div class="block">Main method.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onConfigSave-org.apache.juneau.ini.ConfigFile-">onConfigSave</a></span>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</code>
<div class="block">Called when <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onCreateServer--">onCreateServer</a></span>()</code>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a> is called.</div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onPostStartServer--">onPostStartServer</a></span>()</code>
<div class="block">Called after the Jetty server is started.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onPostStopServer--">onPostStopServer</a></span>()</code>
<div class="block">Called after the Jetty server is stopped.</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onStartServer--">onStartServer</a></span>()</code>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#startServer--"><code>startServer()</code></a> is called.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#onStopServer--">onStopServer</a></span>()</code>
<div class="block">Called before the Jetty server is stopped.</div>
</td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">setConfig</a></span>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</code>
<div class="block">Specifies the config file for this microservice.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setConfig-java.lang.String-boolean-">setConfig</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> cfPath,
boolean create)</code>
<div class="block">Specifies the path of the config file for this microservice.</div>
</td>
</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setJettyXml-java.lang.Object-">setJettyXml</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> jettyXml)</code>
+<div class="block">Sets the <code>jetty.xml</code> used to configure the Jetty server.</div>
+</td>
+</tr>
<tr id="i19" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#setManifest-java.lang.Class-">setManifest</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</code>
@@ -382,7 +382,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>RestMicroservice</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.106">RestMicroservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... args)
+<pre>public <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.102">RestMicroservice</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Constructor.</div>
<dl>
@@ -407,7 +407,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.96">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.92">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Main method.
@@ -427,7 +427,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>start</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.116">start</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.112">start</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#start--">Microservice</a></code></span></div>
<div class="block">Start this application.
@@ -453,7 +453,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.125">join</a>()
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.126">join</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#join--">Microservice</a></code></span></div>
<div class="block">Joins the application with the current thread.
@@ -476,7 +476,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>stop</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.131">stop</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.132">stop</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#stop--">Microservice</a></code></span></div>
<div class="block">Stop this application.
@@ -499,7 +499,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getPort</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.167">getPort</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.168">getPort</a>()</pre>
<div class="block">Returns the port that this microservice started up on.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -513,7 +513,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getURI</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.175">getURI</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.176">getURI</a>()</pre>
<div class="block">Returns the URI where this microservice is listening on.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -527,7 +527,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>initLogging</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.262">initLogging</a>()
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.263">initLogging</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Initialize the logging for this microservice.
@@ -610,7 +610,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>createServer</h4>
-<pre>protected org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.351">createServer</a>()
+<pre>protected org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.324">createServer</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Method used to create (but not start) an instance of a Jetty server.
@@ -618,7 +618,8 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
Subclasses can override this method to customize the Jetty server before it is started.
<p>
- The default implementation is configured by the following values in the config file:
+ The default implementation is configured by the following values in the config file
+ if a jetty.xml is not specified via a <code>REST/jettyXml</code> setting:
<p class='bcode'>
<cc>#================================================================================
# REST settings
@@ -635,37 +636,8 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
# Default is Rest-ContextPath in manifest file, or "/".</cc>
<ck>contextPath</ck> =
- <cc># Authentication: NONE, BASIC.
- # Default is Rest-AuthType in manifest file, or NONE.</cc>
- <ck>authType</ck> = NONE
-
- <cc># The BASIC auth username.
- # Default is Rest-LoginUser in manifest file.</cc>
- <ck>loginUser</ck> =
-
- <cc># The BASIC auth password.
- # Default is Rest-LoginPassword in manifest file.</cc>
- <ck>loginPassword</ck> =
-
- <cc># The BASIC auth realm.
- # Default is Rest-AuthRealm in manifest file.</cc>
- <ck>authRealm</ck> =
-
<cc># Enable SSL support.</cc>
- <ck>useSsl</ck> = false
-
- <cc>#================================================================================
- # Bean properties on the org.eclipse.jetty.util.ssl.SslSocketFactory class
- #--------------------------------------------------------------------------------
- # Ignored if REST/useSsl is false.
- #================================================================================</cc>
- <cs>[REST-SslContextFactory]</cs>
- <ck>keyStorePath</ck> = client_keystore.jks
- <ck>keyStorePassword*</ck> = {HRAaRQoT}
- <ck>excludeCipherSuites</ck> = TLS_DHE.*, TLS_EDH.*
- <ck>excludeProtocols</ck> = SSLv3
- <ck>allowRenegotiate</ck> = false
- </p></div>
+ <ck>useSsl</ck> = false</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>The newly-created server.</dd>
@@ -680,7 +652,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>addServlet</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.420">addServlet</a>(<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a> servlet,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.381">addServlet</a>(<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a> servlet,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pathSpec)</pre>
<div class="block">Adds an arbitrary servlet to this microservice.</div>
<dl>
@@ -700,7 +672,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>addServletAttribute</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.436">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.397">addServletAttribute</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Adds a servlet attribute to the Jetty server.</div>
<dl>
@@ -720,7 +692,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getServer</h4>
-<pre>public org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.448">getServer</a>()</pre>
+<pre>public org.eclipse.jetty.server.Server <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.409">getServer</a>()</pre>
<div class="block">Returns the underlying Jetty server.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -728,27 +700,13 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</dl>
</li>
</ul>
-<a name="getServletContextHandler--">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getServletContextHandler</h4>
-<pre>public org.eclipse.jetty.servlet.ServletContextHandler <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.457">getServletContextHandler</a>()</pre>
-<div class="block">Returns the underlying servlet context handler.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The underlying servlet context handler, or <jk>null</jk> if <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a> has not yet been called.</dd>
-</dl>
-</li>
-</ul>
<a name="startServer--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>startServer</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.484">startServer</a>()
+<pre>protected int <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.436">startServer</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Method used to start the Jetty server created by <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a>.
@@ -768,7 +726,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>getResourceMap</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>>> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.537">getResourceMap</a>()
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>>> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.490">getResourceMap</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a>,
<a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the resource map to use for this microservice.
@@ -824,7 +782,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onConfigSave</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.584">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.537">onConfigSave</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block">Called when <a href="../../../../org/apache/juneau/ini/ConfigFile.html#save--"><code>ConfigFile.save()</code></a> is called on the config file.
<p>
@@ -847,13 +805,37 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
</dl>
</li>
</ul>
+<a name="setJettyXml-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setJettyXml</h4>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.576">setJettyXml</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> jettyXml)</pre>
+<div class="block">Sets the <code>jetty.xml</code> used to configure the Jetty server.
+
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>jettyXml</code> - The <code>jetty.xml</code>.
+ <br>Can be any of the following:
+ <ul>
+ <li>A <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> representing the location on the file system.
+ <li>An <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a> containing the contents of the file.
+ <li>A <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a> representing the file system path.
+ </ul></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>This object (for method chaining).</dd>
+</dl>
+</li>
+</ul>
<a name="onCreateServer--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>onCreateServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.619">onCreateServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.595">onCreateServer</a>()</pre>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#createServer--"><code>createServer()</code></a> is called.
<p>
@@ -866,7 +848,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onStartServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.627">onStartServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.603">onStartServer</a>()</pre>
<div class="block">Called before <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html#startServer--"><code>startServer()</code></a> is called.
<p>
@@ -879,7 +861,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onPostStartServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.635">onPostStartServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.611">onPostStartServer</a>()</pre>
<div class="block">Called after the Jetty server is started.
<p>
@@ -892,7 +874,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onStopServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.643">onStopServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.619">onStopServer</a>()</pre>
<div class="block">Called before the Jetty server is stopped.
<p>
@@ -905,7 +887,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>onPostStopServer</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.651">onPostStopServer</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.627">onPostStopServer</a>()</pre>
<div class="block">Called after the Jetty server is stopped.
<p>
@@ -918,7 +900,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setConfig</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.659">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> cfPath,
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.635">setConfig</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> cfPath,
boolean create)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-java.lang.String-boolean-">Microservice</a></code></span></div>
@@ -954,7 +936,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setConfig</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.665">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.641">setConfig</a>(<a href="../../../../org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a> cf)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setConfig-org.apache.juneau.ini.ConfigFile-">Microservice</a></code></span></div>
<div class="block">Specifies the config file for this microservice.
@@ -977,7 +959,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.671">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</pre>
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.647">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/jar/Manifest.html?is-external=true" title="class or interface in java.util.jar">Manifest</a> mf)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-">Microservice</a></code></span></div>
<div class="block">Specifies the manifest file of the jar file this microservice is contained within.
@@ -1005,7 +987,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setManifestContents</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.677">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.653">setManifestContents</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... contents)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifestContents-java.lang.String...-">Microservice</a></code></span></div>
<div class="block">Convenience method for specifying the manifest contents directly.</div>
@@ -1027,7 +1009,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockList">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.683">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.659">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.io.File-">Microservice</a></code></span></div>
<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except specified through a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a> object.</div>
@@ -1049,7 +1031,7 @@ extends <a href="../../../../org/apache/juneau/microservice/Microservice.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>setManifest</h4>
-<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.689">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)
+<pre>public <a href="../../../../org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice">RestMicroservice</a> <a href="../../../../src-html/org/apache/juneau/microservice/RestMicroservice.html#line.665">setManifest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.lang.Class-">Microservice</a></code></span></div>
<div class="block">Same as <a href="../../../../org/apache/juneau/microservice/Microservice.html#setManifest-java.util.jar.Manifest-"><code>Microservice.setManifest(Manifest)</code></a> except finds and loads the manifest file of the jar file that the
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/package-summary.html b/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
index 523affe..9423f53 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/package-summary.html
@@ -784,8 +784,8 @@
}
</p>
<p>
- Additional user-defined variables can be defined at this level by overriding the
- <a href="../../../../org/apache/juneau/microservice/Resource.html#init-org.apache.juneau.rest.RestConfig-"><code>Resource.init(RestConfig)</code></a> method
+ Additional user-defined variables can be defined at this level by adding a
+ <a href="../../../../org/apache/juneau/rest/annotation/HookEvent.html#INIT"><code>HookEvent.INIT</code></a> hook method
and using the <a href="../../../../org/apache/juneau/rest/RestConfig.html#addVars-java.lang.Class...-"><code>RestConfig.addVars(Class...)</code></a> method.
</p>
<li class='jm'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/package-tree.html b/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
index c756229..57ae672 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/package-tree.html
@@ -82,7 +82,7 @@
<ul>
<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
<ul>
<li type="circle">org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
<ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
index 78678b4..452745c 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
@@ -241,7 +241,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></h3>
-<code><a href="../../../../../org/apache/juneau/microservice/Resource.html#init-org.apache.juneau.rest.RestConfig-">init</a></code></li>
+<code><a href="../../../../../org/apache/juneau/microservice/Resource.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
@@ -255,7 +255,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<!-- -->
</a>
<h3>Methods inherited from class 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#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
index cc9dd22..44117e8 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.html
@@ -278,7 +278,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.microservice.<a href="../../../../../org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a></h3>
-<code><a href="../../../../../org/apache/juneau/microservice/Resource.html#init-org.apache.juneau.rest.RestConfig-">init</a></code></li>
+<code><a href="../../../../../org/apache/juneau/microservice/Resource.html#addConfigVars-org.apache.juneau.rest.RestConfig-">addConfigVars</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.rest.RestServletDefault">
@@ -292,7 +292,7 @@ extends <a href="../../../../../org/apache/juneau/microservice/Resource.html" ti
<!-- -->
</a>
<h3>Methods inherited from class 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#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</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-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index a4756b7..04f7e46 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -106,7 +106,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.300">LogsResource.FileResource</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.306">LogsResource.FileResource</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">File bean.</div>
</li>
@@ -217,7 +217,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre>public <a href="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/resources/LogsResource.FileResource.html#line.302">type</a></pre>
+<pre>public <a href="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/resources/LogsResource.FileResource.html#line.308">type</a></pre>
</li>
</ul>
<a name="name">
@@ -226,7 +226,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre>public <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> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.303">name</a></pre>
+<pre>public <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> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.309">name</a></pre>
</li>
</ul>
<a name="size">
@@ -235,7 +235,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>size</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.304">size</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.310">size</a></pre>
</li>
</ul>
<a name="lastModified">
@@ -245,7 +245,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<li class="blockList">
<h4>lastModified</h4>
<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a href="../../../../../org/apache/juneau/transforms/DateSwap.DateTimeMedium.html" title="class in org.apache.juneau.transforms">DateSwap.DateTimeMedium.class</a>)
-public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.305">lastModified</a></pre>
+public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">lastModified</a></pre>
</li>
</ul>
<a name="view">
@@ -254,7 +254,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>view</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.306">view</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.312">view</a></pre>
</li>
</ul>
<a name="highlighted">
@@ -263,7 +263,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>highlighted</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.306">highlighted</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.312">highlighted</a></pre>
</li>
</ul>
<a name="parsed">
@@ -272,7 +272,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>parsed</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.306">parsed</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.312">parsed</a></pre>
</li>
</ul>
<a name="download">
@@ -281,7 +281,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockList">
<li class="blockList">
<h4>download</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.306">download</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.312">download</a></pre>
</li>
</ul>
<a name="delete">
@@ -290,7 +290,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockListLast">
<li class="blockList">
<h4>delete</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.306">delete</a></pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.312">delete</a></pre>
</li>
</ul>
</li>
@@ -307,7 +307,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
<ul class="blockListLast">
<li class="blockList">
<h4>FileResource</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.308">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.314">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f,
<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)
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>
<dl>