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:42 UTC
[02/22] incubator-juneau-website git commit: Update javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/RestException.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestException.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestException.html
index bf4c56b..9daea0c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestException.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestException.html
@@ -26,151 +26,152 @@
<span class="sourceLineNo">018</span>import java.text.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import org.apache.juneau.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Exception thrown to trigger an error HTTP status.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * REST methods on subclasses of {@link RestServlet} can throw this exception to trigger an HTTP status other than the<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * automatically-generated <code>404</code>, <code>405</code>, and <code>500</code> statuses.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> */<a name="line.28"></a>
-<span class="sourceLineNo">029</span>public class RestException extends FormattedRuntimeException {<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span> private static final long serialVersionUID = 1L;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span> private final int status;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> private int occurrence;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span> /**<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * Constructor.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @param status The HTTP status code.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * @param msg The status message.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> public RestException(int status, String msg, Object...args) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> super(msg, args);<a name="line.44"></a>
-<span class="sourceLineNo">045</span> this.status = status;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> }<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span> /**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Constructor.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> *<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * @param status The HTTP status code.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * @param cause The root exception.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span> public RestException(int status, Throwable cause) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> this(status, cause.getLocalizedMessage());<a name="line.55"></a>
-<span class="sourceLineNo">056</span> initCause(cause);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.rest.annotation.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Exception thrown to trigger an error HTTP status.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * REST methods on subclasses of {@link RestServlet} can throw this exception to trigger an HTTP status other than the<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * automatically-generated <code>404</code>, <code>405</code>, and <code>500</code> statuses.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> */<a name="line.29"></a>
+<span class="sourceLineNo">030</span>public class RestException extends FormattedRuntimeException {<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span> private static final long serialVersionUID = 1L;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span> private final int status;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> private int occurrence;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span> /**<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Constructor.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @param status The HTTP status code.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @param msg The status message.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @param args Optional {@link MessageFormat}-style arguments.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span> public RestException(int status, String msg, Object...args) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span> super(msg, args);<a name="line.45"></a>
+<span class="sourceLineNo">046</span> this.status = status;<a name="line.46"></a>
+<span class="sourceLineNo">047</span> }<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> /**<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * Constructor.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @param status The HTTP status code.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @param cause The root exception.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public RestException(int status, Throwable cause) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> this(status, cause.getLocalizedMessage());<a name="line.56"></a>
+<span class="sourceLineNo">057</span> initCause(cause);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> }<a name="line.58"></a>
<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Sets the inner cause for this exception.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * @param cause The inner cause.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @return This object (for method chaining).<a name="line.64"></a>
-<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @Override /* Throwable */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public synchronized RestException initCause(Throwable cause) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> super.initCause(cause);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> return this;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> /**<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * Returns the root cause of this exception.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> *<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <p><a name="line.75"></a>
-<span class="sourceLineNo">076</span> * The root cause is the first exception in the init-cause parent chain that's not one of the following:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <ul><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <li>{@link RestException}<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * <li>{@link InvocationTargetException}<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * </ul><a name="line.80"></a>
-<span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @return The root cause of this exception, or <jk>null</jk> if no root cause was found.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> */<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public Throwable getRootCause() {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> Throwable t = this;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> while(t != null) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> t = t.getCause();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> if (! (t instanceof RestException || t instanceof InvocationTargetException))<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return t;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return null;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * Returns all error messages from all errors in this stack.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> *<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Typically useful if you want to render all the error messages in the stack, but don't want to render all the<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * stack traces too.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> *<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @param scrubForXssVulnerabilities<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * If <jk>true</jk>, replaces <js>'&lt;'</js>, <js>'&gt;'</js>, and <js>'&amp;'</js> characters with spaces.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @return All error messages from all errors in this stack.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> */<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public String getFullStackMessage(boolean scrubForXssVulnerabilities) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> String msg = getMessage();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> StringBuilder sb = new StringBuilder();<a name="line.107"></a>
-<span class="sourceLineNo">108</span> if (msg != null) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (scrubForXssVulnerabilities)<a name="line.109"></a>
-<span class="sourceLineNo">110</span> msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');<a name="line.110"></a>
-<span class="sourceLineNo">111</span> sb.append(msg);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> Throwable e = getCause();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> while (e != null) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> msg = e.getMessage();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> if (msg != null && scrubForXssVulnerabilities)<a name="line.116"></a>
-<span class="sourceLineNo">117</span> msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');<a name="line.117"></a>
-<span class="sourceLineNo">118</span> String cls = e.getClass().getSimpleName();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> if (msg == null)<a name="line.119"></a>
-<span class="sourceLineNo">120</span> sb.append(format("\nCaused by ({0})", cls));<a name="line.120"></a>
-<span class="sourceLineNo">121</span> else<a name="line.121"></a>
-<span class="sourceLineNo">122</span> sb.append(format("\nCaused by ({0}): {1}", cls, msg));<a name="line.122"></a>
-<span class="sourceLineNo">123</span> e = e.getCause();<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return sb.toString();<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Override /* Object */<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public int hashCode() {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> int i = 0;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> Throwable t = this;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> while (t != null) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> for (StackTraceElement e : t.getStackTrace())<a name="line.133"></a>
-<span class="sourceLineNo">134</span> i ^= e.hashCode();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> t = t.getCause();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return i;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> void setOccurrence(int occurrence) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> this.occurrence = occurrence;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * Returns the number of times this exception occurred on this servlet.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> *<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <p><a name="line.147"></a>
-<span class="sourceLineNo">148</span> * This only gets set if {@link RestContext#REST_useStackTraceHashes} is enabled on the servlet.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> *<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @return<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * The occurrence number if {@link RestContext#REST_useStackTraceHashes} is enabled, or <code>0</code> otherwise.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> */<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public int getOccurrence() {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return occurrence;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * Returns the HTTP status code.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @return The HTTP status code.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> public int getStatus() {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> return status;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>}<a name="line.165"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Sets the inner cause for this exception.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * @param cause The inner cause.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @return This object (for method chaining).<a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override /* Throwable */<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public synchronized RestException initCause(Throwable cause) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> super.initCause(cause);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> return this;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * Returns the root cause of this exception.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * The root cause is the first exception in the init-cause parent chain that's not one of the following:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <ul><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <li>{@link RestException}<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <li>{@link InvocationTargetException}<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * </ul><a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @return The root cause of this exception, or <jk>null</jk> if no root cause was found.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public Throwable getRootCause() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> Throwable t = this;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> while(t != null) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> t = t.getCause();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (! (t instanceof RestException || t instanceof InvocationTargetException))<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return t;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return null;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * Returns all error messages from all errors in this stack.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> *<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * Typically useful if you want to render all the error messages in the stack, but don't want to render all the<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * stack traces too.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> *<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @param scrubForXssVulnerabilities<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * If <jk>true</jk>, replaces <js>'&lt;'</js>, <js>'&gt;'</js>, and <js>'&amp;'</js> characters with spaces.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @return All error messages from all errors in this stack.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public String getFullStackMessage(boolean scrubForXssVulnerabilities) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> String msg = getMessage();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> StringBuilder sb = new StringBuilder();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> if (msg != null) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> if (scrubForXssVulnerabilities)<a name="line.110"></a>
+<span class="sourceLineNo">111</span> msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');<a name="line.111"></a>
+<span class="sourceLineNo">112</span> sb.append(msg);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span> Throwable e = getCause();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> while (e != null) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> msg = e.getMessage();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> if (msg != null && scrubForXssVulnerabilities)<a name="line.117"></a>
+<span class="sourceLineNo">118</span> msg = msg.replace('<', ' ').replace('>', ' ').replace('&', ' ');<a name="line.118"></a>
+<span class="sourceLineNo">119</span> String cls = e.getClass().getSimpleName();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> if (msg == null)<a name="line.120"></a>
+<span class="sourceLineNo">121</span> sb.append(format("\nCaused by ({0})", cls));<a name="line.121"></a>
+<span class="sourceLineNo">122</span> else<a name="line.122"></a>
+<span class="sourceLineNo">123</span> sb.append(format("\nCaused by ({0}): {1}", cls, msg));<a name="line.123"></a>
+<span class="sourceLineNo">124</span> e = e.getCause();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return sb.toString();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Override /* Object */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public int hashCode() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> int i = 0;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> Throwable t = this;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> while (t != null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> for (StackTraceElement e : t.getStackTrace())<a name="line.134"></a>
+<span class="sourceLineNo">135</span> i ^= e.hashCode();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> t = t.getCause();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span> return i;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> void setOccurrence(int occurrence) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> this.occurrence = occurrence;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * Returns the number of times this exception occurred on this servlet.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <p><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * This only gets set if {@link RestResource#useStackTraceHashes()} is enabled on the servlet.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * The occurrence number if {@link RestResource#useStackTraceHashes()} is enabled, or <code>0</code> otherwise.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public int getOccurrence() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return occurrence;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * Returns the HTTP status code.<a name="line.159"></a>
+<span class="sourceLineNo">160</span> *<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * @return The HTTP status code.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> */<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public int getStatus() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return status;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>}<a name="line.166"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/RestResourceResolver.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResourceResolver.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResourceResolver.html
index 0f9f1cc..5a7823e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestResourceResolver.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestResourceResolver.html
@@ -39,7 +39,7 @@
<span class="sourceLineNo">031</span> *<a name="line.31"></a>
<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
<span class="sourceLineNo">033</span> * An instance of this class can also be passed in through the servlet context as the context attribute<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * {@link RestContext#REST_resourceResolver}.<a name="line.34"></a>
+<span class="sourceLineNo">034</span> * {@link RestResource#resourceResolver()}.<a name="line.34"></a>
<span class="sourceLineNo">035</span> */<a name="line.35"></a>
<span class="sourceLineNo">036</span>public interface RestResourceResolver {<a name="line.36"></a>
<span class="sourceLineNo">037</span><a name="line.37"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
index 17ade01..933a319 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestServletDefault.html
@@ -20,222 +20,217 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.rest;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.apache.juneau.rest.RestContext.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.dto.swagger.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.html.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.jso.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.json.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.msgpack.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.plaintext.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.rest.annotation.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.soap.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.uon.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.urlencoding.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.xml.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * Subclass of {@link RestServlet} with default serializers and parsers defined.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <table class='styled'><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <tr><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <th>Accept</th><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <th>Content-Type</th><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <th>Serializer</th><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * </tr><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <tr><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <td class='code'>application/json<br>text/json</td><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <td class='code'>application/json</td><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <td>{@link JsonSerializer}</td><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * </tr><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <tr><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <td class='code'>application/json+simple<br>text/json+simple</td><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <td class='code'>application/json</td><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * </tr><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <tr><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <td class='code'>application/json+schema<br>text/json+schema</td><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <td class='code'>application/json</td><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <td>{@link JsonSchemaSerializer}</td><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * </tr><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <tr><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <td class='code'>text/xml</td><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <td class='code'>text/xml</td><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <td>{@link XmlDocSerializer}</td><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * </tr><a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <tr><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <td class='code'>text/xml+schema</td><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <td class='code'>text/xml</td><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <td>{@link XmlSchemaDocSerializer}</td><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * </tr><a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <tr><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <td class='code'>text/html</td><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <td class='code'>text/html</td><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <td>{@link HtmlDocSerializer}</td><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * </tr><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <tr><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * <td class='code'>text/html+stripped</td><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * <td class='code'>text/html</td><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <td>{@link HtmlStrippedDocSerializer}</td><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * </tr><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <tr><a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <td class='code'>text/uon</td><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <td class='code'>text/uon</td><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <td>{@link UonSerializer}</td><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * </tr><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * <tr><a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <td>{@link UrlEncodingSerializer}</td><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * </tr><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <tr><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <td class='code'>text/xml+soap</td><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <td class='code'>text/xml</td><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <td>{@link SoapXmlSerializer}</td><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * </tr><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <tr><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <td class='code'>text/plain</td><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <td class='code'>text/plain</td><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <td>{@link PlainTextSerializer}</td><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * </tr><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * </table><a name="line.95"></a>
-<span class="sourceLineNo">096</span> * <p><a name="line.96"></a>
-<span class="sourceLineNo">097</span> * Supports the following request <code>Content-Type</code> header values:<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * </p><a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <table class='styled'><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <tr><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <th>Content-Type</th><a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <th>Parser</th><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * </tr><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <tr><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * <td class='code'>application/json<br>text/json</td><a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <td>{@link JsonParser}</td><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * </tr><a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <tr><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * <td class='code'>text/xml<br>application/xml</td><a name="line.109"></a>
-<span class="sourceLineNo">110</span> * <td>{@link XmlParser}</td><a name="line.110"></a>
-<span class="sourceLineNo">111</span> * </tr><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <tr><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <td class='code'>text/html<br>text/html+stripped</td><a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <td>{@link HtmlParser}</td><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * </tr><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <tr><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <td class='code'>text/uon</td><a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <td>{@link UonParser}</td><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * </tr><a name="line.119"></a>
-<span class="sourceLineNo">120</span> * <tr><a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <td>{@link UrlEncodingParser}</td><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * </tr><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <tr><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <td class='code'>text/plain</td><a name="line.125"></a>
-<span class="sourceLineNo">126</span> * <td>{@link PlainTextParser}</td><a name="line.126"></a>
-<span class="sourceLineNo">127</span> * </tr><a name="line.127"></a>
-<span class="sourceLineNo">128</span> * </table><a name="line.128"></a>
-<span class="sourceLineNo">129</span> *<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <p><a name="line.130"></a>
-<span class="sourceLineNo">131</span> * It should be noted that we do NOT add {@link JsoParser} to the list of parsers since this could cause security<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * issues.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Use caution when using this particular parser as it could inadvertently cause code execution security holes.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> *<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <p><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * The list of serializers and parsers can be appended to using the<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * {@link RestResource#serializers() @RestResource.serializers()} and<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> *<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * POJO consisting of beans describing the class.<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <img class='bordered' src='doc-files/OptionsPage.png'><a name="line.143"></a>
-<span class="sourceLineNo">144</span> *<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <p><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.<a name="line.146"></a>
-<span class="sourceLineNo">147</span> *<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * <h6 class='topic'>Other Notes</h6><a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <ul class='spaced-list'><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * <li><a name="line.150"></a>
-<span class="sourceLineNo">151</span> * Provides a default HTML stylesheet by setting {@link HtmlDoc#stylesheet() @HtmlDoc.stylesheet()}<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * to <js>"styles/juneau.css"</js>.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <li><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * Provides a default favicon by setting {@link RestResource#favicon() @RestResource.favicon()} to<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * <js>"juneau.ico"</js>.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * <li><a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Provides a default classpath entry "htdocs" by setting<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * {@link RestResource#staticFiles() @RestResource.staticFiles()} to <js>"{htdocs:'htdocs'}"</js>.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <code>/servletPath/htdocs</code>.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * </ul><a name="line.161"></a>
-<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>@RestResource(<a name="line.163"></a>
-<span class="sourceLineNo">164</span> serializers={<a name="line.164"></a>
-<span class="sourceLineNo">165</span> HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> HtmlStrippedDocSerializer.class,<a name="line.166"></a>
-<span class="sourceLineNo">167</span> HtmlSchemaDocSerializer.class,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> JsonSerializer.class,<a name="line.168"></a>
-<span class="sourceLineNo">169</span> JsonSerializer.Simple.class,<a name="line.169"></a>
-<span class="sourceLineNo">170</span> JsonSchemaSerializer.class,<a name="line.170"></a>
-<span class="sourceLineNo">171</span> XmlDocSerializer.class,<a name="line.171"></a>
-<span class="sourceLineNo">172</span> XmlSchemaDocSerializer.class,<a name="line.172"></a>
-<span class="sourceLineNo">173</span> UonSerializer.class,<a name="line.173"></a>
-<span class="sourceLineNo">174</span> UrlEncodingSerializer.class,<a name="line.174"></a>
-<span class="sourceLineNo">175</span> MsgPackSerializer.class,<a name="line.175"></a>
-<span class="sourceLineNo">176</span> SoapXmlSerializer.class,<a name="line.176"></a>
-<span class="sourceLineNo">177</span> PlainTextSerializer.class<a name="line.177"></a>
-<span class="sourceLineNo">178</span> },<a name="line.178"></a>
-<span class="sourceLineNo">179</span> parsers={<a name="line.179"></a>
-<span class="sourceLineNo">180</span> JsonParser.class,<a name="line.180"></a>
-<span class="sourceLineNo">181</span> XmlParser.class,<a name="line.181"></a>
-<span class="sourceLineNo">182</span> HtmlParser.class,<a name="line.182"></a>
-<span class="sourceLineNo">183</span> UonParser.class,<a name="line.183"></a>
-<span class="sourceLineNo">184</span> UrlEncodingParser.class,<a name="line.184"></a>
-<span class="sourceLineNo">185</span> MsgPackParser.class,<a name="line.185"></a>
-<span class="sourceLineNo">186</span> PlainTextParser.class<a name="line.186"></a>
-<span class="sourceLineNo">187</span> },<a name="line.187"></a>
-<span class="sourceLineNo">188</span> properties={<a name="line.188"></a>
-<span class="sourceLineNo">189</span> // Allow &method parameter on safe HTTP methods.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> @Property(name=REST_allowMethodParam, value="OPTIONS"),<a name="line.190"></a>
-<span class="sourceLineNo">191</span> },<a name="line.191"></a>
-<span class="sourceLineNo">192</span> htmldoc=@HtmlDoc(<a name="line.192"></a>
-<span class="sourceLineNo">193</span> header={<a name="line.193"></a>
-<span class="sourceLineNo">194</span> "<h1>$R{servletTitle}</h1>",<a name="line.194"></a>
-<span class="sourceLineNo">195</span> "<h2>$R{methodSummary,$R{servletDescription}}</h2>",<a name="line.195"></a>
-<span class="sourceLineNo">196</span> "<a href='http://juneau.apache.org'><img src='$U{servlet:/htdocs/juneau.png}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/></a>"<a name="line.196"></a>
-<span class="sourceLineNo">197</span> },<a name="line.197"></a>
-<span class="sourceLineNo">198</span> stylesheet="servlet:/styles/light.css"<a name="line.198"></a>
-<span class="sourceLineNo">199</span> ),<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> // The location on the classpath or file system of the fav-icon.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> favicon="htdocs/juneau.png",<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> // These are static files that are served up by the servlet under the specified sub-paths.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> staticFiles="{htdocs:'htdocs',styles:'styles'}"<a name="line.205"></a>
-<span class="sourceLineNo">206</span>)<a name="line.206"></a>
-<span class="sourceLineNo">207</span>public abstract class RestServletDefault extends RestServlet {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> private static final long serialVersionUID = 1L;<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> /**<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * [OPTIONS /*] - Show resource options.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> *<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @param req The HTTP request.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @return A bean containing the contents for the OPTIONS page.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> */<a name="line.215"></a>
-<span class="sourceLineNo">216</span> @RestMethod(name="OPTIONS", path="/*",<a name="line.216"></a>
-<span class="sourceLineNo">217</span> htmldoc=@HtmlDoc(<a name="line.217"></a>
-<span class="sourceLineNo">218</span> links={<a name="line.218"></a>
-<span class="sourceLineNo">219</span> "back: servlet:/",<a name="line.219"></a>
-<span class="sourceLineNo">220</span> "json: servlet:/?method=OPTIONS&Accept=text/json&plainText=true"<a name="line.220"></a>
-<span class="sourceLineNo">221</span> },<a name="line.221"></a>
-<span class="sourceLineNo">222</span> aside="NONE"<a name="line.222"></a>
-<span class="sourceLineNo">223</span> ),<a name="line.223"></a>
-<span class="sourceLineNo">224</span> summary="Swagger documentation",<a name="line.224"></a>
-<span class="sourceLineNo">225</span> description="Auto-generated swagger documentation for this resource"<a name="line.225"></a>
-<span class="sourceLineNo">226</span> )<a name="line.226"></a>
-<span class="sourceLineNo">227</span> public Swagger getOptions(RestRequest req) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return req.getSwagger();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>}<a name="line.230"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.dto.swagger.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.html.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import org.apache.juneau.jso.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import org.apache.juneau.json.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.msgpack.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.plaintext.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.rest.annotation.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.soap.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.uon.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.urlencoding.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.xml.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>/**<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * Subclass of {@link RestServlet} with default serializers and parsers defined.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <table class='styled'><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <tr><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <th>Accept</th><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <th>Content-Type</th><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <th>Serializer</th><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * </tr><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <tr><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <td class='code'>application/json<br>text/json</td><a name="line.39"></a>
+<span class="sourceLineNo">040</span> * <td class='code'>application/json</td><a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <td>{@link JsonSerializer}</td><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * </tr><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <tr><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <td class='code'>application/json+simple<br>text/json+simple</td><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <td class='code'>application/json</td><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * </tr><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <tr><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <td class='code'>application/json+schema<br>text/json+schema</td><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <td class='code'>application/json</td><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <td>{@link JsonSchemaSerializer}</td><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * </tr><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <tr><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <td class='code'>text/xml</td><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <td class='code'>text/xml</td><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <td>{@link XmlDocSerializer}</td><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * </tr><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <tr><a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <td class='code'>text/xml+schema</td><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <td class='code'>text/xml</td><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <td>{@link XmlSchemaDocSerializer}</td><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </tr><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <tr><a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <td class='code'>text/html</td><a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <td class='code'>text/html</td><a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <td>{@link HtmlDocSerializer}</td><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * </tr><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <tr><a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <td class='code'>text/html+stripped</td><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <td class='code'>text/html</td><a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <td>{@link HtmlStrippedDocSerializer}</td><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * </tr><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <tr><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * <td class='code'>text/uon</td><a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <td class='code'>text/uon</td><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <td>{@link UonSerializer}</td><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * </tr><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <tr><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <td>{@link UrlEncodingSerializer}</td><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * </tr><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <tr><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <td class='code'>text/xml+soap</td><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <td class='code'>text/xml</td><a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <td>{@link SoapXmlSerializer}</td><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * </tr><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <tr><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <td class='code'>text/plain</td><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <td class='code'>text/plain</td><a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <td>{@link PlainTextSerializer}</td><a name="line.91"></a>
+<span class="sourceLineNo">092</span> * </tr><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * </table><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <p><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * Supports the following request <code>Content-Type</code> header values:<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * </p><a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <table class='styled'><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <tr><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * <th>Content-Type</th><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <th>Parser</th><a name="line.100"></a>
+<span class="sourceLineNo">101</span> * </tr><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <tr><a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <td class='code'>application/json<br>text/json</td><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <td>{@link JsonParser}</td><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * </tr><a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <tr><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <td class='code'>text/xml<br>application/xml</td><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <td>{@link XmlParser}</td><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * </tr><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <tr><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <td class='code'>text/html<br>text/html+stripped</td><a name="line.111"></a>
+<span class="sourceLineNo">112</span> * <td>{@link HtmlParser}</td><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * </tr><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <tr><a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <td class='code'>text/uon</td><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <td>{@link UonParser}</td><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * </tr><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <tr><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <td class='code'>application/x-www-form-urlencoded</td><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <td>{@link UrlEncodingParser}</td><a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </tr><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <tr><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <td class='code'>text/plain</td><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <td>{@link PlainTextParser}</td><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * </tr><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * </table><a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <p><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * It should be noted that we do NOT add {@link JsoParser} to the list of parsers since this could cause security<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * issues.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * Use caution when using this particular parser as it could inadvertently cause code execution security holes.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> *<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <p><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * The list of serializers and parsers can be appended to using the<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * {@link RestResource#serializers() @RestResource.serializers()} and<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> *<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * POJO consisting of beans describing the class.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <img class='bordered' src='doc-files/OptionsPage.png'><a name="line.141"></a>
+<span class="sourceLineNo">142</span> *<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <p><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> *<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <h6 class='topic'>Other Notes</h6><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <ul class='spaced-list'><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <li><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Provides a default HTML stylesheet by setting {@link HtmlDoc#stylesheet() @HtmlDoc.stylesheet()}<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * to <js>"styles/juneau.css"</js>.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <li><a name="line.151"></a>
+<span class="sourceLineNo">152</span> * Provides a default favicon by setting {@link RestResource#favicon() @RestResource.favicon()} to<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <js>"juneau.ico"</js>.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <li><a name="line.154"></a>
+<span class="sourceLineNo">155</span> * Provides a default classpath entry "htdocs" by setting<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * {@link RestResource#staticFiles() @RestResource.staticFiles()} to <js>"{htdocs:'htdocs'}"</js>.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * <code>/servletPath/htdocs</code>.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * </ul><a name="line.159"></a>
+<span class="sourceLineNo">160</span> */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>@RestResource(<a name="line.161"></a>
+<span class="sourceLineNo">162</span> serializers={<a name="line.162"></a>
+<span class="sourceLineNo">163</span> HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> HtmlStrippedDocSerializer.class,<a name="line.164"></a>
+<span class="sourceLineNo">165</span> HtmlSchemaDocSerializer.class,<a name="line.165"></a>
+<span class="sourceLineNo">166</span> JsonSerializer.class,<a name="line.166"></a>
+<span class="sourceLineNo">167</span> JsonSerializer.Simple.class,<a name="line.167"></a>
+<span class="sourceLineNo">168</span> JsonSchemaSerializer.class,<a name="line.168"></a>
+<span class="sourceLineNo">169</span> XmlDocSerializer.class,<a name="line.169"></a>
+<span class="sourceLineNo">170</span> XmlSchemaDocSerializer.class,<a name="line.170"></a>
+<span class="sourceLineNo">171</span> UonSerializer.class,<a name="line.171"></a>
+<span class="sourceLineNo">172</span> UrlEncodingSerializer.class,<a name="line.172"></a>
+<span class="sourceLineNo">173</span> MsgPackSerializer.class,<a name="line.173"></a>
+<span class="sourceLineNo">174</span> SoapXmlSerializer.class,<a name="line.174"></a>
+<span class="sourceLineNo">175</span> PlainTextSerializer.class<a name="line.175"></a>
+<span class="sourceLineNo">176</span> },<a name="line.176"></a>
+<span class="sourceLineNo">177</span> parsers={<a name="line.177"></a>
+<span class="sourceLineNo">178</span> JsonParser.class,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> XmlParser.class,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> HtmlParser.class,<a name="line.180"></a>
+<span class="sourceLineNo">181</span> UonParser.class,<a name="line.181"></a>
+<span class="sourceLineNo">182</span> UrlEncodingParser.class,<a name="line.182"></a>
+<span class="sourceLineNo">183</span> MsgPackParser.class,<a name="line.183"></a>
+<span class="sourceLineNo">184</span> PlainTextParser.class<a name="line.184"></a>
+<span class="sourceLineNo">185</span> },<a name="line.185"></a>
+<span class="sourceLineNo">186</span> allowMethodParam="OPTIONS",<a name="line.186"></a>
+<span class="sourceLineNo">187</span> htmldoc=@HtmlDoc(<a name="line.187"></a>
+<span class="sourceLineNo">188</span> header={<a name="line.188"></a>
+<span class="sourceLineNo">189</span> "<h1>$R{servletTitle}</h1>",<a name="line.189"></a>
+<span class="sourceLineNo">190</span> "<h2>$R{methodSummary,$R{servletDescription}}</h2>",<a name="line.190"></a>
+<span class="sourceLineNo">191</span> "<a href='http://juneau.apache.org'><img src='$U{servlet:/htdocs/juneau.png}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/></a>"<a name="line.191"></a>
+<span class="sourceLineNo">192</span> },<a name="line.192"></a>
+<span class="sourceLineNo">193</span> stylesheet="servlet:/styles/light.css"<a name="line.193"></a>
+<span class="sourceLineNo">194</span> ),<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> // The location on the classpath or file system of the fav-icon.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> favicon="htdocs/juneau.png",<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> // These are static files that are served up by the servlet under the specified sub-paths.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> staticFiles="{htdocs:'htdocs',styles:'styles'}"<a name="line.200"></a>
+<span class="sourceLineNo">201</span>)<a name="line.201"></a>
+<span class="sourceLineNo">202</span>public abstract class RestServletDefault extends RestServlet {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> private static final long serialVersionUID = 1L;<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * [OPTIONS /*] - Show resource options.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @param req The HTTP request.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @return A bean containing the contents for the OPTIONS page.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @RestMethod(name="OPTIONS", path="/*",<a name="line.211"></a>
+<span class="sourceLineNo">212</span> htmldoc=@HtmlDoc(<a name="line.212"></a>
+<span class="sourceLineNo">213</span> links={<a name="line.213"></a>
+<span class="sourceLineNo">214</span> "back: servlet:/",<a name="line.214"></a>
+<span class="sourceLineNo">215</span> "json: servlet:/?method=OPTIONS&Accept=text/json&plainText=true"<a name="line.215"></a>
+<span class="sourceLineNo">216</span> },<a name="line.216"></a>
+<span class="sourceLineNo">217</span> aside="NONE"<a name="line.217"></a>
+<span class="sourceLineNo">218</span> ),<a name="line.218"></a>
+<span class="sourceLineNo">219</span> summary="Swagger documentation",<a name="line.219"></a>
+<span class="sourceLineNo">220</span> description="Auto-generated swagger documentation for this resource"<a name="line.220"></a>
+<span class="sourceLineNo">221</span> )<a name="line.221"></a>
+<span class="sourceLineNo">222</span> public Swagger getOptions(RestRequest req) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return req.getSwagger();<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>}<a name="line.225"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/FormData.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/FormData.html
index 3f1e8f4..f66bb2f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/FormData.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/FormData.html
@@ -109,7 +109,7 @@
<span class="sourceLineNo">101</span> * <br>This treats request parameters as plain text.<a name="line.101"></a>
<span class="sourceLineNo">102</span> * <br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this mode.<a name="line.102"></a>
<span class="sourceLineNo">103</span> * <li><a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <js>"INHERIT"</js> (default) - Inherit from the {@link RestContext#REST_paramFormat} property on the<a name="line.104"></a>
+<span class="sourceLineNo">104</span> * <js>"INHERIT"</js> (default) - Inherit from the {@link RestResource#paramFormat()} property on the<a name="line.104"></a>
<span class="sourceLineNo">105</span> * servlet method or class.<a name="line.105"></a>
<span class="sourceLineNo">106</span> * </ul><a name="line.106"></a>
<span class="sourceLineNo">107</span> *<a name="line.107"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Query.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Query.html
index 225d150..598d324 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Query.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Query.html
@@ -105,7 +105,7 @@
<span class="sourceLineNo">097</span> * <br>This treats request parameters as plain text.<a name="line.97"></a>
<span class="sourceLineNo">098</span> * <br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this mode.<a name="line.98"></a>
<span class="sourceLineNo">099</span> * <li><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <js>"INHERIT"</js> (default) - Inherit from the {@link RestContext#REST_paramFormat} property on the<a name="line.100"></a>
+<span class="sourceLineNo">100</span> * <js>"INHERIT"</js> (default) - Inherit from the {@link RestResource#paramFormat()} property on the<a name="line.100"></a>
<span class="sourceLineNo">101</span> * servlet method or class.<a name="line.101"></a>
<span class="sourceLineNo">102</span> * </ul><a name="line.102"></a>
<span class="sourceLineNo">103</span> *<a name="line.103"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
index bb95f17..ae0ad43 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
@@ -638,7 +638,54 @@
<span class="sourceLineNo">630</span> * Information provided here overrides information provided in the servlet-level annotation.<a name="line.630"></a>
<span class="sourceLineNo">631</span> */<a name="line.631"></a>
<span class="sourceLineNo">632</span> HtmlDoc htmldoc() default @HtmlDoc;<a name="line.632"></a>
-<span class="sourceLineNo">633</span>}<a name="line.633"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> /**<a name="line.634"></a>
+<span class="sourceLineNo">635</span> * Default character encoding.<a name="line.635"></a>
+<span class="sourceLineNo">636</span> *<a name="line.636"></a>
+<span class="sourceLineNo">637</span> * <p><a name="line.637"></a>
+<span class="sourceLineNo">638</span> * The default character encoding for the request and response if not specified on the request.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> *<a name="line.639"></a>
+<span class="sourceLineNo">640</span> * <ul><a name="line.640"></a>
+<span class="sourceLineNo">641</span> * <li>String value.<a name="line.641"></a>
+<span class="sourceLineNo">642</span> * <li>Defaults to system property <js>"juneau.defaultCharset"</js>, or <js>"utf-8"</js> if not specified.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> * <li>Can contain variables.<a name="line.643"></a>
+<span class="sourceLineNo">644</span> * <li>Overrides the value at the class level via {@link RestResource#defaultCharset() @RestResource.defaultCharset()}.<a name="line.644"></a>
+<span class="sourceLineNo">645</span> * </ul><a name="line.645"></a>
+<span class="sourceLineNo">646</span> */<a name="line.646"></a>
+<span class="sourceLineNo">647</span> String defaultCharset() default "";<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
+<span class="sourceLineNo">649</span> /**<a name="line.649"></a>
+<span class="sourceLineNo">650</span> * Expected format of request parameters.<a name="line.650"></a>
+<span class="sourceLineNo">651</span> *<a name="line.651"></a>
+<span class="sourceLineNo">652</span> * Possible values:<a name="line.652"></a>
+<span class="sourceLineNo">653</span> * <ul class='spaced-list'><a name="line.653"></a>
+<span class="sourceLineNo">654</span> * <li><a name="line.654"></a>
+<span class="sourceLineNo">655</span> * <js>"UON"</js> - URL-Encoded Object Notation.<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * <br>This notation allows for request parameters to contain arbitrarily complex POJOs.<a name="line.656"></a>
+<span class="sourceLineNo">657</span> * <li><a name="line.657"></a>
+<span class="sourceLineNo">658</span> * <js>"PLAIN"</js> - Plain text.<a name="line.658"></a>
+<span class="sourceLineNo">659</span> * <br>This treats request parameters as plain text.<a name="line.659"></a>
+<span class="sourceLineNo">660</span> * <br>Only POJOs directly convertible from <l>Strings</l> can be represented in parameters when using this<a name="line.660"></a>
+<span class="sourceLineNo">661</span> * mode.<a name="line.661"></a>
+<span class="sourceLineNo">662</span> * </ul><a name="line.662"></a>
+<span class="sourceLineNo">663</span> *<a name="line.663"></a>
+<span class="sourceLineNo">664</span> * <p><a name="line.664"></a>
+<span class="sourceLineNo">665</span> * Note that the parameter value <js>"(foo)"</js> is interpreted as <js>"(foo)"</js> when using plain mode, but<a name="line.665"></a>
+<span class="sourceLineNo">666</span> * <js>"foo"</js> when using UON mode.<a name="line.666"></a>
+<span class="sourceLineNo">667</span> *<a name="line.667"></a>
+<span class="sourceLineNo">668</span> * <p><a name="line.668"></a>
+<span class="sourceLineNo">669</span> * The format can also be specified per-parameter using the {@link FormData#format() @FormData.format()} and<a name="line.669"></a>
+<span class="sourceLineNo">670</span> * {@link Query#format() @Query.format()} annotations.<a name="line.670"></a>
+<span class="sourceLineNo">671</span> *<a name="line.671"></a>
+<span class="sourceLineNo">672</span> * <ul><a name="line.672"></a>
+<span class="sourceLineNo">673</span> * <li>String value.<a name="line.673"></a>
+<span class="sourceLineNo">674</span> * <li>Defaults to system property <js>"juneau.paramFormat"</js>, or <js>"UON"</js> if not specified.<a name="line.674"></a>
+<span class="sourceLineNo">675</span> * <li>Can contain variables.<a name="line.675"></a>
+<span class="sourceLineNo">676</span> * <li>Overrides the value at the class level via {@link RestResource#paramFormat() @RestResource.paramFormat()}.<a name="line.676"></a>
+<span class="sourceLineNo">677</span> * </ul><a name="line.677"></a>
+<span class="sourceLineNo">678</span> */<a name="line.678"></a>
+<span class="sourceLineNo">679</span> String paramFormat() default "";<a name="line.679"></a>
+<span class="sourceLineNo">680</span>}<a name="line.680"></a>