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/09/24 20:08:55 UTC
[15/22] incubator-juneau-website git commit: Update javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/RestException.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestException.html b/content/site/apidocs/org/apache/juneau/rest/RestException.html
index c488632..276ea14 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestException.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestException.html
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.29">RestException</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.30">RestException</a>
extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" title="class in org.apache.juneau">FormattedRuntimeException</a></pre>
<div class="block">Exception thrown to trigger an error HTTP status.
@@ -257,7 +257,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>RestException</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.43">RestException</a>(int status,
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.44">RestException</a>(int status,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> msg,
<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>... args)</pre>
<div class="block">Constructor.</div>
@@ -275,7 +275,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>RestException</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.54">RestException</a>(int status,
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.55">RestException</a>(int status,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
<div class="block">Constructor.</div>
<dl>
@@ -299,7 +299,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>initCause</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest">RestException</a> <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.67">initCause</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RestException.html" title="class in org.apache.juneau.rest">RestException</a> <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.68">initCause</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
<div class="block">Sets the inner cause for this exception.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -317,7 +317,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>getRootCause</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.84">getRootCause</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.85">getRootCause</a>()</pre>
<div class="block">Returns the root cause of this exception.
<p>
@@ -338,7 +338,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>getFullStackMessage</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/rest/RestException.html#line.105">getFullStackMessage</a>(boolean scrubForXssVulnerabilities)</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/rest/RestException.html#line.106">getFullStackMessage</a>(boolean scrubForXssVulnerabilities)</pre>
<div class="block">Returns all error messages from all errors in this stack.
<p>
@@ -358,7 +358,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.129">hashCode</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.130">hashCode</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code> in class <code><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></code></dd>
@@ -371,14 +371,14 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockList">
<li class="blockList">
<h4>getOccurrence</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.153">getOccurrence</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.154">getOccurrence</a>()</pre>
<div class="block">Returns the number of times this exception occurred on this servlet.
<p>
- This only gets set if <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_useStackTraceHashes"><code>RestContext.REST_useStackTraceHashes</code></a> is enabled on the servlet.</div>
+ This only gets set if <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#useStackTraceHashes--"><code>RestResource.useStackTraceHashes()</code></a> is enabled on the servlet.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The occurrence number if <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_useStackTraceHashes"><code>RestContext.REST_useStackTraceHashes</code></a> is enabled, or <code>0</code> otherwise.</dd>
+<dd>The occurrence number if <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#useStackTraceHashes--"><code>RestResource.useStackTraceHashes()</code></a> is enabled, or <code>0</code> otherwise.</dd>
</dl>
</li>
</ul>
@@ -388,7 +388,7 @@ extends <a href="../../../../org/apache/juneau/FormattedRuntimeException.html" t
<ul class="blockListLast">
<li class="blockList">
<h4>getStatus</h4>
-<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.162">getStatus</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/juneau/rest/RestException.html#line.163">getStatus</a>()</pre>
<div class="block">Returns the HTTP status code.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/RestResourceResolver.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestResourceResolver.html b/content/site/apidocs/org/apache/juneau/rest/RestResourceResolver.html
index ba15479..115b947 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestResourceResolver.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestResourceResolver.html
@@ -121,7 +121,7 @@ var activeTableTab = "activeTableTab";
<p>
An instance of this class can also be passed in through the servlet context as the context attribute
- <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_resourceResolver"><code>RestContext.REST_resourceResolver</code></a>.</div>
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#resourceResolver--"><code>RestResource.resourceResolver()</code></a>.</div>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html b/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
index 02d6735..879f7ec 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestServletDefault.html
@@ -133,11 +133,11 @@ 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#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/html/HtmlStrippedDocSerializer.html" title="class in org.apache.juneau.html">HtmlStrippedDocSerializer.class</a>,<a href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" title="class in org.apache.juneau.html">HtmlSchemaDocSerializer.class</a>,<a href="../../../../org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer.class</a>,<a href="../../../../org/apache/juneau/json/JsonSerializer.Simple.html" title="class in org.apache.juneau.json">JsonSerializer.Simple.class</a>,<a href="../../../../org/apac
he/juneau/json/JsonSchemaSerializer.html" title="class in org.apache.juneau.json">JsonSchemaSerializer.class</a>,<a href="../../../../org/apache/juneau/xml/XmlDocSerializer.html" title="class in org.apache.juneau.xml">XmlDocSerializer.class</a>,<a href="../../../../org/apache/juneau/xml/XmlSchemaDocSerializer.html" title="class in org.apache.juneau.xml">XmlSchemaDocSerializer.class</a>,<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer.class</a>,<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.class</a>,<a href="../../../../org/apache/juneau/msgpack/MsgPackSerializer.html" title="class in org.apache.juneau.msgpack">MsgPackSerializer.class</a>,<a href="../../../../org/apache/juneau/soap/SoapXmlSerializer.html" title="class in org.apache.juneau.soap">SoapXmlSerializer.class</a>,<a href="../../../../org/apache/juneau/plainte
xt/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext">PlainTextSerializer.class</a>},
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a>={<a href="../../../../org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json">JsonParser.class</a>,<a href="../../../../org/apache/juneau/xml/XmlParser.html" title="class in org.apache.juneau.xml">XmlParser.class</a>,<a href="../../../../org/apache/juneau/html/HtmlParser.html" title="class in org.apache.juneau.html">HtmlParser.class</a>,<a href="../../../../org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon">UonParser.class</a>,<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingParser.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParser.class</a>,<a href="../../../../org/apache/juneau/msgpack/MsgPackParser.html" title="class in org.apache.juneau.msgpack">MsgPackParser.class</a>,<a href="../../../../org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext">PlainT
extParser.class</a>},
- <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--">properties</a>=<a href="../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">@Property</a>(<a href="../../../../org/apache/juneau/rest/annotation/Property.html#name--">name</a>="RestServlet.allowMethodParam",<a href="../../../../org/apache/juneau/rest/annotation/Property.html#value--">value</a>="OPTIONS"),
+ <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--">allowMethodParam</a>="OPTIONS",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#htmldoc--">htmldoc</a>=,
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#favicon--">favicon</a>="htdocs/juneau.png",
<a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#staticFiles--">staticFiles</a>="{htdocs:\'htdocs\',styles:\'styles\'}")
-public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.207">RestServletDefault</a>
+public abstract class <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.202">RestServletDefault</a>
extends <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></pre>
<div class="block">Subclass of <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> with default serializers and parsers defined.
@@ -365,7 +365,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="cla
<ul class="blockListLast">
<li class="blockList">
<h4>RestServletDefault</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.207">RestServletDefault</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.202">RestServletDefault</a>()</pre>
</li>
</ul>
</li>
@@ -387,7 +387,7 @@ extends <a href="../../../../org/apache/juneau/rest/RestServlet.html" title="cla
<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#htmldoc--">htmldoc</a>=,
<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="Swagger documentation",
<a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Auto-generated swagger documentation for this resource")
-public <a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.227">getOptions</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
+public <a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a> <a href="../../../../src-html/org/apache/juneau/rest/RestServletDefault.html#line.222">getOptions</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a> req)</pre>
<div class="block">[OPTIONS /*] - Show resource options.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html b/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
index 6a70e58..6de2462 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/FormData.html
@@ -276,7 +276,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<br>This treats request parameters as plain text.
<br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this mode.
<li>
- <js>"INHERIT"</js> (default) - Inherit from the <a href="../../../../../org/apache/juneau/rest/RestContext.html#REST_paramFormat"><code>RestContext.REST_paramFormat</code></a> property on the
+ <js>"INHERIT"</js> (default) - Inherit from the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#paramFormat--"><code>RestResource.paramFormat()</code></a> property on the
servlet method or class.
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
index b9a26e1..5d3e339 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
@@ -272,7 +272,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<br>This treats request parameters as plain text.
<br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this mode.
<li>
- <js>"INHERIT"</js> (default) - Inherit from the <a href="../../../../../org/apache/juneau/rest/RestContext.html#REST_paramFormat"><code>RestContext.REST_paramFormat</code></a> property on the
+ <js>"INHERIT"</js> (default) - Inherit from the <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#paramFormat--"><code>RestResource.paramFormat()</code></a> property on the
servlet method or class.
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
index 0fa1404..afc8ad7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
@@ -149,71 +149,83 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</td>
</tr>
<tr 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/rest/annotation/RestMethod.html#defaultCharset--">defaultCharset</a></span></code>
+<div class="block">Default character encoding.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#defaultFormData--">defaultFormData</a></span></code>
<div class="block">Specifies default values for form-data parameters.</div>
</td>
</tr>
-<tr class="altColor">
+<tr 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/rest/annotation/RestMethod.html#defaultQuery--">defaultQuery</a></span></code>
<div class="block">Specifies default values for query parameters.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#defaultRequestHeaders--">defaultRequestHeaders</a></span></code>
<div class="block">Specifies default values for request headers.</div>
</td>
</tr>
-<tr class="altColor">
+<tr 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/rest/annotation/RestMethod.html#description--">description</a></span></code>
<div class="block">Optional description for the exposed API.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders">Encoder</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#encoders--">encoders</a></span></code>
<div class="block">Appends to the list of <a href="../../../../../org/apache/juneau/encoders/Encoder.html" title="class in org.apache.juneau.encoders"><code>encoders</code></a> specified on the servlet.</div>
</td>
</tr>
-<tr class="altColor">
+<tr 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/rest/annotation/RestMethod.html#flags--">flags</a></span></code>
<div class="block">Shortcut for setting <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#properties--"><code>properties()</code></a> of simple boolean types.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestGuard.html" title="class in org.apache.juneau.rest">RestGuard</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#guards--">guards</a></span></code>
<div class="block">Method guards.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#htmldoc--">htmldoc</a></span></code>
<div class="block">Provides HTML-doc-specific metadata on this method.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#inheritEncoders--">inheritEncoders</a></span></code>
<div class="block">Specifies whether the method should inherit encoders from the servlet.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestMatcher.html" title="class in org.apache.juneau.rest">RestMatcher</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#matchers--">matchers</a></span></code>
<div class="block">Method matchers.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a></span></code>
<div class="block">REST method name.</div>
</td>
</tr>
+<tr 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/rest/annotation/RestMethod.html#paramFormat--">paramFormat</a></span></code>
+<div class="block">Expected format of request parameters.</div>
+</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#parsers--">parsers</a></span></code>
@@ -1182,7 +1194,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<li class="blockList"><a name="htmldoc--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>htmldoc</h4>
<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.632">htmldoc</a></pre>
@@ -1198,6 +1210,77 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="defaultCharset--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>defaultCharset</h4>
+<pre>public abstract <a href="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/rest/annotation/RestMethod.html#line.647">defaultCharset</a></pre>
+<div class="block">Default character encoding.
+
+ <p>
+ The default character encoding for the request and response if not specified on the request.
+
+ <ul>
+ <li>String value.
+ <li>Defaults to system property <js>"juneau.defaultCharset"</js>, or <js>"utf-8"</js> if not specified.
+ <li>Can contain variables.
+ <li>Overrides the value at the class level via <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#defaultCharset--"><code>@RestResource.defaultCharset()</code></a>.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="paramFormat--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>paramFormat</h4>
+<pre>public abstract <a href="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/rest/annotation/RestMethod.html#line.679">paramFormat</a></pre>
+<div class="block">Expected format of request parameters.
+
+ Possible values:
+ <ul class='spaced-list'>
+ <li>
+ <js>"UON"</js> - URL-Encoded Object Notation.
+ <br>This notation allows for request parameters to contain arbitrarily complex POJOs.
+ <li>
+ <js>"PLAIN"</js> - Plain text.
+ <br>This treats request parameters as plain text.
+ <br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this
+ mode.
+ </ul>
+
+ <p>
+ Note that the parameter value <js>"(foo)"</js> is interpreted as <js>"(foo)"</js> when using plain mode, but
+ <js>"foo"</js> when using UON mode.
+
+ <p>
+ The format can also be specified per-parameter using the <a href="../../../../../org/apache/juneau/rest/annotation/FormData.html#format--"><code>@FormData.format()</code></a> and
+ <a href="../../../../../org/apache/juneau/rest/annotation/Query.html#format--"><code>@Query.format()</code></a> annotations.
+
+ <ul>
+ <li>String value.
+ <li>Defaults to system property <js>"juneau.paramFormat"</js>, or <js>"UON"</js> if not specified.
+ <li>Can contain variables.
+ <li>Overrides the value at the class level via <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#paramFormat--"><code>@RestResource.paramFormat()</code></a>.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
index cef4af7..d7334a9 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
@@ -124,47 +124,71 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#allowBodyParam--">allowBodyParam</a></span></code>
+<div class="block">Enable <js>"body"</js> URL parameter.</div>
+</td>
+</tr>
+<tr 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/rest/annotation/RestResource.html#allowHeaderParams--">allowHeaderParams</a></span></code>
+<div class="block">Enable header URL parameters.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--">allowMethodParam</a></span></code>
+<div class="block">Enable <js>"method"</js> URL parameter for specific HTTP methods.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><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><?>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#beanFilters--">beanFilters</a></span></code>
<div class="block">Class-level bean filters.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#callHandler--">callHandler</a></span></code>
<div class="block">Specifies the REST call handler class.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><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><?>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#children--">children</a></span></code>
<div class="block">Defines children of this resource.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#clientVersionHeader--">clientVersionHeader</a></span></code>
<div class="block">Specifies the HTTP header name used to identify the client version.</div>
</td>
</tr>
-<tr class="altColor">
+<tr 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/rest/annotation/RestResource.html#config--">config</a></span></code>
<div class="block">Optional location of configuration file for this servlet.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#contextPath--">contextPath</a></span></code>
<div class="block">Overrides the context path value for this resource and any child resources.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#converters--">converters</a></span></code>
<div class="block">Class-level converters.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#defaultCharset--">defaultCharset</a></span></code>
+<div class="block">Default character encoding.</div>
+</td>
+</tr>
<tr 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/rest/annotation/RestResource.html#defaultRequestHeaders--">defaultRequestHeaders</a></span></code>
@@ -232,41 +256,53 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#paramFormat--">paramFormat</a></span></code>
+<div class="block">Expected format of request parameters.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestParam.html" title="class in org.apache.juneau.rest">RestParam</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#paramResolvers--">paramResolvers</a></span></code>
<div class="block">Class-level Java method parameter resolvers.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#parserListener--">parserListener</a></span></code>
<div class="block">Specifies the parser listener class to use for listening for non-fatal errors.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#parsers--">parsers</a></span></code>
<div class="block">Specifies a list of <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser"><code>Parser</code></a> classes to add to the list of parsers available for this servlet.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#path--">path</a></span></code>
<div class="block">Identifies the URL subpath relative to the parent resource.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><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><?>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#pojoSwaps--">pojoSwaps</a></span></code>
<div class="block">Class-level POJO swaps.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#properties--">properties</a></span></code>
<div class="block">Class-level properties.</div>
</td>
</tr>
+<tr 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/rest/annotation/RestResource.html#renderResponseStackTraces--">renderResponseStackTraces</a></span></code>
+<div class="block">Render stack traces.</div>
+</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><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="../../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#resourceResolver--">resourceResolver</a></span></code>
@@ -316,6 +352,12 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<div class="block">Optional servlet title.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#useStackTraceHashes--">useStackTraceHashes</a></span></code>
+<div class="block">Use stack trace hashes.</div>
+</td>
+</tr>
</table>
</li>
</ul>
@@ -1164,7 +1206,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>resourceResolver</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.634">resourceResolver</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest">RestResourceResolver</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.632">resourceResolver</a></pre>
<div class="block">Specifies the resolver class to use for resolving child resources by class name.
<p>
@@ -1194,9 +1236,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<p>
The programmatic equivalent to this annotation are the <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-java.lang.Class-"><code>RestConfig.setResourceResolver(Class)</code></a>/
- <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-org.apache.juneau.rest.RestResourceResolver-"><code>RestConfig.setResourceResolver(RestResourceResolver)</code></a> methods.
- <br>The value (class or instance) can also be set via the servlet context attribute
- * <a href="../../../../../org/apache/juneau/rest/RestContext.html#REST_resourceResolver"><code>RestContext.REST_resourceResolver</code></a>.</div>
+ <a href="../../../../../org/apache/juneau/rest/RestConfig.html#setResourceResolver-org.apache.juneau.rest.RestResourceResolver-"><code>RestConfig.setResourceResolver(RestResourceResolver)</code></a> methods.</div>
<dl>
<dt>Default:</dt>
<dd>org.apache.juneau.rest.RestResourceResolverSimple.class</dd>
@@ -1212,7 +1252,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>logger</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.647">logger</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestLogger.html" title="class in org.apache.juneau.rest">RestLogger</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.645">logger</a></pre>
<div class="block">Specifies the logger class to use for logging.
<p>
@@ -1237,7 +1277,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>callHandler</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.660">callHandler</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest">RestCallHandler</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.658">callHandler</a></pre>
<div class="block">Specifies the REST call handler class.
<p>
@@ -1262,7 +1302,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>infoProvider</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.672">infoProvider</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/rest/RestInfoProvider.html" title="class in org.apache.juneau.rest">RestInfoProvider</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.670">infoProvider</a></pre>
<div class="block">Specifies the class used to retrieve title/description/swagger information about a resource.
<p>
@@ -1286,7 +1326,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>serializerListener</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/serializer/SerializerListener.html" title="class in org.apache.juneau.serializer">SerializerListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.677">serializerListener</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/serializer/SerializerListener.html" title="class in org.apache.juneau.serializer">SerializerListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.675">serializerListener</a></pre>
<div class="block">Specifies the serializer listener class to use for listening for non-fatal errors.</div>
<dl>
<dt>Default:</dt>
@@ -1303,7 +1343,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>parserListener</h4>
-<pre>public abstract <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="../../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.682">parserListener</a></pre>
+<pre>public abstract <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="../../../../../org/apache/juneau/parser/ParserListener.html" title="class in org.apache.juneau.parser">ParserListener</a>> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.680">parserListener</a></pre>
<div class="block">Specifies the parser listener class to use for listening for non-fatal errors.</div>
<dl>
<dt>Default:</dt>
@@ -1320,7 +1360,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>swagger</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.707">swagger</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.705">swagger</a></pre>
<div class="block">Provides swagger-specific metadata on this resource.
<p>
@@ -1357,7 +1397,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<ul class="blockList">
<li class="blockList">
<h4>htmldoc</h4>
-<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.751">htmldoc</a></pre>
+<pre>public abstract <a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation">HtmlDoc</a> <a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.749">htmldoc</a></pre>
<div class="block">Provides HTML-doc-specific metadata on this method.
<p>
@@ -1410,10 +1450,10 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
<li class="blockList"><a name="contextPath--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>contextPath</h4>
-<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.762">contextPath</a></pre>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.760">contextPath</a></pre>
<div class="block">Overrides the context path value for this resource and any child resources.
<p>
@@ -1429,6 +1469,230 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="allowHeaderParams--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowHeaderParams</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.778">allowHeaderParams</a></pre>
+<div class="block">Enable header URL parameters.
+
+ <p>
+ When enabled, headers such as <js>"Accept"</js> and <js>"Content-Type"</js> to be passed in as URL query
+ parameters.
+ For example: <js>"?Accept=text/json&Content-Type=text/json"</js>
+
+ <ul>
+ <li>Boolean value.
+ <li>Defaults to system property <js>"juneau.allowHeaderParams"</js>, or <js>"true"</js> if not specified.
+ <li>Can contain variables.
+ <li>Parameter names are case-insensitive.
+ <li>Useful for debugging REST interface using only a browser.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="allowMethodParam--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowMethodParam</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.805">allowMethodParam</a></pre>
+<div class="block">Enable <js>"method"</js> URL parameter for specific HTTP methods.
+
+ <p>
+ When specified, the HTTP method can be overridden by passing in a <js>"method"</js> URL parameter on a regular
+ GET request.
+ For example: <js>"?method=OPTIONS"</js>
+
+ <p>
+ Example: <js>"HEAD,OPTIONS"</js>
+
+ <ul>
+ <li>Format is a comma-delimited list of HTTP method names that can be passed in as a method parameter.
+ <li>Defaults to system property <js>"juneau.allowMethodParam"</js>, or <js>"HEAD,OPTIONS"</js> if not specified.
+ <li>Can contain variables.
+ <li>Parameter name is case-insensitive.
+ <li>Use "*" to represent all methods.
+ <li>For backwards compatibility, "true" also means "*".
+ </ul>
+
+ <p>
+ Note that per the <a class="doclink"
+ href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html">HTTP specification</a>, special care should
+ be taken when allowing non-safe (POST, PUT, DELETE) methods to be invoked through GET requests.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="allowBodyParam--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowBodyParam</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.823">allowBodyParam</a></pre>
+<div class="block">Enable <js>"body"</js> URL parameter.
+
+ <p>
+ When enabled, the HTTP body content on PUT and POST requests can be passed in as text using the <js>"body"</js>
+ URL parameter.
+ For example: <js>"?body={name:'John%20Smith',age:45}"</js>
+
+ <ul>
+ <li>Boolean value.
+ <li>Defaults to system property <js>"juneau.allowBodyParam"</js>, or <js>"true"</js> if not specified.
+ <li>Can contain variables.
+ <li>Parameter name is case-insensitive.
+ <li>Useful for debugging PUT and POST methods using only a browser.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="renderResponseStackTraces--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>renderResponseStackTraces</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.838">renderResponseStackTraces</a></pre>
+<div class="block">Render stack traces.
+
+ <p>
+ Render stack traces in HTTP response bodies when errors occur.
+
+ <ul>
+ <li>Boolean value.
+ <li>Defaults to system property <js>"juneau.renderResponseStackTraces"</js>, or <js>"false"</js> if not specified.
+ <li>Can contain variables.
+ <li>Useful for debugging, although allowing stack traces to be rendered may cause security concerns.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="useStackTraceHashes--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>useStackTraceHashes</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.853">useStackTraceHashes</a></pre>
+<div class="block">Use stack trace hashes.
+
+ <p>
+ When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
+ made available through the <a href="../../../../../org/apache/juneau/rest/RestException.html#getOccurrence--"><code>RestException.getOccurrence()</code></a> method.
+
+ <ul>
+ <li>Boolean value.
+ <li>Defaults to system property <js>"juneau.useStackTraceHashes"</js>, or <js>"true"</js> if not specified.
+ <li>Can contain variables.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="defaultCharset--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>defaultCharset</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.868">defaultCharset</a></pre>
+<div class="block">Default character encoding.
+
+ <p>
+ The default character encoding for the request and response if not specified on the request.
+
+ <ul>
+ <li>String value.
+ <li>Defaults to system property <js>"juneau.defaultCharset"</js>, or <js>"utf-8"</js> if not specified.
+ <li>Can contain variables.
+ <li>Can be overridden at the method level using <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#defaultCharset--"><code>@RestMethod.defaultCharset()</code></a>.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="paramFormat--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>paramFormat</h4>
+<pre>public abstract <a href="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/rest/annotation/RestResource.html#line.900">paramFormat</a></pre>
+<div class="block">Expected format of request parameters.
+
+ Possible values:
+ <ul class='spaced-list'>
+ <li>
+ <js>"UON"</js> - URL-Encoded Object Notation.
+ <br>This notation allows for request parameters to contain arbitrarily complex POJOs.
+ <li>
+ <js>"PLAIN"</js> - Plain text.
+ <br>This treats request parameters as plain text.
+ <br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this
+ mode.
+ </ul>
+
+ <p>
+ Note that the parameter value <js>"(foo)"</js> is interpreted as <js>"(foo)"</js> when using plain mode, but
+ <js>"foo"</js> when using UON mode.
+
+ <p>
+ The format can also be specified per-parameter using the <a href="../../../../../org/apache/juneau/rest/annotation/FormData.html#format--"><code>@FormData.format()</code></a> and
+ <a href="../../../../../org/apache/juneau/rest/annotation/Query.html#format--"><code>@Query.format()</code></a> annotations.
+
+ <ul>
+ <li>String value.
+ <li>Defaults to system property <js>"juneau.paramFormat"</js>, or <js>"UON"</js> if not specified.
+ <li>Can contain variables.
+ <li>Can be overridden at the method level using <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#paramFormat--"><code>@RestMethod.paramFormat()</code></a>.
+ </ul></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/org/apache/juneau/rest/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
index 208d237..95123d7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
@@ -3382,15 +3382,13 @@
}
</p>
<p>
- To support overloaded methods, the <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowMethodParam"><code>RestContext.REST_allowMethodParam</code></a> property
- must be set on your servlet.
+ To support overloaded methods, the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--"><code>RestResource.allowMethodParam()</code></a>
+ setting must be enabled on your servlet.
</p>
<p class='bcode'>
<ja>@RestResource</ja>(
- properties={
- <jc>// Allow &method parameter on BAR requests</jc>
- <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"BAR"</js>)
- },
+ <jc>// Allow &method parameter on BAR requests</jc>
+ allowMethodParam=<js>"BAR"</js>
)
</p>
</div>
@@ -3433,21 +3431,21 @@
<td class='code'>&method=X</td>
<td>
Overload the HTTP method as a GET parameter (e.g <l>"POST"</l>).
- <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowMethodParam"><code>RestContext.REST_allowMethodParam</code></a> property.
+ <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--"><code>RestResource.allowMethodParam()</code></a> setting.
</td>
</tr>
<tr>
<td class='code'>&X=headerValue</td>
<td>
Specify a header value as a GET parameter.
- <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowHeaderParams"><code>RestContext.REST_allowHeaderParams</code></a> property.
+ <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#allowHeaderParams--"><code>RestResource.allowHeaderParams()</code></a> setting.
</td>
</tr>
<tr>
<td class='code'>&content=X</td>
<td>
Pass in the HTTP body content on PUT and POST methods as a UON-encoded GET parameter.
- <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/RestContext.html#REST_allowBodyParam"><code>RestContext.REST_allowBodyParam</code></a> property.
+ <br>Must be enabled via <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#allowBodyParam--"><code>RestResource.allowBodyParam()</code></a> setting.
</td>
</tr>
</table>
@@ -3798,12 +3796,12 @@
stylesheet=<js>"servlet:/styles/devops.css"</js>,
),
+ <jc>// Allow INIT as a method parameter.</jc>
+ allowMethodParam=<js>"*"</js>,
+
<jc>// Properties that get applied to all serializers and parsers.</jc>
properties={
- <jc>// Allow INIT as a method parameter.</jc>
- <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
-
<jc>// Use single quotes.</jc>
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 62bdac2..6d1e816 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -412,7 +412,7 @@
<ul class='spaced-list'>
<li>A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework.
<li>A universal REST server API for creating Swagger-based self-documenting REST interfaces using POJOs, simply deployed as
- one or more top-level servlets in any Servlet 3.1.0+ container.
+ one or more top-level servlets in any Servlet 3.1 or above container.
<li>A universal REST client API for interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy interfaces.
<li>A sophisticated configuration file API.
<li>A REST microservice API that combines all the features above with a simple configurable Jetty server for
@@ -530,7 +530,7 @@
<ul class='spaced-list'>
<li>A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework.
<li>A universal REST server API for creating Swagger-based self-documenting REST interfaces using POJOs, simply
- deployed as one or more top-level servlets in any Servlet 3.1.0+ container.
+ deployed as one or more top-level servlets in any Servlet 3.1 or above container.
<li>A universal REST client API for interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy
interfaces.
<li>A sophisticated configuration file API.
@@ -698,7 +698,7 @@
<td>
<ul style='margin:0px 10px;'>
<li>Java 6
- <li>Apache HttpClient 4.5
+ <li>Apache HttpClient 4.5.3
</ul>
</td>
</tr>
@@ -801,21 +801,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-marshall<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-marshall<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-marshall-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.marshall_6.4.0-incubating.jar
</p>
@@ -2535,21 +2535,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-marshall-rdf<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-marshall-rdf<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-marshall-rdf-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.marshall.rdf_6.4.0-incubating.jar
</p>
@@ -2618,21 +2618,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-dto<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-dto<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-dto-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.dto_6.4.0-incubating.jar
</p>
@@ -3037,21 +3037,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-svl<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-svl<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-svl-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.svl_6.4.0-incubating.jar
</p>
@@ -3097,21 +3097,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-config<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-config<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-config-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.config_6.4.0-incubating.jar
</p>
@@ -3386,21 +3386,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-rest-server<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-rest-server<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-rest-server-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.rest.server_6.4.0-incubating.jar
</p>
@@ -4012,21 +4012,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-rest-server-jaxrs<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-rest-server-jaxrs-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.rest.server_6.4.0-incubating.jar
</p>
@@ -4049,21 +4049,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-rest-client<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-rest-client<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-rest-client-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.rest.client_6.4.0-incubating.jar
</p>
@@ -4265,21 +4265,21 @@
<div class='topic'>
<h6 class='figure'>Maven Dependency</h6>
- <p class='bcode'>
- <<xt>dependency</xt>>
- <<xt>groupId</xt>>org.apache.juneau<<xt>/groupId</xt>>
- <<xt>artifactId</xt>>juneau-microservice-server<<xt>/artifactId</xt>>
- <<xt>version</xt>>6.4.0-incubating<<xt>/version</xt>>
- <<xt>/dependency</xt>>
+ <p class='bcode' style='width:500px;'>
+ <xt><dependency></xt>
+ <xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
+ <xt><artifactId></xt>juneau-microservice-server<xt></artifactId></xt>
+ <xt><version></xt>6.4.0-incubating<xt></version></xt>
+ <xt></dependency></xt>
</p>
<h6 class='figure'>Java Library</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-microservice-server-6.4.0-incubating.jar
</p>
<h6 class='figure'>OSGi Module</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
org.apache.juneau.microservice.server_6.4.0-incubating.jar
</p>
@@ -4338,7 +4338,7 @@
<div class='topic'>
<h6 class='figure'>Archive File</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
my-microservice-6.4.0-incubating.zip
</p>
@@ -4396,7 +4396,7 @@
<div class='topic'>
<h6 class='figure'>Archive File</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-examples-core-6.4.0-incubating.zip
</p>
@@ -4436,7 +4436,7 @@
<div class='topic'>
<h6 class='figure'>Archive File</h6>
- <p class='bcode'>
+ <p class='bcode' style='width:500px;'>
juneau-examples-rest-6.4.0-incubating.zip
</p>
@@ -4467,7 +4467,7 @@
The microservice can be started from the <code>juneau-examples-rest.launch</code> file.
It will start up the microservice on port 10000 which you can then view through a browser:
</p>
- <img class='bordered' src='doc-files/juneau-examples-rest.import4.png' style='width:933px'>
+ <img class='bordered' src='doc-files/juneau-examples-rest.import4.png' style='width:466px'>
<!-- ======================================================================================================= -->
@@ -5793,12 +5793,12 @@
}
),
+ <jc>// Allow INIT as a method parameter.</jc>
+ allowMethodParam=<js>"*"</js>,
+
<jc>// Properties that get applied to all serializers and parsers.</jc>
properties={
- <jc>// Allow INIT as a method parameter.</jc>
- <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>),
-
<jc>// Use single quotes.</jc>
<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>),
@@ -6476,7 +6476,7 @@
</p>
<p>
The ability to overload methods is enabled through the
- <a href="org/apache/juneau/rest/RestContext.html#REST_allowMethodParam"><code>RestContext.REST_allowMethodParam</code></a> property.
+ <a href="org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--"><code>RestResource.allowMethodParam()</code></a> setting.
</p>
</div>
</div>
@@ -6517,10 +6517,8 @@
<js>"options: servlet:/?method=OPTIONS"</js>
}
),
- properties={
- <jc>// Allow us to use method=POST from a browser.</jc>
- <ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"*"</js>)
- }
+ <jc>// Allow us to use method=POST from a browser.</jc>
+ allowMethodParam=<js>"*"</js>
)
<jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
@@ -7802,6 +7800,7 @@
<h6 class='topic'>juneau-dto</h6>
<ul class='spaced-list'>
</ul>
+
</div>
<!-- =========================================================================================================== -->
@@ -8199,13 +8198,35 @@
<a href="org/apache/juneau/rest/RestResourceResolver.html" title="interface in org.apache.juneau.rest"><code>RestResourceResolver</code></a> instances are now inherited from parent resources to child resources
unless explicitly overridden at the child level.
<br>It's also been changed to an interface.
- <li>
- New setting: <a href="org/apache/juneau/rest/RestContext.html#REST_resourceResolver"><code>RestContext.REST_resourceResolver</code></a>.
- <br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
- dependency injection frameworks.
- <li>
- New annotation: <a href="org/apache/juneau/rest/annotation/RestResource.html#contextPath--"><code>RestResource.contextPath()</code></a>.
- <br>Allows you to override the context path value inherited from the servlet container.
+ <li>New annotations on <a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestResource</code></a>:
+ <ul>
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#resourceResolver--"><code>resourceResolver()</code></a>
+ <br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
+ dependency injection frameworks.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#contextPath--"><code>contextPath()</code></a> -
+ <br>Allows you to override the context path value inherited from the servlet container.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#allowHeaderParams--"><code>allowHeaderParams()</code></a> -
+ <br>Replaces the <code>RestContext.REST_allowHeaderParams</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#allowMethodParam--"><code>allowMethodParam()</code></a> -
+ <br>Replaces the <code>RestContext.REST_allowMethodParam</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#allowBodyParam--"><code>allowBodyParam()</code></a> -
+ <br>Replaces the <code>RestContext.REST_allowBodyParam</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#renderResponseStackTraces--"><code>renderResponseStackTraces()</code></a> -
+ <br>Replaces the <code>RestContext.REST_xxx</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#useStackTraceHashes--"><code>useStackTraceHashes()</code></a> -
+ <br>Replaces the <code>RestContext.REST_useStackTraceHashes</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#defaultCharset--"><code>defaultCharset()</code></a> -
+ <br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestResource.html#paramFormat--"><code>paramFormat()</code></a> -
+ <br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+ </ul>
+ <li>New annotations on <a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>:
+ <ul>
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#defaultCharset--"><code>defaultCharset()</code></a> -
+ <br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
+ <li><a href="org/apache/juneau/rest/annotation/RestMethod.html#paramFormat--"><code>paramFormat()</code></a> -
+ <br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+ </ul>
<li>
The following implementation classes can now be defined as non-static inner classes of servlets/resources:
<ul>
@@ -8238,12 +8259,32 @@
<h6 class='topic'>juneau-microservice</h6>
<ul class='spaced-list'>
<li>
+ The microservice has been significantly modified to be configured via a <code>jetty.xml</code> file
+ for maximum flexibility instead of the hodge-podge of support in the config file.
+ <br>Top-level servlets should now be defined in the provided <code>jetty.xml</code> file.
+ <li>
New methods on <a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><code>RestMicroservice</code></a>:
<ul>
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#addServlet-javax.servlet.Servlet-java.lang.String-"><code>addServlet(Servlet,String)</code></a>
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#addServletAttribute-java.lang.String-java.lang.Object-"><code>addServletAttribute(String,Object)</code></a>
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#getServer--"><code>getServer()</code></a>
+ <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getInstance--"><code>getInstance()</code></a>
+ <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getPort--"><code>getPort()</code></a>
+ <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getContextPath--"><code>getContextPath()</code></a>
+ <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getProtocol--"><code>getProtocol()</code></a>
+ <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getHostName--"><code>getHostName()</code></a>
</ul>
+ <li>
+ New methods on <a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice"><code>Microservice</code></a>:
+ <ul>
+ <li><a href="org/apache/juneau/microservice/Microservice.html#getInstance--"><code>getInstance()</code></a>
+ </ul>
+ <li>
+ New class <a href="org/apache/juneau/microservice/JettyLogger.html" title="class in org.apache.juneau.microservice"><code>JettyLogger</code></a> for directing Jetty logging to the
+ java.util.logging framework.
+ <li>
+ New class <a href="org/apache/juneau/microservice/resources/DebugResource.html" title="class in org.apache.juneau.microservice.resources"><code>DebugResource</code></a> for viewing and generating
+ Jetty thread dumps through REST calls.
</ul>
<h6 class='topic'>org.apache.juneau.rest.examples</h6>